Merge remote-tracking branch 'origin/dev' into dev

src/enum/dict.js

@@ -50,7 +50,9 @@ export default {
   版本规则分类: 'version_rule_type',
   生产类型: 'productionType',
   质检标准类型: 'quality_testing_code',
-  质检方式: 'quality_method_code'
+  质检方式: 'quality_method_code',
+  预警类型: 'warning_type'
+
 };
 
 export const numberList = [

src/views/rulesManagement/earlyWarningRules/components/matter-add.vue

@@ -16,8 +16,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="规则类型" prop="ruleType">
-              <DictSelection dictName="规则类型" clearable v-model="formData.ruleType">
+            <el-form-item label="预警类型" prop="ruleType">
+              <DictSelection dictName="预警类型" clearable v-model="formData.ruleType">
               </DictSelection>
             </el-form-item>
           </el-col>
@@ -219,7 +219,7 @@ export default {
           { required: true, message: '请输入规则名称', trigger: 'blur' }
         ],
         ruleType: [
-          { required: true, message: '请选择规则类型', trigger: 'change' }
+          { required: true, message: '请选择预警类型', trigger: 'change' }
         ],
     
         // contentImage: [

src/views/rulesManagement/earlyWarningRules/components/matter-search.vue

@@ -35,8 +35,8 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="规则类型:">
-          <DictSelection dictName="规则类型" clearable v-model.trim="where.type">
+        <el-form-item label="预警类型:">
+          <DictSelection dictName="预警类型" clearable v-model.trim="where.type">
           </DictSelection>
         </el-form-item>
         <el-form-item label="组织机构:">

src/views/rulesManagement/earlyWarningRules/components/rule-cycle.vue

@@ -2,11 +2,11 @@
   <div>
     <el-row :gutter="8" v-if="pageType">
       <el-col :span="2">
-        <el-input
-          @input="
+        <!-- @input="
             (value) =>
               (formData.cycleValue = value.replace(/^(0+)|[^\d]+/g, ''))
-          "
+          " -->
+        <el-input
           class="cycle_value"
           size="small"
           v-model.number="formData.cycleValue"

src/views/rulesManagement/earlyWarningRules/index.vue

@@ -121,13 +121,13 @@
           },
           {
             prop: 'ruleType',
-            label: '规则类型',
+            label: '预警类型',
             align: 'center',
             showOverflowTooltip: true,
             slot: 'enable',
             minWidth: 110,
             formatter: (_row, _column, cellValue) => {
-              return this.getDictValue('规则类型', _row.ruleType);
+              return this.getDictValue('预警类型', _row.ruleType);
             }
           },
           {
@@ -185,7 +185,7 @@
     computed: {},
     created() {
       this.requestDict('规则周期');
-      this.requestDict('规则类型');
+      this.requestDict('预警类型');
       this.requestDict('规则状态');
     },
     methods: {

src/views/technology/stepManagement/components/user-search.vue

@@ -8,12 +8,12 @@
   >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
-        <el-form-item label="工序编码:">
+        <el-form-item label="工步编码:">
           <el-input clearable v-model.trim="where.code" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 6 }">
-        <el-form-item label="工序名称:">
+        <el-form-item label="工步名称:">
           <el-input clearable v-model.trim="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>

vue.config.js

@@ -33,7 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''