完善工作台通知

src/views/workplace/backlog/NewWorkplaceBacklog.vue

@@ -133,9 +133,9 @@
                 <div style=" width: 17px;height: 17px;background: #3462FD;border-radius: 50%;"></div>
                 <div style="font-size: 18px;font-weight: 800;color: #333333;">资料</div>
               </div>
-              <div >
-                查看全部
-                <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/>
+              <div>
+                <a href="/operate/article/Article" target="_block"> 查看全部
+                  <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/></a>
               </div>
             </div>
             <div
@@ -143,10 +143,10 @@
             >
               <a-list size="small" bordered :data-source="information">
                 <a-list-item slot="renderItem" slot-scope="item,index" :class="{discolor: index%2}">
-                  <a-list-item-meta>
-                    <div slot="title" :href="item.href">{{ item.name }}</div>
+                  <a-list-item-meta @click="handleView(item)" >
+                    <div slot="title" style="cursor:pointer">{{ item.title }}</div>
                   </a-list-item-meta>
-                  <div>{{ item.time }}</div>
+                  <div>{{ item.updateTime }}</div>
                 </a-list-item>
               </a-list>
             </div>
@@ -188,6 +188,7 @@
         </a-col>
       </a-row>
     </div>
+    <detail ref="detailModal"></detail>
     <repair-form ref="repairForm"></repair-form>
     <SparePickForm ref="sparePickForm"></SparePickForm>
     <SpareBackForm ref="sparebackform"></SpareBackForm>
@@ -196,15 +197,18 @@
 
 <script>
 import { STable } from '@/components'
+import Detail from '@/views/operate/article/modules/Detail.vue'
 import RepairForm from './modules/RepairBaseForm'
 import SpareBackForm from '@/views/store/sparebackform/modules/BaseForm'
 import SparePickForm from '@/views/store/sparepickform/modules/BaseForm'
+import { getArticlePage, fetchArticle } from '@/api/operate/article'
 import { getWorkplaceBacklogUserPage, getWorkplaceBacklogTopData, getWorkplaceBacklogWeekData, getWorkplaceBacklogPie } from '@/api/workplace/backlog'
 import { Chart } from '@antv/g2'
 export default {
   name: 'NewWorkplaceBacklog',
   components: {
     STable,
+    Detail,
     SparePickForm,
     SpareBackForm,
     RepairForm,
@@ -229,33 +233,6 @@ export default {
         status: 1
       },
       information: [
-        {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        },
-        {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        },
-        {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        },
-        {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        }, {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        },
-        {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        },
-        {
-          name: '项目管理通知',
-          time: '2022-4-7'
-        }
       ],
       columns: [
         {
@@ -405,6 +382,22 @@ export default {
       getWorkplaceBacklogTopData(this.role).then(res => {
         this.topData = res.data
       })
+      getArticlePage({
+        pageNum: 1,
+        pageSize: 10,
+        dataScope: {
+          sortBy: 'desc',
+          sortName: 'update_time'
+        }
+      }).then(res => {
+        this.information = res.data.rows
+      })
+    },
+    handleView (record) {
+      fetchArticle({ id: record.id }).then(res => {
+        const modal = this.$refs.detailModal
+        modal.base(res.data)
+      })
     },
     getPieCharts (id) {
       this.chartPie && this.chartPie.destroy()// 防止点击搜索按钮新增一个
@@ -533,7 +526,7 @@ justify-content: space-around;
 }
 .demo-infinite-container {
   overflow: auto;
-  height: 430px;
+  height: 400px;
 }
 ::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
 </style>

src/views/workplace/backlog/SbInfoWorkplaceBacklog.vue

@@ -127,8 +127,8 @@
                 <div style="font-size: 18px;font-weight: 800;color: #333333;">资料</div>
               </div>
               <div >
-                查看全部
-                <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/>
+                <a href="/operate/article/Article" target="_block"> 查看全部
+                  <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/></a>
               </div>
             </div>
             <div
@@ -136,10 +136,10 @@
             >
               <a-list size="small" bordered :data-source="information">
                 <a-list-item slot="renderItem" slot-scope="item,index" :class="{discolor: index%2}">
-                  <a-list-item-meta>
-                    <div slot="title" :href="item.href">{{ item.name }}</div>
+                  <a-list-item-meta @click="handleView(item)" >
+                    <div slot="title" style="cursor:pointer">{{ item.title }}</div>
                   </a-list-item-meta>
-                  <div>{{ item.time }}</div>
+                  <div>{{ item.updateTime }}</div>
                 </a-list-item>
               </a-list>
             </div>
@@ -171,11 +171,14 @@
         </a-col>
       </a-row>
     </div>
+    <detail ref="detailModal"></detail>
   </div>
 </template>
 
 <script>
+import Detail from '@/views/operate/article/modules/Detail.vue'
 import { STable } from '@/components'
+import { getArticlePage, fetchArticle } from '@/api/operate/article'
 import { getWorkplaceBacklogUserPage } from '@/api/workplace/backlog'
 import { Chart } from '@antv/g2'
 import { fetchSbWorkplaceData } from '@/api/sb/info'
@@ -183,6 +186,7 @@ export default {
   name: 'SbInfoWorkplaceBacklog',
   components: {
     STable,
+    Detail,
     Chart
   },
   data () {
@@ -330,6 +334,16 @@ export default {
       fetchSbWorkplaceData().then(res => {
         this.getInfo(res.data)
       })
+      getArticlePage({
+        pageNum: 1,
+        pageSize: 10,
+        dataScope: {
+          sortBy: 'desc',
+          sortName: 'update_time'
+        }
+      }).then(res => {
+        this.information = res.data.rows
+      })
     },
     getInfo (data) {
       console.log('测试开始3')
@@ -339,6 +353,12 @@ export default {
       this.getLineCharts('container-line', this.lineData)
       this.record = data
     },
+    handleView (record) {
+      fetchArticle({ id: record.id }).then(res => {
+        const modal = this.$refs.detailModal
+        modal.base(res.data)
+      })
+    },
     getPieCharts (id, data) {
       this.chartPie && this.chartPie.destroy()// 防止点击搜索按钮新增一个
       this.chartPie = new Chart({
@@ -480,7 +500,7 @@ justify-content: space-around;
 .information{
   background: #fff;
   padding: 30px 12px;
-  height: 260px;
+  height: 500px;
   color:#666;
 }
 .discolor{
@@ -488,7 +508,7 @@ justify-content: space-around;
 }
 .demo-infinite-container {
   overflow: auto;
-  height: 190px;
+  height: 400px;
 }
 ::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
 </style>

src/views/workplace/backlog/StoreWorkplaceBacklog.vue

@@ -154,8 +154,8 @@
                   <div style="font-size: 18px;font-weight: 800;color: #333333;">资料</div>
                 </div>
                 <div >
-                  查看全部
-                  <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/>
+                  <a href="/operate/article/Article" target="_block"> 查看全部
+                    <my-icon type="icon-xiangyou-copy" style="font-size:13px;"/></a>
                 </div>
               </div>
               <div
@@ -163,10 +163,10 @@
               >
                 <a-list size="small" bordered :data-source="information">
                   <a-list-item slot="renderItem" slot-scope="item,index" :class="{discolor: index%2}">
-                    <a-list-item-meta>
-                      <div slot="title" :href="item.href">{{ item.name }}</div>
+                    <a-list-item-meta @click="handleView(item)" >
+                      <div slot="title" style="cursor:pointer">{{ item.title }}</div>
                     </a-list-item-meta>
-                    <div>{{ item.time }}</div>
+                    <div>{{ item.updateTime }}</div>
                   </a-list-item>
                 </a-list>
               </div>
@@ -202,14 +202,16 @@
     <InBaseFrom ref="inBaseModal" @ok="handleOk"></InBaseFrom>
     <OutBaseFrom ref="outBaseModal" @ok="handleOk"></OutBaseFrom>
     <AddStore ref="addStore"></AddStore>
+    <detail ref="detailModal"></detail>
   </div>
 </template>
 
 <script>
 import AddStore from '@/views/store/store/modules/BaseForm.vue'
+import Detail from '@/views/operate/article/modules/Detail.vue'
 import InBaseFrom from '@/views/store/instoreform/modules/BaseForm.vue'
 import OutBaseFrom from '@/views/store/outstoreform/modules/BaseForm.vue'
-
+import { getArticlePage, fetchArticle } from '@/api/operate/article'
 import { STable } from '@/components'
 import { getWorkplaceBacklogUserPage, getWorkplaceBacklogTopData, getWorkplaceBacklogWeekData, getWorkplaceBacklogPie } from '@/api/workplace/backlog'
 import { Chart } from '@antv/g2'
@@ -217,6 +219,7 @@ export default {
   name: 'NewWorkplaceBacklog',
   components: {
     STable,
+    Detail,
     AddStore,
     InBaseFrom,
     OutBaseFrom,
@@ -374,6 +377,16 @@ export default {
         alert('您的角色未赋予该权限')
         this.$router.push({ path: '/WorkplaceBacklog' })
       }
+      getArticlePage({
+        pageNum: 1,
+        pageSize: 10,
+        dataScope: {
+          sortBy: 'desc',
+          sortName: 'update_time'
+        }
+      }).then(res => {
+        this.information = res.data.rows
+      })
       Promise.all([
         getWorkplaceBacklogWeekData(this.role),
         getWorkplaceBacklogPie(this.role),
@@ -411,6 +424,12 @@ export default {
         this.topData = res[2].data
       })
     },
+    handleView (record) {
+      fetchArticle({ id: record.id }).then(res => {
+        const modal = this.$refs.detailModal
+        modal.base(res.data)
+      })
+    },
     getPieCharts (id, data) {
       this.chartPie && this.chartPie.destroy()// 防止点击搜索按钮新增一个
       this.chartPie = new Chart({
@@ -545,7 +564,7 @@ justify-content: space-around;
 .information{
   background: #fff;
   padding: 30px 12px;
-  height: 260px;
+  height: 500px;
   color:#666;
 }
 .discolor{
@@ -553,7 +572,7 @@ justify-content: space-around;
 }
 .demo-infinite-container {
   overflow: auto;
-  height: 190px;
+  height: 400px;
 }
 ::-webkit-scrollbar { width: 0; height: 0; color: transparent; }
 </style>