修改多选

src/components/PlanRegister.vue

@@ -142,18 +142,23 @@
                     :disabled="item.isRequired == '1'"
                     >{{ item.name }}</el-checkbox
                   >
-                  <!-- <el-checkbox
+                </el-checkbox-group>
+              </el-form-item>
+
+              <el-form-item label="任务选择" class="taskSelect">
+                <el-checkbox-group v-model="ruleForm.taskRadio" size="mini">
+                  <el-checkbox
                     v-for="item in taskList"
-                    :key="item.id"
+                    :key="item.flag"
                     :label="item.flag"
                     border
-                    :disabled="item.isRequired == '1'"
+                    :disabled="true"
                     >{{ item.name }}</el-checkbox
-                  > -->
+                  >
                 </el-checkbox-group>
               </el-form-item>
 
-              <el-form-item label="任务选择" class="taskSelect" prop="taskRadio">
+              <!-- <el-form-item label="任务选择" class="taskSelect" prop="taskRadio">
                 <el-select v-model="ruleForm.taskRadio" placeholder="请选择">
                   <el-option
                     v-for="item in taskList"
@@ -163,26 +168,7 @@
                   >
                   </el-option>
                 </el-select>
-
-                <!-- <el-radio-group v-model="ruleForm.taskRadio">
-                  <el-radio     v-for="item in taskList" :key="item" :label="item.flag">
-                  {{item.name}}
-                  </el-radio>
-                
-                </el-radio-group> -->
-
-                <!-- <el-checkbox-group v-model="ruleForm.checkboxGroup2" size="mini">
-             
-                  <el-checkbox
-                    v-for="item in taskList"
-                    :key="item.id"
-                    :label="item.flag"
-                    border
-                    :disabled="item.isRequired == '1'"
-                    >{{ item.name }}</el-checkbox
-                  >
-                </el-checkbox-group> -->
-              </el-form-item>
+              </el-form-item> -->
             </div>
           </el-form>
           <div class="dig_button">
@@ -233,14 +219,16 @@ export default {
         endTime: "",
         checkboxGroup2: [],
         checkedList: [],
-        taskRadio: "",
+        taskRadio: [],
       },
       isView: true,
       rules: {
-        planName: [{ required: true, message: "请输入计划名称", trigger: "blur" },{ min: 1, max: 25, message: "计划名称长度不能超过25个字符", trigger: "blur" }],
+        planName: [
+          { required: true, message: "请输入计划名称", trigger: "blur" },
+          { min: 1, max: 25, message: "计划名称长度不能超过25个字符", trigger: "blur" },
+        ],
         endTime: [{ required: true, message: "请输入结束时间", trigger: "blur" }],
         checkedList: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
-        taskRadio: [{ required: true, message: "请选择任务", trigger: "blur" }],
       },
       userInfo: {},
 
@@ -345,10 +333,18 @@ export default {
               //并且 是必须展示的
               return item.type == "0" && item.isDisplayed == "1";
             });
-
             this.taskList = res.data.filter((item) => {
-              return item.type == "1" && item.isDisplayed == "1";
+              return (
+                item.type == "1" &&
+                item.isDisplayed == "1" &&
+                item.flag != "EMOTION_STROOP"
+              );
             });
+            console.log(this.taskList);
+            for (let i = 0; i < this.taskList.length; i++) {
+              this.ruleForm.taskRadio.push(this.taskList[i].flag);
+            }
+            //
             let listRequest = res.data.filter((item) => {
               return item.isRequired == "1";
             });
@@ -736,7 +732,7 @@ export default {
       this.dialogVisible = true;
       this.isView = val;
       //获取渠道信息
-      
+
       // this.getGradeFun();
       this.getChannel();
       this.getTeacher();
@@ -791,11 +787,12 @@ export default {
           let listTask = [];
           for (let i = 0; i < list.length; i++) {
             //
-           
-            if(list[i].contentType=='1'){
+
+            if (list[i].contentType == "1") {
               //
-              this.ruleForm.taskRadio=list[i].flag;
-            }else{
+              this.ruleForm.taskRadio.push(list[i].flag);
+              //-------------需修改
+            } else {
               listTask.push(list[i].flag);
             }
           }
@@ -849,9 +846,9 @@ export default {
       this.grade = [];
       this.ruleForm.planName = "";
       this.ruleForm.endTime = "";
-      this.ruleForm.taskRadio='';
+      this.ruleForm.taskRadio = [];
       this.ruleForm.checkedList = [];
-      
+
       this.$refs.tree.setCheckedKeys([]);
       this.ruleForm.checkboxGroup2 = [];
       this.dialogVisible = false;
@@ -869,9 +866,9 @@ export default {
       this.disableFlag = true;
       let validSp = [];
       if (this.isView) {
-        validSp = ["planName", "endTime", "checkedList", "taskRadio"];
+        validSp = ["planName", "endTime", "checkedList"];
       } else {
-        validSp = ["planName", "endTime", "checkedList", "taskRadio"];
+        validSp = ["planName", "endTime", "checkedList"];
       }
       let aa = [];
       //获取已选项
@@ -882,14 +879,14 @@ export default {
           aa.push(valid);
           //判断是编辑还是新增
           if (this.isView) {
-            if (aa.length == 4) {
+            if (aa.length == 3) {
               this.disableFlag = true;
               this.register();
             } else {
               this.disableFlagStatus();
             }
           } else {
-            if (aa.length == 4) {
+            if (aa.length == 3) {
               this.disableFlag = true;
               this.editUserFun();
             } else {
@@ -911,8 +908,16 @@ export default {
       let listTmp = [];
       let listTmpNo = [];
       listTmp = this.scaleAndTaskList.filter((item) => {
-        return this.ruleForm.checkboxGroup2.includes(item.flag)||this.ruleForm.taskRadio==item.flag;
+        return this.ruleForm.checkboxGroup2.includes(item.flag);
+        //-----------------需修改
       });
+
+      //组将数组将认知任务给数组listTmp
+      for (let i = 0; i < this.taskList.length; i++) {
+        listTmp.push(this.taskList[i]);
+      }
+      //
+
       for (let i = 0; i < listTmp.length; i++) {
         let obj = {
           contentType: listTmp[i].type,
@@ -1002,8 +1007,12 @@ export default {
       let listTmp = [];
       let listTmpNo = [];
       listTmp = this.scaleAndTaskList.filter((item) => {
-        return this.ruleForm.checkboxGroup2.includes(item.flag)||this.ruleForm.taskRadio==item.flag;
+        return this.ruleForm.checkboxGroup2.includes(item.flag);
+
+        //---------需修改
       });
+      listTmp.push(this.taskList[0]);
+      listTmp.push(this.taskList[1]);
       for (let i = 0; i < listTmp.length; i++) {
         let obj = {
           contentType: listTmp[i].type,

src/router/index.js

@@ -8,7 +8,7 @@ const RouterConfig = {
   mode: "history",
   // base: process.env.BASE_URL,
   // base: 'child_pc',
-  base: "highLevelIntellectualPc",
+  base: "fireBrigadePc",
   // base: '',
   routes: routers,
 };

src/utils/http.js

@@ -30,7 +30,7 @@ import { router } from "@/router";
 //export const basePath = "http://123.57.18.29:8089";
 // export const basePath = "http://123.57.18.29:8090";
 
-export const basePath = "http://129.211.221.44:8090";
+export const basePath = "http://129.211.221.44:8094";
 // export const basePath = "http://146.56.226.174:8089";
 // const base_url = 'http://43.143.198.30:8089/'
 // const base_url = 'http://10.113.248.4:8090/'

vue.config.js

@@ -1,6 +1,6 @@
 module.exports = {
     // publicPath: '/child_pc/',
-    publicPath: '/highLevelIntellectualPc',
+    publicPath: '/fireBrigadePc',
     assetsDir:"static",
     outputDir: 'child',
     indexPath:"index.html",