Sfoglia il codice sorgente

后台界面 大屏界面修改

zhanghao 1 mese fa
parent
commit
2b3e6f5981

+ 4 - 4
src/views/screen/engineering/unitAccessDialog.vue

@@ -507,8 +507,8 @@ export default {
 .terminal-dialog-area {
   overflow: hidden;
   width: 580px;
-  height: 581px;
-  background: url("../../../assets/images/main/components_bg_2025.png");
+  height: 920px;
+  background: url("../../../assets/images/main/main_bg.png");
   background-size: cover;
   padding: 19px 15px 11px 15px;
 
@@ -539,10 +539,10 @@ export default {
 
   .dialog-cont {
     width: 550px;
-    height: 493px;
+    height: 849px;
     padding: 15px;
     overflow-y: scroll;
-    background: url("../../../assets/images/main/components_nable.png")
+    background: url("../../../assets/images/main/components_long_bg.png")
     no-repeat;
     background-size: cover;
 

+ 6 - 1
src/views/zcustom/carDetail/index.vue

@@ -76,7 +76,12 @@
         </template>
       </el-table-column>
       <el-table-column label="处置原因" align="center" prop="handleReason" />
-      <el-table-column label="类别" align="center" prop="flag" />
+      <el-table-column label="类别" align="center" prop="flag">
+        <template slot-scope="scope">
+          <span v-if="scope.row.flag === 0">增加</span>
+          <span v-if="scope.row.flag === 1">减少</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

+ 23 - 1
src/views/zcustom/land/index.vue

@@ -74,7 +74,16 @@
       </el-table-column>
       <el-table-column label="房产名称" align="center" prop="housing" />
       <el-table-column label="房产面积" align="center" prop="acreage" />
-      <el-table-column label="房产类型" align="center" prop="type" />
+      <el-table-column label="房产类型" align="center" prop="type">
+        <template slot-scope="scope">
+          {{options[scope.row.type].label}}
+        </template>
+      </el-table-column>
+      <el-table-column label="所属单位" align="center" prop="appOrg">
+        <template slot-scope="scope">
+          {{findLabelByValue(treeList, scope.row.appOrg ? scope.row.appOrg : null)}}
+        </template>
+      </el-table-column>
       <el-table-column label="施工时间" align="center" prop="constructionTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.constructionTime) }}</span>
@@ -383,6 +392,19 @@ export default {
           this.$modal.msgSuccess("导入成功");
         }
       });
+    },
+    findLabelByValue(list, appOrg) {
+      for (const item of list) {
+        if (item.appOrg == null) return "无";
+        if (item.appOrg === appOrg) {
+          return item.appName;
+        }
+        if (item.children) {
+          const result = this.findLabelByValue(item.children, appOrg);
+          if (result) return result;
+        }
+      }
+      return "无";
     }
   }
 };