区域设置新增弹框补充 车间背景图显示修改

src/components/separationPoint/workshop.vue

@@ -1,66 +1,69 @@
 <template>
   <div class="leftcon">
-    <el-form ref="form" :model="form" label-width="100px" :inline="true">
-      <el-form-item label="车间">
-        <el-select
-          v-model="form.workShop"
-          placeholder="请选择车间"
-          @change="handleselect"
-        >
-          <el-option
-            v-for="item in this.workShopOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+    <!-- <img src="../../assets/images/workshop.png" alt="" /> -->
+    <div class="leftsize">
+      <el-form ref="form" :model="form" label-width="100px" :inline="true">
+        <el-form-item label="车间">
+          <el-select
+            v-model="form.workShop"
+            placeholder="请选择车间"
+            @change="handleselect"
           >
-          </el-option>
-        </el-select>
-        <!--        <el-select-->
-        <!--          v-model="form.workShop"-->
-        <!--          v-bind="$attrs"-->
-        <!--          multiple-->
-        <!--          style="width: 100%"-->
-        <!--          placeholder="请选择线路"-->
-        <!--          @change="handleSelect"-->
-        <!--        >-->
-        <!--          <div style="padding: 0 20px; line-height: 34px">-->
-        <!--            <el-checkbox-->
-        <!--              v-model="checkAll"-->
-        <!--              :indeterminate="isIndeterminate"-->
-        <!--              @change="handleCheckAllChange"-->
-        <!--            >全选</el-checkbox-->
-        <!--            >-->
-        <!--          </div>-->
-        <!--          <el-checkbox-group v-model="form.workShop">-->
-        <!--            <el-option-->
-        <!--              v-for="item in this.workShopOptions"-->
-        <!--              :key="item.value"-->
-        <!--              :label="item.label"-->
-        <!--              :value="item.value"-->
-        <!--            >-->
-        <!--              <el-checkbox style="pointer-events: none" :label="item.value">-->
-        <!--                {{ item.label }}-->
-        <!--              </el-checkbox>-->
-        <!--            </el-option>-->
-        <!--          </el-checkbox-group>-->
-        <!--        </el-select>-->
-      </el-form-item>
-      <el-form-item label="生产线">
-        <el-select
-          v-model="form.producLine"
-          placeholder="请选择生产线"
-          @change="handleselectProductLine"
-        >
-          <el-option
-            v-for="item in this.producLineOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            <el-option
+              v-for="item in this.workShopOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <!--        <el-select-->
+          <!--          v-model="form.workShop"-->
+          <!--          v-bind="$attrs"-->
+          <!--          multiple-->
+          <!--          style="width: 100%"-->
+          <!--          placeholder="请选择线路"-->
+          <!--          @change="handleSelect"-->
+          <!--        >-->
+          <!--          <div style="padding: 0 20px; line-height: 34px">-->
+          <!--            <el-checkbox-->
+          <!--              v-model="checkAll"-->
+          <!--              :indeterminate="isIndeterminate"-->
+          <!--              @change="handleCheckAllChange"-->
+          <!--            >全选</el-checkbox-->
+          <!--            >-->
+          <!--          </div>-->
+          <!--          <el-checkbox-group v-model="form.workShop">-->
+          <!--            <el-option-->
+          <!--              v-for="item in this.workShopOptions"-->
+          <!--              :key="item.value"-->
+          <!--              :label="item.label"-->
+          <!--              :value="item.value"-->
+          <!--            >-->
+          <!--              <el-checkbox style="pointer-events: none" :label="item.value">-->
+          <!--                {{ item.label }}-->
+          <!--              </el-checkbox>-->
+          <!--            </el-option>-->
+          <!--          </el-checkbox-group>-->
+          <!--        </el-select>-->
+        </el-form-item>
+        <el-form-item label="生产线">
+          <el-select
+            v-model="form.producLine"
+            placeholder="请选择生产线"
+            @change="handleselectProductLine"
           >
-          </el-option>
-        </el-select>
-      </el-form-item>
-    </el-form>
+            <el-option
+              v-for="item in this.producLineOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
   </div>
 </template>
 
@@ -80,7 +83,6 @@ export default {
       type: Array,
       default: () => [],
     },
-
   },
   data() {
     return {
@@ -109,7 +111,7 @@ export default {
           .catch((error) => {
             console.error("处理车间下拉失败", error);
           });
-           // 这里是为了拿到sop模板里默认的隔离点选中的数据
+        // 这里是为了拿到sop模板里默认的隔离点选中的数据
         selectIsSopById(newVal[0].sopId).then((res) => {
           console.log(res, "sop");
           const selectSopPoints = res.data.pointDetailVOList.map((item) => {
@@ -117,7 +119,7 @@ export default {
           });
           // 调用 Vuex action 来存储 selectSopPoints
           this.setSelectSopPoints(selectSopPoints);
-          this.setSopEdit(true)
+          this.setSopEdit(true);
           console.log(selectSopPoints, "sop_selectePoints");
         });
       },
@@ -139,7 +141,7 @@ export default {
           });
 
         // 这里是为了拿到sop模板里默认的隔离点选中的数据a
-        if(!newVal[0].EditBool){
+        if (!newVal[0].EditBool) {
           selectIsSopById(newVal[0].sopId).then((res) => {
             console.log(res, "sop");
             const selectSopPoints = res.data.pointDetailVOList.map((item) => {
@@ -148,32 +150,31 @@ export default {
 
             // 调用 Vuex action 来存储 selectSopPoints
             this.setSelectSopPoints(selectSopPoints);
-            this.setPointTableData(res.data)
-            this.setSopEdit(false)
+            this.setPointTableData(res.data);
+            this.setSopEdit(false);
             console.log(selectSopPoints, "sop_selectePoints");
           });
-        }else{
+        } else {
           const selectSopPoints = newVal[0].spoint.map((item) => {
             return item.pointId;
           });
           this.setSelectSopPoints(selectSopPoints);
-          this.setPointTableData(newVal[0].spoint)
-          this.setSopEdit(true)
+          this.setPointTableData(newVal[0].spoint);
+          this.setSopEdit(true);
         }
-
       },
       immediate: true, // 立即执行一次，确保在组件初始化时也能捕获到 jobProps 的值
     },
-
   },
   mounted() {
     this.getworkshopList();
-
   },
 
   methods: {
-    ...mapActions('sopSelectPoints', [
-      'setSelectSopPoints','setPointTableData','setSopEdit'
+    ...mapActions("sopSelectPoints", [
+      "setSelectSopPoints",
+      "setPointTableData",
+      "setSopEdit",
     ]),
 
     // 获取车间列表
@@ -259,10 +260,23 @@ export default {
 .leftcon {
   width: 100%;
   height: 100%;
-  //   background-color: rgba(229, 229, 229, 1);
-  background: url("../../assets/images/sopbgimg.png") no-repeat;
+  // background-color: rgba(229, 229, 229, 1);
   background-size: 100% 100%;
   //   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.4);
-  padding: 3% 4%;
+  // padding: 3% 4%;
+  .leftsize {
+    width: 1100px;
+    height: 100%;
+    background: #000;
+    background: url("../../assets/images/workshop.png") no-repeat center;
+    background-size: 100% 100%;
+    padding: 3% 4%;
+    margin: auto;
+  }
+  // img {
+  //   width: 1000px;
+  //   height: 830px;
+  //   margin-left: 80px;
+  // }
 }
 </style>

src/views/mes/job/jobm/NewOperations.vue

@@ -1042,7 +1042,7 @@ export default {
   .left {
     width: 75%;
     height: 830px;
-    background: #eee;
+    // background: #eee;
     margin-right: 10px;
   }
 

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

@@ -54,7 +54,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:wa:waa:add']"
+          v-hasPermi="['mes:md:waa:add']"
           >新增
         </el-button>
       </el-col>
@@ -77,7 +77,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['mes:wa:waa:batchremove']"
+          v-hasPermi="['mes:md:waa:batchremove']"
           >批量删除
         </el-button>
       </el-col>
@@ -108,7 +108,7 @@
           <el-button
             type="text"
             @click="handleView(scope.row)"
-            v-hasPermi="['mes:wa:waa:query']"
+            v-hasPermi="['mes:md:waa:query']"
             >{{ scope.row.workareaId }}
           </el-button>
         </template>
@@ -118,7 +118,7 @@
           <el-button
             type="text"
             @click="handleView(scope.row)"
-            v-hasPermi="['mes:wa:waa:query']"
+            v-hasPermi="['mes:md:waa:query']"
             >{{ scope.row.workareaCode }}
           </el-button>
         </template>
@@ -164,7 +164,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['mes:wa:waa:edit']"
+            v-hasPermi="['mes:md:waa:edit']"
             >编辑
           </el-button>
           <el-button
@@ -172,7 +172,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['mes:wa:waa:remove']"
+            v-hasPermi="['mes:md:waa:remove']"
             >删除
           </el-button>
         </template>
@@ -186,6 +186,83 @@
       :limit.sync="queryParams.size"
       @pagination="getList"
     />
+    <!-- 添加或修改班组对话框 -->
+    <el-dialog :visible.sync="open" width="660px" append-to-body>
+      <div slot="title" class="dialog-title">
+        <i></i>
+        <span class="title">{{ title }}</span>
+      </div>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="区域名称" prop="workareaName">
+          <el-input
+            style="width: 318px"
+            v-model="form.workareaName"
+            placeholder="请输入区域名称"
+          />
+        </el-form-item>
+        <el-row>
+          <el-col :span="13">
+            <el-form-item label="区域编码" prop="workareaCode">
+              <el-input
+                v-model="form.workareaCode"
+                placeholder="请输入区域编码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+                v-if="optType != 'view'"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="区域类型" prop="workareaType">
+          <el-input
+            style="width: 318px"
+            v-model="form.workareaType"
+            placeholder="请输入区域类型"
+          />
+        </el-form-item>
+        <el-form-item label="所属车间" prop="workshopId">
+          <el-select
+            style="width: 318px"
+            v-model="form.workshopId"
+            placeholder="请选择所属车间"
+          >
+            <el-option
+              v-for="dict in this.WorkShopListOptions"
+              :key="dict.key"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="地图" prop="map">
+          <el-input
+            style="width: 318px"
+            v-model="form.map"
+            placeholder="请输入地图"
+          />
+          <!--          <ImageUpload :limit="1" :value="form.map" :fileSize="5" @onUploaded="handleImgUplaoded" @onRemoved="handleImgRemoved" ></ImageUpload>-->
+        </el-form-item>
+        <!--        <el-form-item label="备注" prop="remark">-->
+        <!--          <el-input style="width: 318px" type="textarea"  v-model="form.remark" placeholder="请输入备注" />-->
+        <!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType == 'view'"
+          >返回</el-button
+        >
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 

src/views/mes/sop/sopm/NewSop.vue

@@ -120,7 +120,11 @@
                   </el-form-item>
 
                   <div class="text item">
-                    <p style="color:#606266;font-weight: 600;font-size: 16px">已选隔离点</p>
+                    <p
+                      style="color: #606266; font-weight: 600; font-size: 16px"
+                    >
+                      已选隔离点
+                    </p>
                     <el-table
                       :data="tableData"
                       stripe
@@ -268,7 +272,7 @@ export default {
   computed: {
     ...mapGetters("sopSelectPoints", ["getSopTitle"]),
   },
-  
+
   methods: {
     ...mapActions("sopSelectPoints", [
       "setSelectSopPoints",
@@ -459,7 +463,7 @@ export default {
   .left {
     width: 75%;
     height: 830px;
-    background: #eee;
+    // background: #eee;
     margin-right: 10px;
   }
   .right {