1. SPC任务管理页面字段修改

2. SPC任务管理、SPC八大控制图、过程能力指标分页查询修复

src/views/analysis/process/CList.vue

@@ -100,6 +100,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -150,8 +151,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/EWMAList.vue

@@ -100,6 +100,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -150,8 +151,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/I-MRList.vue

@@ -100,6 +100,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -150,8 +151,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/NPList.vue

@@ -100,6 +100,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -150,8 +151,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/PList.vue

@@ -100,6 +100,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -150,8 +151,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/UList.vue

@@ -100,6 +100,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -150,8 +151,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/Xbar-RList.vue

@@ -222,6 +222,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -364,8 +365,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/process/Xbar-SList.vue

@@ -221,6 +221,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -362,8 +363,8 @@ const year = ref("0");
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 12,
-  pageSizes: [12],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const lableValue = ref("");
 const searchRef = ref(null);

src/views/analysis/spc/index.vue

@@ -20,14 +20,14 @@
       <el-table
         :data="tableData"
         border
-        :style="{ height: maxHeight - 80 + 'px' }"
+
       >
         <el-table-column prop="taskCode" label="任务编号" />
         <el-table-column prop="prodtModel" label="产品型号" />
         <el-table-column prop="operationName" label="工序名称" />
         <el-table-column prop="source" label="采集数据源" />
-<!--        <el-table-column prop="param" label="控制参数" />-->
-        <el-table-column prop="chart" label="控制图" />
+        <!--        <el-table-column prop="param" label="控制参数" />-->
+        <!--        <el-table-column prop="chart" label="控制图" />-->
         <el-table-column prop="address" label="预警规则">
           <template #default="{ row }">
             <el-button
@@ -41,9 +41,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="processCount" label="工序采集点数" />
-<!--        <el-table-column prop="centralValue" label="中心值" />-->
-<!--        <el-table-column prop="upperLimit" label="上限" />-->
-<!--        <el-table-column prop="floor" label="下限" />-->
+        <!--        <el-table-column prop="centralValue" label="中心值" />-->
+        <!--        <el-table-column prop="upperLimit" label="上限" />-->
+        <!--        <el-table-column prop="floor" label="下限" />-->
         <el-table-column prop="created" label="创建时间" />
         <el-table-column
           align="center"
@@ -123,12 +123,12 @@
               <el-option label="手动" value="手动" />
             </el-select>
           </el-form-item>
-<!--          <el-form-item label="控制参数" prop="param">-->
-<!--            <el-input v-model="formData.param" />-->
-<!--          </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="param">-->
+          <!--            <el-input v-model="formData.param" />-->
+          <!--          </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-number
               v-model="formData.processCount"
@@ -136,19 +136,19 @@
               :step="1"
             />
           </el-form-item>
-<!--          <el-form-item label="上限" prop="upperLimit">-->
-<!--            <el-input-number v-model="formData.upperLimit" />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="下限" prop="floor">-->
-<!--            <el-input-number v-model="formData.floor" />-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="中心值" prop="centralValue">-->
-<!--            <el-input-number-->
-<!--              :min="formData.floor"-->
-<!--              :max="formData.upperLimit"-->
-<!--              v-model="formData.centralValue"-->
-<!--            />-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="上限" prop="upperLimit">-->
+          <!--            <el-input-number v-model="formData.upperLimit" />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="下限" prop="floor">-->
+          <!--            <el-input-number v-model="formData.floor" />-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="中心值" prop="centralValue">-->
+          <!--            <el-input-number-->
+          <!--              :min="formData.floor"-->
+          <!--              :max="formData.upperLimit"-->
+          <!--              v-model="formData.centralValue"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
         </el-form>
         <div style="display: flex; justify-content: space-evenly">
           <el-button
@@ -198,6 +198,7 @@ const currentOption = reactive({
   total: 0,
   page: 1,
   limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const showStatus = ref(true);
 const tableData = ref([]);
@@ -239,6 +240,7 @@ const toRuler = (row) => {
   router.push({ name: "SPCrules" });
 };
 const getData = async (obj) => {
+  console.log("222222222222222222")
   const { data, code } = await getTableData({
     ...searchRef.value.searchForm,
     pageNo: currentOption.page,
@@ -375,6 +377,14 @@ const reset = () => {
   };
   addStatus.value = false;
   editStatus.value = false;
+  currentOption.value = {
+    total: 0,
+    page: 1,
+    limit: 10,
+    pageSizes: [10, 20, 30, 40, 50],
+  };
+  console.log(currentOption.value, "currentOption.value")
+  console.log("11111111111111111")
 };
 
 const resetData = () => {
@@ -404,7 +414,7 @@ const toSubmit = async () => {
         });
         if (code == "200") {
           ElMessage.success("添加成功！");
-          reset();
+          await reset();
           getData();
         }
       } else {
@@ -425,7 +435,7 @@ const toSubmit = async () => {
         });
         if (code == "200") {
           ElMessage.success("修改成功！");
-          reset();
+          await reset();
           getData();
         }
       } else {

src/views/analysis/target/index/index.vue

@@ -18,15 +18,11 @@
         </el-select>
       </div>
       <div class="body">
-        <div class="text">
-          上限：{{ value ? JSON.parse(value).up : "-" }}
-        </div>
-        <div class="text">
-          下限：{{ value ? JSON.parse(value).down : "-" }}
-        </div>
-<!--        <div class="text">-->
-<!--          计量单位：{{ value ? JSON.parse(value).unit : "-" }}-->
-<!--        </div>-->
+        <div class="text">上限：{{ value ? JSON.parse(value).up : "-" }}</div>
+        <div class="text">下限：{{ value ? JSON.parse(value).down : "-" }}</div>
+        <!--        <div class="text">-->
+        <!--          计量单位：{{ value ? JSON.parse(value).unit : "-" }}-->
+        <!--        </div>-->
       </div>
     </div>
     <div class="databox">
@@ -166,11 +162,7 @@
                     ><span>{{ row.model }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  align="center"
-                  prop="batchNo"
-                  label="生产批号"
-                >
+                <el-table-column align="center" prop="batchNo" label="生产批号">
                   <template #default="{ row }"
                     ><span>{{ row.batchNo }}</span>
                   </template>
@@ -219,7 +211,7 @@
                     ><span>{{ Number(row.cpk).toFixed(2) }}</span>
                   </template>
                 </el-table-column>-->
-<!--                <el-table-column align="center" prop="checkUser" label="检测人">
+                <!--                <el-table-column align="center" prop="checkUser" label="检测人">
                   <template #default="{ row }"
                     ><span>{{ row.checkUser }}</span>
                   </template> </el-table-column
@@ -232,7 +224,7 @@
                     ><span>{{ row.checkDeviceNo }}</span>
                   </template>
                 </el-table-column>-->
-<!--                <el-table-column
+                <!--                <el-table-column
                   align="center"
                   prop="abnormal"
                   width="60"
@@ -448,7 +440,7 @@
                     ><span>{{ Number(row.cpk).toFixed(2) }}</span>
                   </template>
                 </el-table-column>
-<!--                <el-table-column
+                <!--                <el-table-column
                   align="center"
                   width="60"
                   prop="checkUser"
@@ -521,6 +513,7 @@
               :limit="currentOption.limit"
               :pageSizes="currentOption.pageSizes"
               v-model:page="currentOption.page"
+              v-model:limit="currentOption.limit"
               @pagination="getTableData"
             />
           </div>
@@ -842,13 +835,13 @@
               <el-form-item label="极差" prop="range">
                 <el-input v-model="addData.range" />
               </el-form-item> -->
-<!--                <el-form-item label="检测人" prop="checkUser">
+                <!--                <el-form-item label="检测人" prop="checkUser">
                   <el-input v-model="addData.checkUser" />
                 </el-form-item>
                 <el-form-item label="检查设备编号" prop="checkDeviceNo">
                   <el-input v-model="addData.checkDeviceNo" />
                 </el-form-item>-->
-<!--                <el-form-item label="是否异常" prop="abnormal">
+                <!--                <el-form-item label="是否异常" prop="abnormal">
                   <el-input v-model="addData.abnormal" />
                 </el-form-item>
                 <el-form-item label="分析人" prop="analyseUser">
@@ -1240,8 +1233,8 @@ const value = ref(opOptions.value[0].remark);
 const currentOption = reactive({
   total: 0,
   page: 1,
-  limit: 4,
-  pageSizes: [4],
+  limit: 10,
+  pageSizes: [10, 20, 30, 40, 50],
 });
 const modelOptions = ref([]);
 const setChart1Info = () => {
@@ -1679,9 +1672,9 @@ const reset = () => {
   addData.value = { ...resItem };
   currentOption.value = {
     total: 0,
-    page: 0,
-    limit: 4,
-    pageSizes: [4],
+    page: 1,
+    limit: 10,
+    pageSizes: [10, 20, 30, 40, 50],
   };
 };