Merge branch 'lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-pc

src/assets/styles/diythem.scss

@@ -42,19 +42,19 @@
   }
 
   //   表格
-  // .el-table .el-table__header-wrapper th {
-  //   font-size: 12px;
-  //   font-weight: 400;
-  //   // height: 35px;
-  //   color: #666;
+  .el-table .el-table__header-wrapper th {
+    font-size: 12px;
+    font-weight: 400;
+    // height: 35px;
+    color: #666;
     // background-color: #f2f2f2;
-  // }
-  // .el-table--medium .el-table__cell {
-  //   padding: 3px 0;
-  //   // height: 35px;
-  //   font-size: 12px;
-  //   color: #666;
-  // }
+  }
+  .el-table--medium .el-table__cell {
+    padding: 3px 0;
+    // height: 35px;
+    font-size: 12px;
+    color: #666;
+  }
 
   .el-table .fixed-width .el-button--mini {
     font-size: 12px;

src/views/tcZz/netManage/gzdt/index.vue

@@ -311,6 +311,7 @@
      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
 
       <el-descriptions title="工作动态"  :column="2" border labelClassName="desLable">
+
         <el-descriptions-item label="区域">{{ selectDictLabel(dict.type.tc_area,form.areaId) }}</el-descriptions-item>
 
         <el-descriptions-item label="启用/禁用">{{ selectDictLabel(dict.type.tc_start,form.isStatus) }}</el-descriptions-item>
@@ -547,7 +548,7 @@
           this.form = response.data;
           let arr1 = this.form.fileName.split(',');
           let arr2 = this.form.fileUrl.split(',');
-          if(arr1[0] !== '' && arr1.length > 1 && arr2.length > 1) {
+          if(arr1[0] !== '' && arr1.length > 0 && arr2.length > 0) {
             arr1.forEach((item,index)=>{
               let obj = {};
               obj.name = item;

src/views/tcZz/netManage/ytlc/index.vue

@@ -145,11 +145,14 @@
      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
 
         <el-descriptions title="约谈流程"  :column="2" border labelClassName="desLable">
+
         <el-descriptions-item label="名称">{{ form.name }}</el-descriptions-item>
 
-                      <el-descriptions-item label="文件名称">{{ form.fileName }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="文件名称">{{ form.fileName }}</el-descriptions-item> -->
+
+        <el-descriptions-item label="文件"><a v-for="(item,index) in files" :key="index" :href="item.url" target="blank">{{ item.name }}</a></el-descriptions-item>
 
-                      <el-descriptions-item label="文件路径(完整路径)">{{ form.fileUrl }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="文件路径(完整路径)">{{ form.fileUrl }}</el-descriptions-item> -->
 
         <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
@@ -235,6 +238,7 @@
         },
         fileList:[],
         fileNameS:[],
+        files:[],
       };
     },
     created() {
@@ -318,9 +322,24 @@
       /**查看按钮操作 */
       handleInfo(row){
         this.reset();
+        this.files = [];
         const id = row.id || this.ids
         getYtlc(id).then(response => {
+          console.log(response,'response')
           this.form = response.data;
+          let arr1 = this.form.fileName.split(',');
+          let arr2 = this.form.fileUrl.split(',');
+          if(arr1[0] !== '' && arr1.length > 0 && arr2.length > 0) {
+            arr1.forEach((item,index)=>{
+              let obj = {};
+              obj.name = item;
+              obj.url = process.env.VUE_APP_BASE_API + arr2[index];
+              this.files.push(obj);
+            })
+          } else {
+            this.files = [];
+          }
+          console.log(this.files,'this.files')
           this.infoOpen = true;
           this.infoTitle = "查看约谈流程详情"
         });
@@ -459,4 +478,8 @@
 //     }
 //   }
 // } 
+a {
+  color: #0072c6;
+  margin: 0 5px;
+}
 </style>