2 Commits f21d1dffc2 ... f4e8d4f0f6

Autore SHA1 Messaggio Data
  zhangyu f4e8d4f0f6 Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType 3 anni fa
  zhangyu 0f9e02daef 添加占位符 3 anni fa

+ 14 - 2
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -10,8 +10,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localName" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localName || '--'}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipFamily.familyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

+ 8 - 2
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -13,7 +13,7 @@
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.localName}}
+              {{scope.row.localName || '--'}}
               <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
                         :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
                         class="item" type="warning">
@@ -21,7 +21,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

+ 8 - 2
src/components/data_admin/buildTask/table/modelTable.vue

@@ -7,7 +7,7 @@
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
-              {{scope.row.localName}}
+              {{scope.row.localName || '--'}}
               <el-badge v-if="scope.row.component&&scope.row.component.length?true:false"
                         :value="scope.row.component&&scope.row.component.length?scope.row.component.length:0"
                         class="item" type="warning">
@@ -15,7 +15,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipCategory.name" :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column prop="bimId" label="BIM ID" show-overflow-tooltip min-width="220"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="60"></el-table-column>

+ 14 - 2
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -10,8 +10,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="localName" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localName || '--'}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipFamily.familyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>

+ 14 - 2
src/components/data_admin/buildTask/table/tearTable.vue

@@ -10,8 +10,20 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="localId" :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="localName" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localName || '--'}}
+                </div>
+            </template>
+        </el-table-column>
+        <el-table-column :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100">
+            <template slot-scope="scope">
+                <div>
+                    {{scope.row.localId || '--'}}
+                </div>
+            </template>
+        </el-table-column>
         <el-table-column prop="equipFamily.familyName" label="设备族" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="installLocation" label="安装位置" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="taskState" label="任务执行情况" show-overflow-tooltip min-width="100"></el-table-column>