hebing

src/api/indexInvist.js

@@ -43,13 +43,15 @@ export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseM
 //删除评估信息
 export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj })
 
-
 //根据ID获取评估信息详情
 export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj })
 
 //修改评估信息
 export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj)
 
+//获取全部评估信息接口
+export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj)
+
 
 // 测试方法
 // import * as api from '../../api/index'

src/components/drawers/AddEval.vue

@@ -112,6 +112,7 @@ import * as api from "../../api/indexEval";
 import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
 import { toDate } from "../../api/method";
+import { RouterEditTask } from "@/api/indexTask";
 // const router = useRouter();
 export default {
   name: "AddEval",
@@ -126,6 +127,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    learn: {
+      type: Number,
+      default: 0,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -184,8 +189,7 @@ export default {
     };
 
     const beforeUpload = (file) => {
-      const isJpgOrPng =
+      const isJpgOrPng = file.type === "image/jpg" || file.type === "image/png";
-        file.type === "image/jpg" || file.type === "image/png";
       if (!isJpgOrPng) {
         message.error("You can upload JPG/PNG file!");
       }
@@ -235,27 +239,49 @@ export default {
       api
         .createEvaluation(obj)
         .then((res) => {
-            console.log("创建成功", res);
+          console.log("创建成功", res);
-            message.success("创建成功");
+          message.success("创建成功");
           closeDrawer();
-          apitaskadd
+          console.log("1111", props.learn);
-            .addTask({
+          if (props.learn == 0)
+            apitaskadd
+              .addTask({
+                courseId: 0,
+                duration: 0,
+                flag: true,
+                name: obj.evaluationName,
+                projectId: 28,
+                projectTaskId: 0,
+                stageId: 3,
+                type: 10,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                ctx.emit("changeData", false);
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+          else {
+            let editObj1 = {
+              chapterId: 36,
               courseId: 0,
               duration: 0,
               flag: true,
               name: obj.evaluationName,
-              projectId: 28,
+              routerId: 92,
-              projectTaskId: 0,
+              routerTaskId: 0,
-              stageId: 3,
               type: 10,
-            })
+            };
-            .then((res) => {
+            RouterEditTask(editObj1)
-              console.log("调用项目添加接口后", res.data);
+              .then((res) => {
-              ctx.emit("changeData",false);
+                console.log("调用学历路径添加接口后", res.data);
-            })
+                ctx.emit("changeData", false);
-            .catch((err) => {
+              })
-              console.log(err);
+              .catch((err) => {
-            });
+                console.log(err);
+              });
+          }
         })
         .catch((err) => {
           console.log("创建失败", err);

src/components/drawers/AddInvist.vue

@@ -38,31 +38,27 @@
           </div>
           <div class="main_item2">
             <a-table
-                  style="border: 1px solid #f2f6fe"
+              style="border: 1px solid #f2f6fe"
-                  :columns="tableDataFunc()"
+              :columns="tableDataFunc()"
-                  :data-source="tableData"
+              :data-source="tableData"
-                  :loading="tableDataTotal === -1 ? true : false"
+              :loading="tableDataTotal === -1 ? true : false"
-                  expandRowByClick="true"
+              expandRowByClick="true"
-                  @expand="expandTable"
+              @expand="expandTable"
-                  :pagination="false"
+              :pagination="false"
-                  :row-selection="{
+              :row-selection="rowSelection"
-                    columnWidth: 30,
+            />
-                    selectedRowKeys: selectedRowKeys,
-                    onChange: onSelectChange,
-                  }"
-                />
 
-                <div class="pa">
+            <div class="pa">
-                  <a-pagination
+              <a-pagination
-                    showSizeChanger="true"
+                showSizeChanger="true"
-                    showQuickJumper="true"
+                showQuickJumper="true"
-                    hideOnSinglePage="true"
+                hideOnSinglePage="true"
-                    :pageSize="pageSize"
+                :pageSize="pageSize"
-                    :current="currentPage"
+                :current="currentPage"
-                    :total="tableDataTotal"
+                :total="tableDataTotal"
-                    class="pagination"
+                class="pagination"
-                  />
+              />
-                </div>
+            </div>
           </div>
         </div>
       </div>
@@ -74,7 +70,7 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexInvist";
 import * as apitaskadd from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
@@ -93,34 +89,20 @@ export default {
       inputV1: "",
       time: undefined,
       tableData: [
-        {
+        // {
-          key: 1,
+        //   key: 1,
-          name: "评估",
+        //   name: "评估",
-          num: "2",
+        //   num: "2",
-          creator: "管理员",
+        //   creator: "管理员",
-          time: "2022-07-21 14:30:25",
+        //   time: "2022-07-21 14:30:25",
-        },
+        // },
-        {
+        // {
-          key: 2,
+        //   key: 2,
-          name: "评估",
+        //   name: "评估",
-          num: "8",
+        //   num: "8",
-          creator: "管理员",
+        //   creator: "管理员",
-          time: "2022-07-21 14:30:25",
+        //   time: "2022-07-21 14:30:25",
-        },
+        // },
-        {
-          key: 3,
-          name: "评估",
-          num: "5",
-          creator: "管理员",
-          time: "2022-07-21 14:30:25",
-        },
-        {
-          key: 4,
-          name: "评估",
-          num: "20",
-          creator: "管理员",
-          time: "2022-07-21 14:30:25",
-        },
       ],
     });
     const closeDrawer = () => {
@@ -137,7 +119,7 @@ export default {
           dataIndex: "name",
           // width: "30%",
           key: "name",
-          width: '150px',
+          width: "150px",
           align: "left",
           className: "classify",
 
@@ -162,26 +144,36 @@ export default {
           title: "题数",
           dataIndex: "num",
           key: "num",
-          width: '80px',
+          width: "80px",
           align: "center",
         },
         {
           title: "创建人",
           dataIndex: "creator",
           key: "creator",
-          width: '150px',
+          width: "150px",
           align: "center",
         },
         {
           title: "创建时间",
           dataIndex: "time",
           key: "time",
-          width: '200px',
+          width: "200px",
           align: "center",
         },
       ];
       return columns;
     };
+    const rowSelection = {
+      onChange: (selectedRowKeys, selectedRows) => {
+        console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+      },
+      getCheckboxProps: record => ({
+        // disabled: record.name === 'Disabled User',
+        // // Column configuration not to be checked
+        name: record.name,
+      }),
+    };
     //创建评估信息
     const createInvist = () => {
       let obj = {
@@ -202,9 +194,10 @@ export default {
       api
         .createAppraiseMessage(obj)
         .then((res) => {
-            console.log("创建成功", res);
+          console.log("创建成功", res);
-            message.success("创建成功");
+          message.success("创建成功");
-            closeDrawer();
+          closeDrawer();
+          getAllInvistText();
           apitaskadd
             .addTask({
               courseId: 0,
@@ -218,7 +211,7 @@ export default {
             })
             .then((res) => {
               console.log("调用项目添加接口后", res.data);
-              ctx.emit("changeData",false);
+              ctx.emit("changeData", false);
             })
             .catch((err) => {
               console.log(err);
@@ -229,12 +222,37 @@ export default {
           // state.createLoading = false;
         });
     };
+
+    //获取全部评估信息接口
+    const getAllInvistText = () => {
+      let obj = {
+        assessmentName: "",
+        pageNo: 0,
+        pageSize: 0,
+        releaseStatus: "",
+        searchEndTime: "",
+        searchStartTime: "",
+      };
+      api
+        .queryAssessmentDetailList(obj)
+        .then((res) => {
+          console.log("获取全部评估信息接口成功", res);
+          message.success("获取全部评估信息接口成功");
+          console.log(obj);
+        })
+        .catch((err) => {
+          console.log("获取全部评估信息接口失败", err);
+          // state.createLoading = false;
+        });
+    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       tableDataFunc,
+      rowSelection,
       createInvist,
+      getAllInvistText,
     };
   },
 };
@@ -268,10 +286,10 @@ export default {
           display: flex;
           align-items: center;
           margin-bottom: 32px;
-          .fi_input{
+          .fi_input {
             margin-right: 20px;
           }
-          .btns{
+          .btns {
             margin-right: 20px;
             padding: 0px 26px 0px 26px;
             height: 38px;
@@ -324,12 +342,11 @@ export default {
               margin-left: 5px;
             }
           }
-
         }
         .main_item2 {
           .pa {
             width: 100%;
-            margin:15px auto;
+            margin: 15px auto;
             display: flex;
             justify-content: center;
           }

src/views/learningpath/LevelAddDetail.vue

@@ -240,6 +240,15 @@
               <img src="../../assets/images/leveladd/ce.png" />
             </div>
             <div class="text">测评</div>
+            <!-- 添加测评侧弹窗 -->
+            <div>
+              <add-eval
+                v-model:addevalVisible="addevalvisible"
+                v-model:edit="edit"
+                v-model:learn="learn"
+              />
+            </div>
+            <!-- 添加测评侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
@@ -573,8 +582,8 @@ import ImpStu from "../../components/drawers/AddLevelImportStu";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
-import AddInvist from "../../components/drawers/AddInvist.vue";
+// import AddInvist from "../../components/drawers/AddInvist.vue";
-import AddVote from "../../components/drawers/AddVote.vue";
+// import AddVote from "../../components/drawers/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
@@ -588,11 +597,9 @@ export default {
     AddHomework,
     AddTest,
     AddEval,
-    AddInvist,
+
-    AddVote,
     AddLive,
     AddRef,
-    AddTest,
   },
   setup() {
     const state = reactive({
@@ -805,11 +812,16 @@ export default {
       value1: "",
       value2: "",
       selectedRowKeys: [],
+      edit: false, //是否点击编辑
+      learn: 0,
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
       addhomeworkvisible: false,
       addtestvisible: false,
+      addevalvisible: false,
+      addinvistvisible: false,
+      addvotevisible: false,
       updateChapterID: null, //修改关卡id
       // 表示当前触发列表的id,用来发送编辑和删除
       ListChoosedId: 0,
@@ -872,6 +884,17 @@ export default {
       state.addtestvisible = true;
       state.ListChoosedId = 0;
     };
+    //测试评估投票抽屉
+    const showDrawerAddEval = () => {
+      state.addevalvisible = true;
+      state.learn = 1;
+    };
+    const showDrawerAddInvist = () => {
+      state.addinvistvisible = true;
+    };
+    const showDrawerAddVote = () => {
+      state.addvotevisible = true;
+    };
 
     // tableData数据赋值方法
     const dataAssignment = () => {
@@ -1329,6 +1352,9 @@ export default {
       // updateChapter,
       showDrawerAddHomework,
       showDrawerAddTest,
+      showDrawerAddEval,
+      showDrawerAddInvist,
+      showDrawerAddVote,
       deleteLevelTask,
       showDrawerAddLive,
       showDrawerAddRef,

src/views/projectcenter/TaskAdd.vue

@@ -462,7 +462,7 @@
                           >
                             编辑
                           </span>
-                          <span style="color: #4ea6ff; cursor: pointer">
+                          <span style="color: #4ea6ff; cursor: pointer" @click="showDelete()">
                             删除
                           </span>
                         </div>