Эх сурвалжийг харах

已选隔离点字体调小

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

+ 13 - 16
src/views/mes/job/jobm/NewOperations.vue

@@ -18,7 +18,6 @@
           :jobProps="jobProps"
         ></WorkShop>
       </keep-alive>
-
     </div>
     <div class="right">
       <div class="right_top">
@@ -148,7 +147,7 @@
                   </el-form-item>
                   <div class="text item">
                     <p
-                      style="color: #606266; font-weight: 600; font-size: 16px"
+                      style="color: #606266; font-weight: 600; font-size: 14px"
                     >
                       已选隔离点
                     </p>
@@ -169,11 +168,11 @@
                       </el-table-column>
                       <el-table-column prop="pointType" label="隔离点类型">
                         <template slot-scope="scope">
-                          {{scope.row.pointType}}
-<!--                          <dict-tag-->
-<!--                            :options="dict.type.point_type"-->
-<!--                            :value="scope.row.pointType"-->
-<!--                          />-->
+                          {{ scope.row.pointType }}
+                          <!--                          <dict-tag-->
+                          <!--                            :options="dict.type.point_type"-->
+                          <!--                            :value="scope.row.pointType"-->
+                          <!--                          />-->
                         </template>
                       </el-table-column>
                       <el-table-column
@@ -182,11 +181,11 @@
                         width="100"
                       >
                         <template slot-scope="scope">
-                          {{scope.row.powerType}}
-<!--                          <dict-tag-->
-<!--                            :options="dict.type.power_type"-->
-<!--                            :value="scope.row.powerType"-->
-<!--                          />-->
+                          {{ scope.row.powerType }}
+                          <!--                          <dict-tag-->
+                          <!--                            :options="dict.type.power_type"-->
+                          <!--                            :value="scope.row.powerType"-->
+                          <!--                          />-->
                         </template>
                       </el-table-column>
                     </el-table>
@@ -553,7 +552,6 @@ export default {
       },
       deep: true,
     },
-
   },
   computed: {
     ...mapGetters("sopSelectPoints", [
@@ -710,7 +708,6 @@ export default {
     },
     // sop下拉change事件
     handleSelectSOP(value) {
-
       this.jobProps = this.sopOptions.filter((item) => item.sopId == value);
       console.log(this.jobProps, "父组件jobProps");
     },
@@ -957,8 +954,8 @@ export default {
           if (res.code === 200) {
             // this.$router.go(-1);
             this.$router.push("/job/jobm");
-            localStorage.removeItem('workshopId')
-            localStorage.removeItem('workareaId')
+            localStorage.removeItem("workshopId");
+            localStorage.removeItem("workareaId");
           } else {
             console.error("编辑工单失败", res);
           }

+ 18 - 22
src/views/mes/sop/sopm/NewSop.vue

@@ -2,8 +2,7 @@
   <div class="newOperations">
     <!--    newOperations盒子开始-->
     <div class="left">
-
-        <!-- 车间 -->
+      <!-- 车间 -->
       <keep-alive>
         <SopLeft
           v-show="this.activeName == 'first'"
@@ -12,16 +11,13 @@
           :sopProps="sopProps"
         ></SopLeft>
       </keep-alive>
-        <!-- 隔离点 style="position: relative;z-index:0"-->
-
-        <IsolationLeftVue
-          v-show="this.activeName == 'second'"
-          :points="points"
-          @selection-changed="handleSelectPoint"
-        ></IsolationLeftVue>
-
-
+      <!-- 隔离点 style="position: relative;z-index:0"-->
 
+      <IsolationLeftVue
+        v-show="this.activeName == 'second'"
+        :points="points"
+        @selection-changed="handleSelectPoint"
+      ></IsolationLeftVue>
     </div>
     <div class="right">
       <div class="right_top">
@@ -133,7 +129,7 @@
 
                   <div class="text item">
                     <p
-                      style="color: #606266; font-weight: 600; font-size: 16px"
+                      style="color: #606266; font-weight: 600; font-size: 14px"
                     >
                       已选隔离点
                     </p>
@@ -154,11 +150,11 @@
                       </el-table-column>
                       <el-table-column prop="pointType" label="隔离点类型">
                         <template slot-scope="scope">
-                          {{scope.row.pointType}}
-<!--                          <dict-tag-->
-<!--                            :options="dict.type.point_type"-->
-<!--                            :value="scope.row.pointType"-->
-<!--                          />-->
+                          {{ scope.row.pointType }}
+                          <!--                          <dict-tag-->
+                          <!--                            :options="dict.type.point_type"-->
+                          <!--                            :value="scope.row.pointType"-->
+                          <!--                          />-->
                         </template>
                       </el-table-column>
                       <el-table-column
@@ -167,11 +163,11 @@
                         width="100"
                       >
                         <template slot-scope="scope">
-                          {{scope.row.powerType}}
-<!--                          <dict-tag-->
-<!--                            :options="dict.type.power_type"-->
-<!--                            :value="scope.row.powerType"-->
-<!--                          />-->
+                          {{ scope.row.powerType }}
+                          <!--                          <dict-tag-->
+                          <!--                            :options="dict.type.power_type"-->
+                          <!--                            :value="scope.row.powerType"-->
+                          <!--                          />-->
                         </template>
                       </el-table-column>
                     </el-table>