Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev

ALOps_sys_fe/alops-ui/src/components/ImageUpload/index.vue

@@ -237,6 +237,7 @@ export default {
     // 上传结束处理
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
+        console.log("%c 😄: uploadedSuccessfully ->  this.uploadList ", "font-size:16px;background-color:#25d8b3;color:black;",  this.uploadList)
         this.fileList = this.fileList.concat(this.uploadList)
         this.uploadList = []
         this.number = 0

ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue

@@ -37,7 +37,7 @@
               <!-- <el-table-column label="类型编号" align="center" key="id" prop="id"/> -->
               <el-table-column label="设备类型名称" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
               <el-table-column label="描述" align="center" key="description" prop="description" :show-overflow-tooltip="true" />
-              <el-table-column label="图片" align="center" key="image" prop="image" :show-overflow-tooltip="true" >
+              <el-table-column label="图片" align="center" key="image" prop="image" min-width="150" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
                   <ImagePreview height="100px" :src="scope.row.image"/>
                 </template>

ALOps_sys_fe/alops-ui/src/views/device/files/index.vue

@@ -78,9 +78,9 @@
               <el-table-column label="设备管理员" align="center" key="inCharge" prop="inCharge" width="120" />
               <el-table-column label="预计使用年限" align="center" key="lifeCycle" prop="lifeCycle" width="120" />
               <el-table-column label="质保时间" align="center" key="warranty" prop="warranty"  width="120" />
-              <el-table-column label="设备图片" align="center" key="equImage" prop="equImage" :show-overflow-tooltip="true" >
+              <el-table-column label="设备图片" align="center" key="equImage" prop="equImage" min-width="150" :show-overflow-tooltip="true" >
                 <template slot-scope="scope">
-                  <ImagePreview :src="scope.row.equImage"/>
+                  <ImagePreview height="100px" :src="scope.row.equImage"/>
                 </template>
               </el-table-column>
               <el-table-column label="设备添加人" align="center" key="createBy" prop="createBy"  width="120" />