wangyani 1 жил өмнө
parent
commit
a8ff34f737

+ 32 - 6
src/views/mes/md/segregationpoint/index.vue

@@ -130,7 +130,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="隔离点ID" align="center" prop="pointId">
+      <!-- <el-table-column label="隔离点ID" align="center" prop="pointId">
         <template slot-scope="scope">
           <el-button
             type="text"
@@ -139,7 +139,7 @@
             >{{ scope.row.pointId }}
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="隔离点编号" align="center" prop="pointCode">
         <template slot-scope="scope">
           <el-button
@@ -159,7 +159,7 @@
           />
         </template>
       </el-table-column> -->
-      <el-table-column label="隔离点图" align="center" prop="pointIcon">
+      <el-table-column label="隔离点图" align="center" prop="pointIcon">
         <template slot-scope="scope">
           <img
             :src="scope.row.pointIcon"
@@ -168,6 +168,15 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="隔离点图片" align="center" prop="pointPicture">
+        <template slot-scope="scope">
+          <img
+            :src="scope.row.pointPicture"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="隔离点类型" align="center" prop="pointType">
         <template slot-scope="scope">
           <dict-tag
@@ -251,7 +260,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-form-item label="隔离点名称" prop="pointName">
           <el-input
             style="width: 318px"
@@ -316,11 +324,20 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="隔离点图" prop="pointIcon">
+        <el-form-item label="隔离点图" prop="pointIcon">
           <ImageUpload
             :limit="1"
             :value="form.pointIcon"
             :fileSize="5"
+            @onUploaded="handleIconUplaoded"
+            @onRemoved="handleIconRemoved"
+          ></ImageUpload>
+        </el-form-item>
+        <el-form-item label="隔离点图片" prop="pointPicture">
+          <ImageUpload
+            :limit="1"
+            :value="form.pointPicture"
+            :fileSize="5"
             @onUploaded="handleImgUplaoded"
             @onRemoved="handleImgRemoved"
           ></ImageUpload>
@@ -480,10 +497,18 @@ export default {
     },
     //图片上传成功
     handleImgUplaoded(imgUrl) {
-      this.form.pointIcon = imgUrl[0].url;
+      this.form.pointPicture = imgUrl[0].url;
     },
     //图片移除
     handleImgRemoved(imgUrl) {
+      this.form.pointPicture = null;
+    },
+    //图标上传成功
+    handleIconUplaoded(imgUrl) {
+      this.form.pointIcon = imgUrl[0].url;
+    },
+    // 图标移除
+    handleIconRemoved(imgUrl) {
       this.form.pointIcon = null;
     },
     // 取消按钮
@@ -497,6 +522,7 @@ export default {
         pointCode: null,
         pointName: null,
         pointIcon: null,
+        pointPicture: null,
         pointType: null,
         powerType: null,
         createTime: null,