fix:修改版本号

2025-12-10 19:36:46 +08:00 · 2022-12-07 13:40:56 +08:00
parent a331227ab2
commit 256eaa76aa
6 changed files with 418 additions and 406 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -43,7 +43,7 @@ export default defineComponent({
    const store = useStore();
    const isLogin = ref(false);
    // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.3------------");
+    console.log("版本0.9.4------------");
    const routes = computed(() => {
      return router.getRoutes().filter((e) => e.meta?.isLink);
    });
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-21 14:32:52
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-07 08:54:55
+ * @LastEditTime: 2022-12-07 13:40:40
 * @FilePath: /fe-manage/src/api/config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -21,24 +21,24 @@
        <div class="main_items">
          <div class="mi_ipts">
            <div class="mii_ipt">
-              <div class="ipt_name">课程编号：</div>
+              <div class="ipt_name">课程信息：</div>
              <div class="fi_input">
                <a-input
                  v-model:value="inputV1"
                  style="width: 240px; height: 40px; border-radius: 8px"
-                  placeholder="请输入项目名称"
+                  placeholder="请输入课程名称/编号"
                  maxlength="20"
                />
              </div>
            </div>
            <div class="mii_ipt">
-              <div class="ipt_name">内容分类：</div>
+              <div class="ipt_name">课程分类：</div>
              <div class="select">
                <a-select
                  v-model:value="selectV"
                  dropdownClassName="dropdown-style"
                  style="width: 240px"
-                  placeholder="请选择"
+                  placeholder="请选择课程分类"
                  :options="options1"
                  allowClear
                  showSearch
@@ -209,7 +209,7 @@ export default {
  },
  setup(props, ctx) {
    const state = reactive({
-      inputV1: "",
+      inputV1: null,
      options1: [
        {
          value: "微课",
@@ -223,7 +223,7 @@ export default {
      time: undefined,
      onlineClassesId: null,
      onlineName: "",
-      selectV: "",
+      selectV: null,
      selectedRowKeys: [],
      tableData: [],
      addOnlineList: [],
@@ -239,7 +239,8 @@ export default {
      state.choicecourse = true;
      ctx.emit("update:addonlineVisible", false);
      ctx.emit("update:edit", false);
-      state.inputV1 = "";
+      state.inputV1 = null;
+      state.selectV = null;
      state.selectedRowKeys = [];
      state.addOnlineList = [];
      state.currentPage = 1;
@@ -258,7 +259,7 @@ export default {
          dataIndex: "num",
          key: "num",
          width: "80px",
-          align: "left",
+          align: "center",
        },
        {
          title: "名称",
@@ -266,9 +267,10 @@ export default {
          key: "name",
          width: "100px",
          align: "center",
+          ellipsis: true,
        },
        {
-          title: "内容分类",
+          title: "课程分类",
          dataIndex: "contenttype",
          key: "contenttype",
          width: "80px",
@@ -539,17 +541,13 @@ export default {
                  })
                  .then(() => {
                    message.destroy();
-                    message.success(
-                      `${props.edit ? "编辑" : "新增"}任务成功`
-                    );
+                    message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
                    ctx.emit("changeData", false);
                    closeDrawer();
                  })
                  .catch(() => {
                    message.destroy();
-                    message.error(
-                      `${props.edit ? "编辑" : "新增"}任务失败`
-                    );
+                    message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
                  });
              });
            }
@@ -583,7 +581,7 @@ export default {
    };
    //搜索在线列表
    const searchList = () => {
-      if (state.inputV1 !== "" || state.selectV !== "") {
+      if (state.inputV1 || state.selectV) {
        getAllOnlineText();
      } else {
        resetOnline();
@@ -591,8 +589,8 @@ export default {
    };
    //重置在线信息
    const resetOnline = () => {
-      state.inputV1 = "";
-      state.selectV = "";
+      state.inputV1 = null;
+      state.selectV = null;
      state.selectedRowKeys = [];
      state.addOnlineList = [];
      state.currentPage = 1;
@@ -763,6 +761,7 @@ export default {
        }
        .ant-table-selection-column {
          padding: 0px !important;
+          padding-left: 5px !important;
        }
        .ant-table-thead > tr > th {
          background-color: rgba(239, 244, 252, 1);
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -580,6 +580,7 @@ export default {
      // state.addLoading = true;
      queryExaminationDetailById({ examinationId: props.EditTestId })
        .then((res) => {
+          console.log("获取编辑考试信息", res);
          formState.examinationName = res.data.data.examinationName;
          formState.workRequirement = res.data.data.workRequirement;
          formState.examinationDuration = res.data.data.examinationDuration;
@@ -594,6 +595,9 @@ export default {
          formState.showAnswers = Number(res.data.data.showAnswers) || 1;
          formState.papaerName = res.data.data.examinationTestName;
          state.paperName = res.data.data.examinationTestName;
+          // state.paperId=
+          state.paperId = res.data.data.examinationTestId;
+          state.paperName = res.data.data.examinationTestName;
          if (
            res.data.data.examinationEndTime &&
            res.data.data.examinationStartTime
@@ -658,7 +662,7 @@ export default {
        updateExamination(obj)
          .then(async (res) => {
            await updateTask(res);
-            closeDrawer();
+            // closeDrawer();
          })
          .catch(() => {
            message.destroy();
@@ -669,7 +673,7 @@ export default {
        createExamination(obj)
          .then(async (res) => {
            await updateTask(res);
-            closeDrawer();
+            // closeDrawer();
          })
          .catch(() => {
            message.destroy();
@@ -694,7 +698,8 @@ export default {
          };
          RouterEditTask(editObj1)
            .then(() => {
-              //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+              console.log("props.edit", props.edit);
+              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
              ctx.emit("changeData", false);
              state.addLoading = false;
              closeDrawer();
@@ -715,8 +720,9 @@ export default {
          // 新增编辑或新增项目
          ProjectEditTask(editObj)
            .then(() => {
-              //message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
+              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
              ctx.emit("changeData", false);
+              closeDrawer();
            })
            .catch(() => {
              //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
@@ -732,8 +738,9 @@ export default {
            type: 5,
          })
            .then(() => {
-              //message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`);
+              message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
              ctx.emit("changeData", false);
+              closeDrawer();
            })
            .catch(() => {
              //message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`);
--- a/src/components/drawers/EvList.vue
+++ b/src/components/drawers/EvList.vue
@@ -48,7 +48,10 @@
            :data-source="tableData"
            :loading="tableDataTotal === -1 ? true : false"
            :pagination="false"
-            :row-selection="{ selectedRowKeys:selectedRowKeys,onChange:onSelectChange}"
+            :row-selection="{
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }"
          />
          <div class="pa">
            <a-pagination
@@ -74,8 +77,8 @@
 </template>
 <script>
 import { reactive, toRefs } from "vue";
-  import * as api from "../../api/indexEval";
-   export default {
+import * as api from "../../api/indexEval";
+export default {
  name: "EvList",
  props: {
    EvalListVisible: {
@@ -86,7 +89,7 @@ import { reactive, toRefs } from "vue";
      type: Number,
      default: null,
    },
-        evaluationTypeName:{
+    evaluationTypeName: {
      type: String,
      default: "",
    },
@@ -96,13 +99,13 @@ import { reactive, toRefs } from "vue";
      currentPage: 1,
      tableDataTotal: 0,
      pageSize: 10,
-        inputV1:"",
-        evaluationTypeId:null,
-        evaluationTypeName:"",
+      inputV1: "",
+      evaluationTypeId: null,
+      evaluationTypeName: "",
      tableData: [],
-        selectedRowKeys:[],
-        evListData:{},
-        columns:[
+      selectedRowKeys: [],
+      evListData: {},
+      columns: [
        {
          title: "课程编号",
          width: "20%",
@@ -124,9 +127,9 @@ import { reactive, toRefs } from "vue";
          key: "content",
          align: "center",
          maxWidth: "13%",
-            overflow: 'hidden',
-            whiteSpace: 'nowrap',
-            textOverflow: 'ellipsis',
+          overflow: "hidden",
+          whiteSpace: "nowrap",
+          textOverflow: "ellipsis",
        },
        {
          title: "状态",
@@ -149,30 +152,30 @@ import { reactive, toRefs } from "vue";
          key: "time",
          align: "center",
        },
-        ]
+      ],
    });
-    const onSelectChange = (selectedRowKeys,selectedRows)=> {      
-      if(selectedRowKeys.length>1){
-        return
-      }
-      state.selectedRowKeys = selectedRowKeys
-      state.evListData = selectedRows[0] ? selectedRows[0] : {}
+    const onSelectChange = (selectedRowKeys, selectedRows) => {
+      if (selectedRowKeys.length > 1) {
+        return;
      }
+      state.selectedRowKeys = selectedRowKeys;
+      state.evListData = selectedRows[0] ? selectedRows[0] : {};
+    };
    const closeDrawer = () => {
-      state.selectedRowKeys = []
-      state.evListData = {}
-      state.inputV1 = ""
+      state.selectedRowKeys = [];
+      state.evListData = {};
+      state.inputV1 = "";
      ctx.emit("update:EvalListVisible", false);
    };
    const afterVisibleChange = (bol) => {
-      if ( bol == true ) {
+      if (bol == true) {
        getAllEvalText();
      }
    };
-    const checkFinish =() =>{
+    const checkFinish = () => {
      ctx.emit("getEvListData", state.evListData);
      closeDrawer();
-    }
+    };
    const changePagination = (page) => {
      state.currentPage = page;
      getAllEvalText();
@@ -182,37 +185,36 @@ import { reactive, toRefs } from "vue";
      let data = tableData;
      let array = [];
      let arrayKey = [];
-      if(props.evaluationTypeName != ""){
-        data.map((value,index) => {
+      if (props.evaluationTypeName != "") {
+        data.map((value, index) => {
          let obj = {
-          key:index+1,
-          status:value.status,
-          quiz_code:value.quiz_code,
-          quiz_kid:value.quiz_kid,
-          title:value.title,
-          theme_desc:value.theme_desc,
-          quiz_price:value.quiz_price,
-          quiz_range:value.quiz_range,
+            key: index + 1,
+            status: value.status,
+            quiz_code: value.quiz_code,
+            quiz_kid: value.quiz_kid,
+            title: value.title,
+            theme_desc: value.theme_desc,
+            quiz_price: value.quiz_price,
+            quiz_range: value.quiz_range,
          };
-        array.push(obj)
-        if(obj.title == props.evaluationTypeName){
+          array.push(obj);
+          if (obj.title == props.evaluationTypeName) {
            arrayKey.push(obj.key);
          }
        });
        state.tableData = array;
        state.selectedRowKeys = arrayKey;
-      }
-      else{
-        data.map((value,index) => {
+      } else {
+        data.map((value, index) => {
          let obj = {
-          key:index+1,
-          status:value.status,
-          quiz_code:value.quiz_code,
-          quiz_kid:value.quiz_kid,
-          title:value.title,
-          theme_desc:value.theme_desc,
-          quiz_price:value.quiz_price,
-          quiz_range:value.quiz_range,
+            key: index + 1,
+            status: value.status,
+            quiz_code: value.quiz_code,
+            quiz_kid: value.quiz_kid,
+            title: value.title,
+            theme_desc: value.theme_desc,
+            quiz_price: value.quiz_price,
+            quiz_range: value.quiz_range,
          };
          array.push(obj);
        });
@@ -221,34 +223,33 @@ import { reactive, toRefs } from "vue";
    };

    //获取测评列表
-    const getAllEvalText = ()=> {
+    const getAllEvalText = () => {
      let objael = {
-        "keyword": state.inputV1,
-        "user_id": "965341999643234304",
-      }
+        keyword: state.inputV1,
+        user_id: "965341999643234304",
+      };
      api
        .choiceEvaluation(objael)
        .then((res) => {
-        getTableDataList(res.data.data)
+          getTableDataList(res.data.data);
        })
-      .catch(()=>{
-      })
-    }
+        .catch(() => {});
+    };
    //搜索测评列表
-    const searchList = ()=> {
-      if(state.inputV1 !== ''){
-        getAllEvalText()
-      }else {
-        resetData()
-      }
+    const searchList = () => {
+      if (state.inputV1 !== "") {
+        getAllEvalText();
+      } else {
+        resetData();
      }
+    };
    //重置测评列表
-    const resetData = ()=> {
+    const resetData = () => {
      state.currentPage = 1;
      state.selectedRowKeys = [];
-      state.evListData = {}
+      state.evListData = {};
      getAllEvalText();
-    }
+    };
    return {
      ...toRefs(state),
      afterVisibleChange,
@@ -261,13 +262,13 @@ import { reactive, toRefs } from "vue";
      resetData,
    };
  },
-  };
+};
 </script>
 <style lang="scss">
-  .ant-table-striped :deep(.table-striped) td {
+.ant-table-striped :deep(.table-striped) td {
  background-color: #fafafa !important;
-  }
-  .addonlineDrawer {
+}
+.addonlineDrawer {
  .drawerMain {
    .header {
      height: 73px;
@@ -406,7 +407,7 @@ import { reactive, toRefs } from "vue";
        }
        .ant-table-selection-column {
          padding: 0px !important;
-                padding-left: 60px !important;
+          padding-left: 5px !important;
        }
        .ant-table-thead > tr > th {
          background-color: rgba(239, 244, 252, 1);
@@ -461,5 +462,5 @@ import { reactive, toRefs } from "vue";
      }
    }
  }
-  }
- </style>
+}
+</style>
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -455,7 +455,9 @@
                        <div class="iconame">
                          「{{ checkType(item.type) }}」
                        </div>
-                        <div class="icontext">{{ item.name }}</div>
+                        <div class="icontext" :title="item.name">
+                          {{ item.name }}
+                        </div>
                      </div>
                    </div>
                    <div class="type">
@@ -466,7 +468,7 @@
                    <div class="time">
                      <div class="timetext">开始时间</div>
                      <div class="timetext">
-                        {{ item.startTime !== null ? item.startTime : "" }}
+                        {{ item.startTime !== null ? item.startTime : "-" }}
                      </div>
                    </div>
                    <div class="progress">
@@ -3751,7 +3753,10 @@ export default {
          color: #999ba3;
          font-size: 14px;
          margin-left: 12px;
-          width: 83px;
+          width: 120px;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap;
        }
      }