[update] 拆分、首页

src/views/dashboard/modules/FriendLinkCard.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="content-wrapper">
         <div class="content-div" v-for="item in dataSource" :key="item.id" @click="clickLink(item)">
-          <img class="icon-img" :src="dataSource.logo || defaultLogo" :alt="item.name">
+          <img class="icon-img" :src="getImg(item.logoUrl)" :alt="item.name">
           <a-tooltip placement="top">
             <template slot="title">{{ item.name }}</template>
             <p>{{ item.name }}</p>
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { getAction } from '@/api/manage'
+import { getAction, getFileAccessHttpUrl } from '@/api/manage'
 
 export default {
   name: 'FriendLinkCard',
@@ -27,14 +27,7 @@ export default {
     return {
       defaultLogo: require('@/assets/image/dashboard/friendship-link.png'),
       loading: false,
-      dataSource: [
-        { name: '奇瑞官网' },
-        { name: '奇瑞官网' },
-        { name: '奇瑞官网' },
-        { name: '奇瑞官网' },
-        { name: '奇瑞官网' },
-        { name: '奇瑞官网' }
-      ],
+      dataSource: [],
       url: {
         list: '/sys/lawsFriendlyLinks/list'
       }
@@ -44,12 +37,17 @@ export default {
     this.loadData()
   },
   methods: {
+    getImg (id) {
+      if (!id) {
+        return this.defaultLogo
+      }
+      return getFileAccessHttpUrl(id)
+    },
     loadData () {
       this.loading = true
       getAction(this.url.list, {}).then((res) => {
         if (res.success) {
-          // grounding 1上架 0下架（只显示上架的）
-          this.dataSource = res.result.filter(item => item.grounding === '1')
+          this.dataSource = res.result
         } else {
           this.$message.warning(res.message)
         }

src/views/dashboard/modules/ToDoTaskCard.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false">
+  <a-card :bordered="false" class="todo-card">
     <a-spin :spinning="loading">
       <div class="top-wrapper">
         <p class="left-p"><i class="iconfont icon-calendar left-icon"></i>{{ $t('dashboard.todoTask.todoTask') }}</p>
@@ -34,7 +34,7 @@ export default {
     }
   },
   created () {
-    // this.getTodoTask()
+    this.getTodoTask()
   },
   methods: {
     // 获取待办任务
@@ -170,9 +170,11 @@ export default {
 
 <style lang="less" scoped>
 @size: 48px;
+.todo-card {
+  height: calc(100vh - 611px);
+}
 .content-wrapper {
   margin-top: 10px;
-  height: calc(100vh - 700px);
   overflow-y: auto;
 
   .content-item {
@@ -218,6 +220,9 @@ export default {
 }
 @media screen and (max-width: 1366px) {
   @size: 40px;
+  .todo-card {
+    height: calc(100vh - 424px);
+  }
   .content-wrapper {
     height: calc(100vh - 506px);
 

src/views/dashboard/search/AdvancedSearch.vue

@@ -378,7 +378,7 @@ export default {
           dataIndex: 'registration_date',
           scopedSlots: { customRender: 'text' }
         },
-        { // 关键字
+        { // 关键字 -- 涉及系统/部件 同一个字段
           title: this.$t('dashboard.advancedSearch.keywords'),
           align: 'center',
           width: 180,

src/views/documentTool/documentSplit/DocumentSplitDetail.vue

@@ -170,6 +170,10 @@
               <div class="table-text" v-else>{{ global.emptyLine }}</div>
             </template>
 
+            <!-- 文件查看 -->
+            <template slot="technical_specification_design_guide" slot-scope="{text, record}">
+              <a @click="handleViewFile(text, record)">{{ $t('view') }}</a>
+            </template>
           </j-table>
         </div>
       </div>
@@ -183,6 +187,8 @@
     <split-detail-batch-edit-drawer ref="batchEditDrawer" @ok="modalFormOk" />
     <!--条款添加-->
     <split-add-form ref="modalForm" :flag="'4'" :infoId="infoId" :menuId="menuId" :itemId="itemId" @ok="modalFormOk" />
+    <!--查看上传文件-->
+    <upload-file ref="uploadFile" :return-url="false" disabled />
   </internal-detail-page>
 </template>
 
@@ -211,10 +217,12 @@ import Search from '../../../components/customField/Search.vue'
 import { isHasPermission } from '../../../utils/hasPermission.js'
 import SplitDetailBatchEditDrawer from './modules/SplitDetailBatchEditDrawer.vue'
 import { downFile, downloadFile, postAction } from '../../../api/manage'
+import UploadFile from '@comp/UploadFile'
 
 export default {
   name: 'DocumentSplitDetail',
   components: {
+    UploadFile,
     InternalDetailPage,
     JTable,
     SplitAddForm,
@@ -281,7 +289,7 @@ export default {
         downTemplateUrl: '/laws/DocumentTool/documentSplit/downloadImportTemplate' // 模板下载
       },
       disabledMixinsCreate: true,
-      tableSlotField: ['item_content', 'interpretation_articles'],
+      tableSlotField: ['item_content', 'interpretation_articles', 'technical_specification_design_guide'],
       uploadData: {},
       isBackTitle: true,
       expandedKeys: []
@@ -326,6 +334,10 @@ export default {
     this.loadMenuData()
   },
   methods: {
+    // 查看文件
+    handleViewFile (_, record) {
+      this.$refs.uploadFile.open(record.technical_specification_design_guide)
+    },
     /**
      * 树节点鼠标移入
      * @param key

src/views/documentTool/documentSplit/StandardSplitSheet.vue

@@ -24,7 +24,7 @@ export default {
 <style scoped lang="less">
 .split-content {
   height: 100vh;
-  padding: 20px 0 20px 20px;
+  padding: 20px;
   background-color: #eff1f4;
 }