1.14 bug

src/views/archiveDataManagement/dataList/index.vue

@@ -60,7 +60,7 @@
         align="center"
       >
       </el-table-column>
-      <el-table-column prop="imageResolution" label="分辨率" align="center">
+      <el-table-column prop="imageResolutionStr" label="分辨率" align="center">
       </el-table-column>
       <el-table-column prop="imageTakeTimeStr" label="拍摄时间" align="center">
       </el-table-column>
@@ -142,7 +142,10 @@ export default {
         if (res.status == 200) {
           this.total = res.data.totalCount;
           this.list = res.data.data;
+
           this.list.map((item) => {
+            console.log(item);
+            item.imageResolutionStr = item.imageResolution.join("m,") + "m";
             item.imageTakeTimeStr = timestamp2DateAuto(
               item.imageTakeTime,
               "yyyy-MM-dd hh:mm:ss"

src/views/webSiteManagement/industryApplication/applicationCate/index.vue

@@ -163,13 +163,13 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="父级" align="center">
+        <!-- <el-table-column label="父级" align="center">
           <template slot-scope="scope">
             <span class="typelevel">{{
               getFatherTypeName(scope.row.pid)
             }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="排序" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.sort }}</span>
@@ -529,9 +529,12 @@ export default {
             }
           });
         }
-        this.tableData.forEach((obj,index)=> {
-          obj.index = ((this.typePagination.currentPage-1)*this.typePagination.pageSize)+(++index)
-        })
+        this.tableData.forEach((obj, index) => {
+          obj.index =
+            (this.typePagination.currentPage - 1) *
+              this.typePagination.pageSize +
+            ++index;
+        });
       }
     },
     // 删除类型