解决冲突

src/views/mes/hw/information/index.vue

@@ -706,7 +706,7 @@ export default {
     //自动生成编码
     handleAutoGenChange(autoGenFlag) {
       if (autoGenFlag) {
-        genCode("HARDWARE_TYPE").then((response) => {
+        genCode("HARDWARE_CODE").then((response) => {
           this.form.hardwareCode = response;
         });
       } else {

src/views/mes/md/segregationpoint/index.vue

@@ -159,11 +159,15 @@
           />
         </template>
       </el-table-column> -->
-            <el-table-column label="隔离点图片" align="center" prop="pointIcon">
-              <template slot-scope="scope">
-                <img :src="scope.row.pointIcon" alt="" style="width: 50px;height: 50px"/>
-              </template>
-            </el-table-column>
+      <el-table-column label="隔离点图片" align="center" prop="pointIcon">
+        <template slot-scope="scope">
+          <img
+            :src="scope.row.pointIcon"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
+        </template>
+      </el-table-column>
       <el-table-column label="隔离点类型" align="center" prop="pointType">
         <template slot-scope="scope">
           <dict-tag
@@ -444,6 +448,8 @@ export default {
   },
   created() {
     this.getList();
+    this.getworkShop();
+    this.getworkArea();
   },
   methods: {
     // 格式化日期查询数据
@@ -560,7 +566,7 @@ export default {
               this.getList();
             });
           } else {
-            console.log(this.form,'新增参数');
+            console.log(this.form, "新增参数");
             addinsertIsIsolationPoint(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
@@ -608,7 +614,7 @@ export default {
     // 获取车间数据
     getworkShop() {
       workshoplistAll().then((response) => {
-        // console.log(response, "获取车间数据");
+        console.log(response, "获取车间数据");
         this.workshopList = response.data.map((item) => {
           return {
             label: item.workshopName,
@@ -628,7 +634,7 @@ export default {
 
       if (workshopId) {
         getIsWorkareaList(workshopId).then((response) => {
-          // console.log(response, "获取工作区域数据");
+          console.log(response, "获取工作区域数据");
           this.workareaList = response.data.map((item) => {
             return {
               label: item.workareaName,