数据分析模块修改功能优化、增加删除提示、文件上传提示修改

src/views/analysis/process/CList.vue

@@ -121,11 +121,12 @@ import {
   deleteQualityFile,
   updateData,
   getTaskCode,
-  CCompute2,
+  CCompute2, deleteData,
 } from "@/api/analysis";
 import Search from "@/components/Search/index.vue";
 import { uploadFileApi } from "@/api/file";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -191,7 +192,7 @@ const searchForm = [
   },
   {
     label: "文件名称",
-    prop: "model",
+    prop: "fileName",
     type: "input",
   },
 ];
@@ -850,13 +851,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteQualityFile({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteQualityFile({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const emit = defineEmits(["tableData"]);
 const compute = async (filePath) => {
@@ -914,11 +921,11 @@ const beforeUpload = (file) => {
 const uploadRef = ref("uploadRef");
 const handleSuccess = (response) => {
   if (response.code === "200") {
-    ElMessage.success("Excel导入成功！");
+    ElMessage.success("文件上传成功！");
     uploadRef.value.clearFiles();
     getTableData();
   } else {
-    ElMessage.error("Excel导入失败！");
+    ElMessage.error("文件上传失败！");
   }
 };
 onMounted(async () => {

src/views/analysis/process/EWMAList.vue

@@ -121,11 +121,12 @@ import {
   deleteQualityFile,
   updateData,
   getTaskCode,
-  EWMACompute2,
+  EWMACompute2, deleteData,
 } from "@/api/analysis";
 import Search from "@/components/Search/index.vue";
 import { uploadFileApi } from "@/api/file";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -191,7 +192,7 @@ const searchForm = [
   },
   {
     label: "文件名称",
-    prop: "model",
+    prop: "fileName",
     type: "input",
   },
 ];
@@ -850,13 +851,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteQualityFile({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteQualityFile({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const emit = defineEmits(["tableData"]);
 const compute = async (filePath) => {
@@ -914,11 +921,11 @@ const beforeUpload = (file) => {
 const uploadRef = ref("uploadRef");
 const handleSuccess = (response) => {
   if (response.code === "200") {
-    ElMessage.success("Excel导入成功！");
+    ElMessage.success("文件上传成功！");
     uploadRef.value.clearFiles();
     getTableData();
   } else {
-    ElMessage.error("Excel导入失败！");
+    ElMessage.error("文件上传失败！");
   }
 };
 onMounted(async () => {

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

@@ -121,11 +121,12 @@ import {
   deleteQualityFile,
   updateData,
   getTaskCode,
-  IMRCompute2,
+  IMRCompute2, deleteData,
 } from "@/api/analysis";
 import Search from "@/components/Search/index.vue";
 import { uploadFileApi } from "@/api/file";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -191,7 +192,7 @@ const searchForm = [
   },
   {
     label: "文件名称",
-    prop: "model",
+    prop: "fileName",
     type: "input",
   },
 ];
@@ -850,13 +851,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteQualityFile({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteQualityFile({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const emit = defineEmits(["tableData"]);
 const compute = async (filePath) => {
@@ -914,11 +921,11 @@ const beforeUpload = (file) => {
 const uploadRef = ref("uploadRef");
 const handleSuccess = (response) => {
   if (response.code === "200") {
-    ElMessage.success("Excel导入成功！");
+    ElMessage.success("文件上传成功！");
     uploadRef.value.clearFiles();
     getTableData();
   } else {
-    ElMessage.error("Excel导入失败！");
+    ElMessage.error("文件上传失败！");
   }
 };
 onMounted(async () => {

src/views/analysis/process/NPList.vue

@@ -121,11 +121,12 @@ import {
   deleteQualityFile,
   updateData,
   getTaskCode,
-  NPCompute2,
+  NPCompute2, deleteData,
 } from "@/api/analysis";
 import Search from "@/components/Search/index.vue";
 import { uploadFileApi } from "@/api/file";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -191,7 +192,7 @@ const searchForm = [
   },
   {
     label: "文件名称",
-    prop: "model",
+    prop: "fileName",
     type: "input",
   },
 ];
@@ -850,13 +851,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteQualityFile({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteQualityFile({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const emit = defineEmits(["tableData"]);
 const compute = async (filePath) => {
@@ -914,11 +921,11 @@ const beforeUpload = (file) => {
 const uploadRef = ref("uploadRef");
 const handleSuccess = (response) => {
   if (response.code === "200") {
-    ElMessage.success("Excel导入成功！");
+    ElMessage.success("文件上传成功！");
     uploadRef.value.clearFiles();
     getTableData();
   } else {
-    ElMessage.error("Excel导入失败！");
+    ElMessage.error("文件上传失败！");
   }
 };
 onMounted(async () => {

src/views/analysis/process/PList.vue

@@ -121,11 +121,12 @@ import {
   deleteQualityFile,
   updateData,
   getTaskCode,
-  PCompute2,
+  PCompute2, deleteData,
 } from "@/api/analysis";
 import Search from "@/components/Search/index.vue";
 import { uploadFileApi } from "@/api/file";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -191,7 +192,7 @@ const searchForm = [
   },
   {
     label: "文件名称",
-    prop: "model",
+    prop: "fileName",
     type: "input",
   },
 ];
@@ -850,13 +851,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteQualityFile({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteQualityFile({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const emit = defineEmits(["tableData"]);
 const compute = async (filePath) => {
@@ -914,11 +921,11 @@ const beforeUpload = (file) => {
 const uploadRef = ref("uploadRef");
 const handleSuccess = (response) => {
   if (response.code === "200") {
-    ElMessage.success("Excel导入成功！");
+    ElMessage.success("文件上传成功！");
     uploadRef.value.clearFiles();
     getTableData();
   } else {
-    ElMessage.error("Excel导入失败！");
+    ElMessage.error("文件上传失败！");
   }
 };
 onMounted(async () => {

src/views/analysis/process/UList.vue

@@ -121,11 +121,12 @@ import {
   deleteQualityFile,
   updateData,
   getTaskCode,
-  UCompute2,
+  UCompute2, deleteData,
 } from "@/api/analysis";
 import Search from "@/components/Search/index.vue";
 import { uploadFileApi } from "@/api/file";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -191,7 +192,7 @@ const searchForm = [
   },
   {
     label: "文件名称",
-    prop: "model",
+    prop: "fileName",
     type: "input",
   },
 ];
@@ -850,13 +851,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteQualityFile({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteQualityFile({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const emit = defineEmits(["tableData"]);
 const compute = async (filePath) => {
@@ -914,11 +921,11 @@ const beforeUpload = (file) => {
 const uploadRef = ref("uploadRef");
 const handleSuccess = (response) => {
   if (response.code === "200") {
-    ElMessage.success("Excel导入成功！");
+    ElMessage.success("文件上传成功！");
     uploadRef.value.clearFiles();
     getTableData();
   } else {
-    ElMessage.error("Excel导入失败！");
+    ElMessage.error("文件上传失败！");
   }
 };
 onMounted(async () => {

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

@@ -356,6 +356,7 @@ import {
 import Search from "@/components/Search/index.vue";
 import { XBarRCompute, collectData } from "@/api/analysis";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -637,7 +638,8 @@ const opOptions = ref([...dicts.spc_operation]);
 //修改
 const updataItem = (row) => {
   editStatus.value = true;
-  addData.value = row;
+  const data = JSON.parse(JSON.stringify(row));
+  addData.value = data;
   addStatus.value = true;
   emit("update:addStatus", addStatus.value);
   emit("update:editStatus", editStatus.value);
@@ -681,13 +683,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteData({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteData({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const updateSubmit = async () => {
   addData.value.abnormal = null;

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

@@ -278,7 +278,7 @@
                     v-for="(item, index) in taskOption"
                     :key="index"
                     :label="item.taskCode"
-                    :value="item.id"
+                    :value="Number(item.id)"
                   />
                 </el-select>
               </el-form-item>
@@ -354,6 +354,7 @@ import {
 import Search from "@/components/Search/index.vue";
 import { XBarSCompute, collectData } from "@/api/analysis";
 import { useCrud } from "@/hooks/userCrud";
+import {ElMessage, ElMessageBox} from "element-plus";
 
 const { Utils } = useCrud({
   src: "/api/v1/spc/pDownloadTemplate",
@@ -635,7 +636,8 @@ const opOptions = ref([...dicts.spc_operation]);
 //修改
 const updataItem = (row) => {
   editStatus.value = true;
-  addData.value = row;
+  const data = JSON.parse(JSON.stringify(row));
+  addData.value = data;
   addStatus.value = true;
   emit("update:addStatus", addStatus.value);
   emit("update:editStatus", editStatus.value);
@@ -679,13 +681,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteData({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteData({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const updateSubmit = async () => {
   addData.value.abnormal = null;
@@ -745,7 +753,7 @@ onMounted(async () => {
       lableValue.value = item.dictValue;
     }
   });
-
+  await getTaskOption();
   await getTableData();
   uploadUrl.value =
     import.meta.env.VITE_APP_BASE_API +

src/views/analysis/spc/index.vue

@@ -60,7 +60,7 @@
               style="height: 25px"
               @click="toEdit(row)"
               size="small"
-              >编辑</el-button
+              >修改</el-button
             >
             <el-button
               type="info"
@@ -85,7 +85,7 @@
     </div>
     <div v-if="addStatus || editStatus" class="formView">
       <div class="formTitle">
-        {{ addStatus ? "新增任务" : "编辑任务" }}
+        {{ addStatus ? "新增任务" : "修改任务" }}
       </div>
       <el-scrollbar style="height: calc(100% - 60px)">
         <el-form
@@ -194,6 +194,7 @@ import {
   updateData,
   deleteData,
 } from "@/api/spc";
+import { ElMessage, ElMessageBox } from "element-plus";
 defineOptions({
   name: "SPCrules",
 });
@@ -368,17 +369,24 @@ const setEditFormData = (row) => {
   });
 };
 const toEdit = (row) => {
-  formData.value = row;
+  const data = JSON.parse(JSON.stringify(row));
+  formData.value = data;
   //设置index1 index2
-  setEditFormData(row);
+  setEditFormData(data);
   editStatus.value = true;
 };
 const toDelete = async (id) => {
-  const { code } = await deleteData({ id });
-  if (code == "200") {
-    ElMessage.success("操作成功");
-    getData();
-  }
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { code } = await deleteData({ id });
+    if (code == "200") {
+      ElMessage.success("操作成功");
+      getData();
+    }
+  });
 };
 const reset = () => {
   formData.value = {

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

@@ -574,7 +574,7 @@
                       v-for="(item, index) in taskOption"
                       :key="index"
                       :label="item.taskCode"
-                      :value="item.id"
+                      :value="Number(item.id)"
                     />
                   </el-select>
                 </el-form-item>
@@ -1118,7 +1118,8 @@ const setChart2 = () => {
 //修改
 const updataItem = (index) => {
   editStatus.value = true;
-  addData.value = tableData.value[index];
+  const data = JSON.parse(JSON.stringify(tableData.value[index]));
+  addData.value = data;
   addStatus.value = true;
 };
 //导入按钮
@@ -1484,13 +1485,19 @@ const addSubmit = async () => {
   });
 };
 const deleteSubmit = async (id) => {
-  const { data, code } = await deleteData({
-    id,
+  ElMessageBox.confirm("是否删除所选中数据？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(async () => {
+    const { data, code } = await deleteData({
+      id,
+    });
+    if (code == "200") {
+      ElMessage.success("删除成功！");
+      getTableData();
+    }
   });
-  if (code == "200") {
-    ElMessage.success("删除成功！");
-    getTableData();
-  }
 };
 const updateSubmit = async () => {
   const { data, code } = await updateData({