SPC任务新增修改

.env.development

@@ -10,7 +10,7 @@ VITE_APP_BASE_API = '/dev-api'
 # 上传文件接口地址
 VITE_APP_UPLOAD_URL = 'http://192.168.101.4:7105'
 # 开发接口地址
- VITE_APP_API_URL = 'http://192.168.101.4:7105'
+ VITE_APP_API_URL = 'http://139.155.176.112:7105'
 
 
 # 是否启用 Mock 服务

.vscode/settings.json

@@ -77,4 +77,7 @@
   "i18n-ally.localesPaths": [
     "src/lang"
   ],
+  "[vue]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
 }

src/views/analysis/process/index.vue

@@ -536,44 +536,22 @@
               <el-form-item label="生产批号" prop="batchNo">
                 <el-input v-model="addData.batchNo" />
               </el-form-item>
-              <el-form-item label="数值1" prop="accuracy1">
-                <el-input-number
-                  :precision="2"
-                  :step="0.01"
-                  style="width: 100%"
-                  v-model="addData.accuracy1"
-                />
-              </el-form-item>
-              <el-form-item label="数值2" prop="accuracy2">
-                <el-input-number
-                  :precision="2"
-                  :step="0.01"
-                  v-model="addData.accuracy2"
-                  style="width: 100%"
-                />
-              </el-form-item>
-              <el-form-item label="数值3" prop="accuracy3">
-                <el-input-number
-                  :precision="2"
-                  :step="0.01"
-                  style="width: 100%"
-                  v-model="addData.accuracy3"
-                />
-              </el-form-item>
-              <el-form-item label="数值4" prop="accuracy4">
+              <el-form-item
+                v-for="(item, index) in addData.accuracy"
+                :label="'数值' + (index + 1)"
+                :key="index"
+                :rules="[
+                  {
+                    required: true,
+                    trigger: 'change',
+                  },
+                ]"
+              >
                 <el-input-number
                   :precision="2"
                   :step="0.01"
                   style="width: 100%"
-                  v-model="addData.accuracy4"
-                />
-              </el-form-item>
-              <el-form-item label="数值5" prop="accuracy5">
-                <el-input-number
-                  :precision="2"
-                  style="width: 100%"
-                  :step="0.01"
-                  v-model="addData.accuracy5"
+                  v-model="addData.accuracy[index]"
                 />
               </el-form-item>
               <!-- <el-form-item label="平均值" prop="avg">
@@ -854,11 +832,7 @@ const resItem = {
 };
 const addData = ref({
   // abnormal: "",
-  accuracy1: 0,
-  accuracy2: 0,
-  accuracy3: 0,
-  accuracy4: 0,
-  accuracy5: 0,
+  accuracy: [0, 0, 0, 0],
   analyseUser: "",
   avg: 0,
   batchNo: "",

src/views/analysis/spc/index.vue

@@ -99,13 +99,13 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="工序名称" prop="Index2">
-            <el-select v-model="formData.Index2">
+          <el-form-item label="工序名称" prop="operationName">
+            <el-select v-model="formData.operationName">
               <el-option
-                v-for="(item, index) in opInfoData2"
+                v-for="(item, index) in opOptions"
                 :key="index"
-                :label="item.name"
-                :value="index"
+                :label="item.dictLabel"
+                :value="item.dictLabel"
               />
             </el-select>
           </el-form-item>
@@ -116,22 +116,26 @@
             </el-select>
           </el-form-item>
           <el-form-item label="控制参数" prop="param">
-            <el-input v-model="formData.param" />
+            <el-input-number v-model="formData.param" :min="1" :step="1" />
           </el-form-item>
           <el-form-item label="控制图" prop="chart">
             <el-input :disabled="true" v-model="formData.chart" />
           </el-form-item>
           <el-form-item label="工序采集点数" prop="processCount">
-            <el-input v-model="formData.processCount" />
+            <el-input-number
+              v-model="formData.processCount"
+              :min="1"
+              :step="1"
+            />
           </el-form-item>
           <el-form-item label="中心值" prop="centralValue">
-            <el-input v-model="formData.centralValue" />
+            <el-input-number v-model="formData.centralValue" />
           </el-form-item>
           <el-form-item label="上限" prop="upperLimit">
-            <el-input v-model="formData.upperLimit" />
+            <el-input-number v-model="formData.upperLimit" />
           </el-form-item>
           <el-form-item label="下限" prop="floor">
-            <el-input v-model="formData.floor" />
+            <el-input-number v-model="formData.floor" />
           </el-form-item>
         </el-form>
         <div style="display: flex; justify-content: space-evenly">
@@ -159,7 +163,7 @@
 
 <script setup>
 import Search from "@/components/Search/index.vue";
-import {useDictionaryStore, useSpcStore} from "@/store";
+import { useDictionaryStore, useSpcStore } from "@/store";
 import {
   getTableData,
   getBaseData,
@@ -182,7 +186,6 @@ const currentOption = reactive({
   total: 0,
   page: 1,
   limit: 10,
-
 });
 const showStatus = ref(true);
 const tableData = ref([]);
@@ -203,11 +206,6 @@ const searchForm = [
     prop: "prodtModel",
     type: "input",
   },
-  // {
-  //   label: "工序名称",
-  //   prop: "sss",
-  //   type: "select",
-  // },
 ];
 const maxHeight = ref(null);
 const setHeight = () => {
@@ -228,7 +226,6 @@ const toRuler = (row) => {
   router.push({ name: "SPCrules" });
 };
 const getData = async (obj) => {
-
   const { data, code } = await getTableData({
     ...searchRef.value.searchForm,
     pageNo: currentOption.page,
@@ -286,6 +283,34 @@ const rules = {
       trigger: "change",
     },
   ],
+  processCount: [
+    {
+      required: true,
+
+      trigger: "change",
+    },
+  ],
+  centralValue: [
+    {
+      required: true,
+
+      trigger: "change",
+    },
+  ],
+  upperLimit: [
+    {
+      required: true,
+
+      trigger: "change",
+    },
+  ],
+  floor: [
+    {
+      required: true,
+
+      trigger: "change",
+    },
+  ],
 };
 const opInfoData = ref([]);
 const toAdd = () => {
@@ -330,21 +355,21 @@ const toSubmit = async () => {
       if (valid) {
         const { data, code } = await add({
           chart: formData.value.chart,
-          operationCode:
-            opInfoData.value[formData.value.Index1].operations[
-              formData.value.Index2
-            ].code,
-          operationName:
-            opInfoData.value[formData.value.Index1].operations[
-              formData.value.Index2
-            ].name,
+          // operationCode:
+          //   opInfoData.value[formData.value.Index1].operations[
+          //     formData.value.Index2
+          //   ].code,
+          // operationName:
+          //   opInfoData.value[formData.value.Index1].operations[
+          //     formData.value.Index2
+          //   ].name,
 
-          prodtCode: opInfoData.value[formData.value.Index1].prodtCode,
-          prodtModel: opInfoData.value[formData.value.Index1].prodtModel,
-          prodtName: opInfoData.value[formData.value.Index1].prodtName,
-          unit: opInfoData.value[formData.value.Index1].unit,
+          // prodtCode: opInfoData.value[formData.value.Index1].prodtCode,
+          // prodtModel: opInfoData.value[formData.value.Index1].prodtModel,
+          // prodtName: opInfoData.value[formData.value.Index1].prodtName,
+          // unit: opInfoData.value[formData.value.Index1].unit,
+          operationName: formData.value.operationName,
           param: formData.value.param,
-
           source: formData.value.source,
           processCount: formData.value.processCount,
           centralValue: formData.value.centralValue,
@@ -365,18 +390,18 @@ const toSubmit = async () => {
       if (valid) {
         const { data, code } = await updateData({
           ...formData.value,
-          operationCode:
-            opInfoData.value[formData.value.Index1].operations[
-              formData.value.Index2
-            ].code,
-          operationName:
-            opInfoData.value[formData.value.Index1].operations[
-              formData.value.Index2
-            ].name,
-          prodtCode: opInfoData.value[formData.value.Index1].prodtCode,
-          prodtModel: opInfoData.value[formData.value.Index1].prodtModel,
-          prodtName: opInfoData.value[formData.value.Index1].prodtName,
-          unit: opInfoData.value[formData.value.Index1].unit,
+          // operationCode:
+          //   opInfoData.value[formData.value.Index1].operations[
+          //     formData.value.Index2
+          //   ].code,
+          // operationName:
+          //   opInfoData.value[formData.value.Index1].operations[
+          //     formData.value.Index2
+          //   ].name,
+          // prodtCode: opInfoData.value[formData.value.Index1].prodtCode,
+          // prodtModel: opInfoData.value[formData.value.Index1].prodtModel,
+          // prodtName: opInfoData.value[formData.value.Index1].prodtName,
+          // unit: opInfoData.value[formData.value.Index1].unit,
         });
         if (code == "200") {
           ElMessage.success("修改成功！");
@@ -408,25 +433,30 @@ onMounted(() => {
   padding: 20px;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     height: auto;
   }
+
   .table {
     flex: 1;
     padding-bottom: 20px;
   }
+
   .formView {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
+
     .formTitle {
       text-align: center;
       font-size: 20px;
       margin-bottom: 20px;
     }
+
     .formStyle {
       width: 400px;
     }