feat:合并

src/App.vue

@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { computed, defineComponent, ref, watch } from "vue";
+import { computed, defineComponent, ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
@@ -48,12 +48,12 @@ export default defineComponent({
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
-    watch(
+    // watch(
-      () => route.path,
+    //     () => route.path,
-      () => {
+    //     () => {
-        route.path === "/login" && (isLogin.value = true);
+    //       route.path === "/login" && (isLogin.value = true);
-      }
+    //     }
-    );
+    // );
     const currentRouteName = computed(() => route.name);
 
     function init() {
@@ -78,8 +78,8 @@ export default defineComponent({
         return;
       }
       const memberInitInfo = await api1
-        .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
+          .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
-        .then((res) => res.data.data.rows);
+          .then((res) => res.data.data.rows);
       store.commit("SET_MEMBER_INFO", memberInitInfo);
       localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
     }
@@ -104,13 +104,13 @@ export default defineComponent({
     }
 
     const getDictList = (param) =>
-      api1
+        api1
-        .getDict({
+            .getDict({
-          pageNo: 1,
+              pageNo: 1,
-          pageSize: 20,
+              pageSize: 20,
-          setCode: param,
+              setCode: param,
-        })
+            })
-        .then((res) => res.data.data.rows);
+            .then((res) => res.data.data.rows);
     //获取组织树
     const getOrgTree = () => {
       const orgtreeList = localStorage.getItem("orgtreeList");
@@ -119,16 +119,16 @@ export default defineComponent({
         return;
       }
       api
-        .getOrgInfo({
+          .getOrgInfo({
-          keyWord: "",
+            keyWord: "",
-          id: -1,
+            id: -1,
-          pageNo: 1,
+            pageNo: 1,
-          pageSize: 20,
+            pageSize: 20,
-        })
+          })
-        .then((res) => {
+          .then((res) => {
-          localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+            localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
-          store.commit("getOrgtreeList", res.data.data);
+            store.commit("getOrgtreeList", res.data.data);
-        });
+          });
     };
     init();
     return {
@@ -167,7 +167,7 @@ export default defineComponent({
   // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
   // sans-serif;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-    Microsoft YaHei, Arial, sans-serif;
+  Microsoft YaHei, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;

src/components/drawers/AddEval.vue

@@ -144,12 +144,14 @@ export default {
       evaluationTypeId: null,
       evaluationTypeName: '',
       description: "",
-      EvalListVisible: false
+      EvalListVisible: false,
+      type:"",
       // addLoading:false,
     });
     const checkFinish = (value) => {
       state.evaluationTypeId = value.quiz_kid ? value.quiz_kid : null
       state.evaluationTypeName = value.title ? value.title : ""
+      state.type = value.quiz_type ? value.quiz_type : ""
     }
     const closeDrawer = () => {
       ctx.emit("update:addevalVisible", false);
@@ -159,6 +161,7 @@ export default {
       state.description = "";
       state.evaluationTypeId = 0,
         state.evaluationTypeName = "",
+        state.type="",
         localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
     };
@@ -252,6 +255,7 @@ export default {
             dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD HH:mm:ss"),
           ] : undefined;
           state.description = res.data.data.evaluationExplain;
+          state.type = res.data.data.type;
         })
         .catch((err) => {
           //message.destroy()
@@ -295,6 +299,7 @@ export default {
         evaluationPictureAddress: "",
         evaluationTag: "",
         updateTime: "",
+        type:state.type,
       };
       api
         .updateEvaluation(objei)
@@ -334,6 +339,7 @@ export default {
         evaluationPictureAddress: "",
         evaluationTag: "",
         updateTime: "",
+        type:state.type,
       };
       api
         .createEvaluation(obj)

src/components/drawers/EvList.vue

@@ -158,6 +158,7 @@ export default {
       }
       state.selectedRowKeys = selectedRowKeys;
       state.evListData = selectedRows[0] ? selectedRows[0] : {};
+      console.log("state.evListData",state.evListData);
     };
     const closeDrawer = () => {
       state.selectedRowKeys = [];
@@ -194,6 +195,7 @@ export default {
             theme_desc: value.theme_desc,
             quiz_price: value.quiz_price,
             quiz_range: value.quiz_range,
+            quiz_type: value.quiz_type,
           };
           array.push(obj);
           if (obj.title == props.evaluationTypeName) {
@@ -213,6 +215,7 @@ export default {
             theme_desc: value.theme_desc,
             quiz_price: value.quiz_price,
             quiz_range: value.quiz_range,
+            quiz_type: value.quiz_type,
           };
           array.push(obj);
         });
@@ -224,7 +227,7 @@ export default {
     const getAllEvalText = () => {
       let objael = {
         keyword:state.inputV1,
-        user_id:"965341999643234304",
+       
       };
       api
         .choiceEvaluation(objael)