Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

.env.development

@@ -17,7 +17,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-# VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+# VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/views/evaluationRule/addEvaluate.vue

@@ -127,7 +127,9 @@ export default {
             //当前是新增
             this.ruleForm.uid = guid();
           }
-          this.$emit("submitHandler", this.ruleForm);
+          let obj=JSON.parse(JSON.stringify(this.ruleForm))
+          this.$emit("submitHandler", obj);
+         
           this.isShow = false;
         } else {
           return false;

src/views/evaluationRule/editEvaluationRuleDialog.vue

@@ -213,8 +213,8 @@ export default {
         projectCode: "",
         deductionType: 1,
         formula: "",
-        score:'',
-        remark:'',
+        score: "",
+        remark: "",
       },
       formDataRules: {
         pointCode: [{ required: true, message: "请选择指标要点" }],
@@ -262,9 +262,10 @@ export default {
     },
 
     onSelect(form) {
+      console.log(form);
       let isAdd = true;
       this.tableData?.forEach((item) => {
-        console.log("item",item)
+        console.log("item", item);
         if (item.uid == form.uid) {
           Object.assign(item, form);
           //当前是编辑
@@ -274,6 +275,7 @@ export default {
       if (isAdd || this.tableData.length == 0) {
         this.tableData.push(form);
       }
+      
       console.log(this.tableData);
     },
     onOrgTypeChanged() {},
@@ -288,12 +290,12 @@ export default {
           let { code, msg, data } = res;
           if (code == 200) {
             Object.assign(this.queryParams, data);
-            this.changeTargetList(this.queryParams.typeCode,1)
-            this.changeTargetListChild(this.queryParams.projectCode,1)
+            this.changeTargetList(this.queryParams.typeCode, 1);
+            this.changeTargetListChild(this.queryParams.projectCode, 1);
             this.tableData = data.itemList;
-            this.tableData.forEach(item=>{
-              item.uid=guid()
-            })
+            this.tableData.forEach((item) => {
+              item.uid = guid();
+            });
             delete this.queryParams.itemList;
             console.log(this.queryParams);
           } else {
@@ -326,11 +328,11 @@ export default {
         pointCode: "",
         typeCode: "",
         orgType: "",
-        score:'',
+        score: "",
         projectCode: "",
         deductionType: 1,
         formula: "",
-        remark:'',
+        remark: "",
       };
 
       this.tableData = [];

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -90,7 +90,8 @@ export default {
             //当前是新增
             this.ruleForm.uid = guid();
           }
-          this.$emit("submitHandler", this.ruleForm);
+          let obj=JSON.parse(JSON.stringify(this.ruleForm))
+          this.$emit("submitHandler", obj);
           this.isShow = false;
         } else {
           return false;

src/views/check/task/index.vue → src/views/safetycheck/task/index.vue

@@ -402,7 +402,7 @@ import { checkPermi } from "@/utils/permission.js";
 import dayjs from "dayjs";
 import request from "@/utils/request";
 export default {
-  name: "checkTaskList",
+  name: "Saftask",
   dicts: ["resumption_plan_cycle", "resumption_status", "safety_check_status"],
   components: {
     DialogDetail,
@@ -472,6 +472,10 @@ export default {
   computed: {
     ...mapGetters(["orgName", "userId", "roleList", "orgId"]),
   },
+  activated (){
+    console.log("刷新");
+    this.getList();
+  },
   methods: {
     async onDown(pdfUrl) {
       window.open(pdfUrl);
@@ -534,6 +538,7 @@ export default {
       this.$router.push(path);
     },
     getDefaultKey(key) {
+      // console.log("wwewe")
       this.queryParams.orgId = key;
       this.selectedOrgName = this.orgName;
       this.getList();
@@ -580,7 +585,7 @@ export default {
         });
     },
     async getList() {
-      console.log(this.queryParams, "this.queryParams");
+      console.log(this.queryParams, "this.queryParams2222");
       this.loading = true;
       api
         .page(this.queryParams)