lucw 9 месяцев назад
Родитель
Сommit
652581c627

+ 50 - 33
src/views/technology/production/components/user-setting-matter-add.vue

@@ -43,16 +43,18 @@
         required
         prop="deviceName"
       >
-        <el-input
-          v-model="formData.deviceName"
-          placeholder="请选择设备"
-          size="small"
-          :readonly="true"
-        >
-          <template #append>
-            <el-button size="small" @click="selectDeviceId">选择设备</el-button>
-          </template>
-        </el-input>
+        <div class="mask-box" @click="selectDeviceId">
+          <el-input
+            v-model="formData.deviceName"
+            placeholder="请选择设备"
+            size="small"
+            :readonly="true"
+          >
+            <template #append>
+              <el-button size="small">选择设备</el-button>
+            </template>
+          </el-input>
+        </div>
       </el-form-item>
 
       <el-form-item v-if="formData.itemType == '3'" label="关联任务">
@@ -79,18 +81,18 @@
         required
         prop="rulesName"
       >
-        <el-input
-          v-model="formData.rulesName"
-          placeholder="请选择记录规则名称"
-          size="small"
-          :readonly="true"
-        >
-          <template #append>
-            <el-button size="small" @click="selectReleaseId"
-              >选择规则</el-button
-            >
-          </template>
-        </el-input>
+        <div class="mask-box" @click="selectReleaseId">
+          <el-input
+            v-model="formData.rulesName"
+            placeholder="请选择记录规则名称"
+            size="small"
+            :readonly="true"
+          >
+            <template #append>
+              <el-button size="small">选择规则</el-button>
+            </template>
+          </el-input>
+        </div>
       </el-form-item>
 
       <el-form-item
@@ -99,16 +101,18 @@
         required
         prop="rulesId"
       >
-        <el-input
-          v-model="formData.rulesName"
-          placeholder="请选择设备有关计划规则,如保养规则,巡点检规则等"
-          size="small"
-          :readonly="true"
-        >
-          <template #append>
-            <el-button size="small" @click="selectRulesId">选择规则</el-button>
-          </template>
-        </el-input>
+        <div class="mask-box" @click="selectRulesId">
+          <el-input
+            v-model="formData.rulesName"
+            placeholder="请选择设备有关计划规则,如保养规则,巡点检规则等"
+            size="small"
+            :readonly="true"
+          >
+            <template #append>
+              <el-button size="small">选择规则</el-button>
+            </template>
+          </el-input>
+        </div>
       </el-form-item>
     </el-form>
 
@@ -317,4 +321,17 @@
   };
 </script>
 
-<style scoped></style>
+<style scoped lang="scss">
+  .mask-box {
+    &::after {
+      content: '';
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      background: rgba(0, 0, 0, 0);
+      cursor: pointer;
+    }
+  }
+</style>

+ 3 - 1
src/views/technology/production/components/user-setting-matter.vue

@@ -169,7 +169,9 @@
       // 查询事项数据
       async getMatterList() {
         const { list } = await produceTaskRecordRules({
-          produceTaskId: this.currentRow.id
+          produceTaskId: this.currentRow.id,
+          pageNum: 1,
+          size: 9999
           // reportWorkType: this.reportWorkType
         });
         console.log('list', list);

+ 2 - 2
vue.config.js

@@ -38,12 +38,12 @@ module.exports = {
 
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
 
-        target: 'http://192.168.1.116:18086',
+        // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {