Просмотр исходного кода

设施维护和检测列表显示优化

liuQiang 1 год назад
Родитель
Сommit
276a43e3d4
2 измененных файлов с 19 добавлено и 7 удалено
  1. 8 0
      src/utils/dict.js
  2. 11 7
      src/views/backend/fpdDetection/index.vue

+ 8 - 0
src/utils/dict.js

@@ -112,6 +112,7 @@ export function getDictDatas(dictType) {
  * @returns {*|Array} 数据字典数组
  */
 export function getDictDatas2(dictType, values) {
+    // console.log('canshu',dictType,values);
     if (values === undefined) {
         return [];
     }
@@ -133,6 +134,7 @@ export function getDictDatas2(dictType, values) {
 export function getDictData(dictType, value) {
     // 获取 dictType 对应的数据字典数组
     const dictDatas = getDictDatas(dictType);
+    // console.log('dictDatas',dictDatas);
     if (!dictDatas || dictDatas.length === 0) {
         return "";
     }
@@ -142,6 +144,12 @@ export function getDictData(dictType, value) {
         if (dictData.value === value) {
             return dictData;
         }
+        //针对检测维保结果
+        if(dictType === 'det_result'){
+            if(dictData.label === value){
+                return dictData; 
+            }
+        }
     }
     return undefined;
 }

+ 11 - 7
src/views/backend/fpdDetection/index.vue

@@ -71,7 +71,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="所属单位" align="center" prop="orgId" />
+      <el-table-column label="所属单位" align="center" prop="orgName" />
       <el-table-column
         label="预计检测时间"
         align="center"
@@ -84,14 +84,18 @@
       </el-table-column>
       <el-table-column label="检测项目" align="center" prop="detinspect" />
       <el-table-column label="检测维保结果" align="center" prop="detresult">
-        <!-- <template v-slot="scope">
+        <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.SYSTEM_LOGIN_RESULT"
+            :type="DICT_TYPE.BACKEND_DET_RESULT"
             :value="scope.row.detresult"
           />
-        </template> -->
+        </template>
       </el-table-column>
-      <el-table-column label="资料附件" align="center" prop="att" />
+      <el-table-column label="资料附件" align="center" prop="att" >
+        <template v-slot="scope">
+          <el-link v-if="scope.row.att" type="primary" :href="scope.row.att">下载</el-link>
+        </template>
+        </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -134,8 +138,8 @@
       v-dialogDrag
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="所属单位" prop="orgId">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="所属单位" prop="orgName">
           <el-input v-model="form.orgId" placeholder="请输入所属单位" />
         </el-form-item>
         <el-form-item label="预计检测时间" prop="detdate">