Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

2025-12-13 12:56:45 +08:00 · 2022-12-23 09:05:16 +08:00
parent adcad35c59 da9a7c86c1
commit f3f39ba34f
27 changed files with 854 additions and 945 deletions
--- a/src/App.vue
+++ b/src/App.vue
@@ -113,20 +113,7 @@ export default defineComponent({
            .then((res) => res.data.data.rows);
    //获取组织树
    const getOrgTree = () => {
-      const orgtreeList = localStorage.getItem("orgtreeList");
-      if (orgtreeList) {
-        store.commit("getOrgtreeList", JSON.parse(orgtreeList));
-        return;
-      }
-      api
-        .getOrgInfo({
-          keyWord: "",
-          id: -1,
-          pageNo: 1,
-          pageSize: 20,
-        })
-        .then((res) => {
-          localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+      api.getOrgTreeInfo().then((res) => {
            store.commit("getOrgtreeList", res.data.data);
          });
    };
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -6,7 +6,7 @@
 * @FilePath: /fe-manage/src/api/config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 import axios from "axios";
 import router from "@/router";
 // import { getCookie } from '../api/method'
@@ -14,13 +14,13 @@ import router from "@/router";

 // axios.defaults.headers.post["Content-Type"] =
 //   "application/x-www-form-urlencoded";
-
+export const FILE_UPLOAD_URL = process.env.VUE_APP_BASE_API + '/file/upload'
 axios.defaults.withCredentials = true;
 const http = axios.create({
    baseURL: process.env.VUE_APP_BASE_API,
    timeout: 1000 * 15,
    // headers: { "Content-Type": "multipart/form-data" },
-  headers: { "Content-Type": "application/json" },
+    headers: {"Content-Type": "application/json"},
 });

 http.interceptors.request.use(
@@ -50,14 +50,14 @@ http.interceptors.response.use(
    (response) => {
        // console.log('response', response)
        const {
-      data: { code, msg },
+            data: {code, msg},
        } = response;
        // console.log('code', code)
        if (code === 0 || code === 200) {
            return response;
        } else {
            if (code === 1000) {
-        process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
+                process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
            }
            console.log("api %o", msg);
        }
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -111,6 +111,7 @@ export const searchUsersByOrgId = (obj) => http.post('/admin/router/searchUsersB

 //获取组织信息（修改版）
 export const getOrgInfo = (obj) => http.post('/admin/orgStruct/getOrgInfo', obj)
+export const getOrgTreeInfo = (obj) => http.get('/org/initOrg', {params: obj})
 //获取员工（修改版）
 export const getMemberInfo = (obj) => http.post('/admin/orgStruct/getMemberInfo', obj)
 //获取受众（修改版）
@@ -131,6 +132,7 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"
 // 获取组织结构树
 export const orgtree = () => http.get("/org/tree");
 export const saveStu = obj => http.post("/admin/student/addStudent", obj);
+export const moveStudent = obj => http.post("/admin/student/moveStudent", obj);
 export const getStuPage = obj => http.get("/admin/student/getStudent", {params: obj});
 export const delStudentList = obj => http.post("/admin/student/delStudent", obj);
 export const validateName = obj => http.post("/admin/validate/validateName", obj);
--- a/src/components/common/BaseUpload.vue
+++ b/src/components/common/BaseUpload.vue
@@ -1,7 +1,7 @@
 <template>
  <a-upload
      :file-list="files"
-      action="/manageApi/file/upload"
+      :action="FILE_UPLOAD_URL"
      :show-upload-list="showUploadList"
      :multiple="multiple"
      :before-upload="beforeUpload"
@@ -16,6 +16,7 @@
 <script setup>
 import {defineProps, defineEmits, defineExpose, ref, watch} from "vue";
 import {message} from "ant-design-vue";
+import {FILE_UPLOAD_URL} from "@/api/config";

 const props = defineProps({
  value: {
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -51,7 +51,7 @@
            </div>
            <div class="btnbox">
              <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                format="YYYY-MM-DD HH:mm"
                style="width: 400px; height: 40px; border-radius: 8px;"
                v-model:value="time"
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -50,7 +50,7 @@
            </div>
            <div class="btnbox">
              <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm"
                :placeholder="['      开始时间', '        结束时间']" />
            </div>
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -102,7 +102,7 @@
            </div>
            <div class="select" >
              <a-range-picker style="width: 400px;"
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                format="YYYY/MM/DD HH:mm"
                v-model:value="chooseTime"
                :placeholder="['      开始时间', '        结束时间']"
@@ -354,7 +354,7 @@
            <div class="btnbox">
              <a-upload
                @change="handleChange"
-                action="/manageApi/file/upload"
+                :action="FILE_UPLOAD_URL"
                v-model:file-list="fileList"
              >
                <button class="xkbtn">上传附件</button>
@@ -392,6 +392,7 @@ import { detail } from "../../api/indexCourse";
 import { queryAppraiseDetailById } from "../../api/indexInvist";
 import { queryWorkDetailById } from "@/api/indexWork";
 import { queryExaminationDetailById } from "@/api/indexExam";
+import {FILE_UPLOAD_URL} from "@/api/config";
 export default {
  name: "AddFaceteach",
  components: {
@@ -841,6 +842,7 @@ export default {
    };
    return {
      ...toRefs(state),
+      FILE_UPLOAD_URL,
      showDrawerSelFacet,
      showDrawerAddHomework,
      showDrawerAddTest,
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -45,7 +45,7 @@
 								<span style="margin-right: 3px">附件：</span>
 							</div>
 							<div class="btnbox">
-								<a-upload v-model:file-list="fileList" name="file" action="/manageApi/file/upload"
+								<a-upload v-model:file-list="fileList" name="file" :action="FILE_UPLOAD_URL"
 									@change="handleChange">
 									<button class="xkbtn" type="button">上传附件</button>
 								</a-upload>
@@ -82,6 +82,7 @@ import {
 import { ProjectEditTask, RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import { addTempTask } from "../../api/indexTaskadd";
+import {FILE_UPLOAD_URL} from "@/api/config";

 export default {
 	name: "AddHomework",
@@ -513,6 +514,7 @@ export default {
 			disabledDate,
 			disabledDateTime,
 			afterVisibleChange,
+      FILE_UPLOAD_URL,
 			closeDrawer,
 			closeDrawer2,
 			handleChange,
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -70,7 +70,7 @@
            </div>
            <div class="btnbox">
              <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                style="width: 400px; height: 40px; border-radius: 8px"
                v-model:value="time"
                format="YYYY/MM/DD HH:mm"
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -130,6 +130,26 @@
              <span style="color: #999999; margin-left: 8px">分钟</span>
            </div>
          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">及格线：</span>
+            </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="test.passLine"
+                type="number"
+                style="width: 400px; height: 40px; border-radius: 8px"
+              />
+
+              <span style="color: #999999; margin-left: 8px">分</span>
+            </div>
+          </div>
          <div class="main_item2">
            <div class="signbox">
              <span style="margin-right: 3px">考试说明：</span>
@@ -147,7 +167,7 @@
          </div>
          <div class="main_item2">
            <div class="signbox">
-              <span style="margin-right: 3px">考试限制：</span>
+              <span style="margin-right: 3px;margin-top: 10px;">考试限制：</span>
            </div>
            <div class="kqszbox">
              <div class="setbox">
@@ -227,27 +247,8 @@
              </a-radio-group>
            </div>
          </div>
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">及格线：</span>
-            </div>
-            <div class="btnbox">
-              <a-input
-                v-model:value="test.passLine"
-                type="number"
-                style="width: 400px; height: 40px; border-radius: 8px"
-              />
        
-              <span style="color: #999999; margin-left: 8px">分</span>
-            </div>
-          </div>
-          <div class="main_item">
+         
          <div class="main_item">
            <div class="signbox">
              <span style="margin-right: 3px">试题排列：</span>
@@ -284,7 +285,7 @@
              </a-radio-group>
            </div>
          </div>
-          </div>
+          <div class="main_item" style="height: 20px;"></div>
        </div>
      </div>
      <div class="main_btns">
@@ -811,8 +812,7 @@ export default {
            .setbox {
              display: flex;
              flex-wrap: wrap;
-              margin-top: 10px;
-              margin-bottom: 24px;
+            

              .timerbox {
                margin-top: 6px;
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -86,45 +86,23 @@ function validateProName() {
 }
 </script>
 <style lang="scss">
-.in {
+
  .pro {
    .ant-input-affix-wrapper {
-      position: relative;
-      display: inline-block;
-      width: 99%;
-      min-width: 0;
      padding: 4px 8px;
-      color: rgba(0, 0, 0, 0.85);
-      font-size: 14px;
-      line-height: 1.5715;
-      background-color: #fff;
-      background-image: none;
-      border: 1px solid #d9d9d9;
      border-radius: 8px;
-      transition: all 0.3s;
-      display: inline-flex;
-    }
-  }
-}
    
-.in {
-  .ant-input-affix-wrapper {
-    position: relative;
-    display: inline-block;
-    width: 99%;
-    min-width: 0;
-    padding: 0px 8px;
-    color: rgba(0, 0, 0, 0.85);
-    font-size: 14px;
-    line-height: 1.5715;
-    background-color: #fff;
-    background-image: none;
-    border: 1px solid #d9d9d9;
-    border-radius: 8px;
-    transition: all 0.3s;
-    display: inline-flex;
    }
-}
+  }
+  .road {
+  .ant-input-affix-wrapper {
+    padding: 0px 8px;
+    border-radius: 8px;
+  }
+  }
+
+
+

 .b_input,
 .i1_input {
--- a/src/components/student/ChangeLevelModal.vue
+++ b/src/components/student/ChangeLevelModal.vue
@@ -2,14 +2,14 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-12-20 17:00:37
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-21 17:54:18
+ * @LastEditTime: 2022-12-20 17:59:40
 * @FilePath: /fe-manage/src/components/student/ChangeLevelModal.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
  <a-modal
      style="padding: 0"
-    :closable="sh"
+      :closable="true"
      :visible="visiblene"
      :footer="null"
      centered="true"
@@ -28,13 +28,11 @@
          <!-- <div class="cur">当前关卡：关卡2</div> -->
          <div class="select">
            <a-select
-              v-model:value="chapterSelect"
+                v-model:value="selectStage"
                style="width: 100%"
                placeholder="请选择关卡"
-              :options="chapterList"
-              @change="changeChapter"
+                :options="option"
                allowClear
-              showSearch
            ></a-select>
          </div>
          <div class="btn">
@@ -58,63 +56,47 @@
    </div>
  </a-modal>
 </template>
-<script>
-import { reactive, toRefs, onMounted } from "vue";
-import { message } from "ant-design-vue";
-import { GetRouterDetail } from "../../api/indexTask";
-export default {
-  name: "ChangeLevelModal",
-  props: {
+<script setup>
+import {computed, defineEmits, defineProps, ref} from "vue";
+import {moveStudent} from "@/api/index1";
+import {message} from "ant-design-vue";
+
+const props = defineProps({
  visiblene: {
    type: Boolean,
    default: false,
  },
-    id: String,
+  stage: {
+    type: Array,
+    default: () => [],
  },
-  setup(props, ctx) {
-    const state = reactive({
-      chapterList: [],
-      chapterSelect: null, //选择的关卡
-      chapterSelectId: null, //选择关卡的id
-    });
-    const closeChangeModal = () => {
-      ctx.emit("update:visiblene", false);
-      state.chapterSelect = null; //选择的关卡
-      state.chapterSelectId = null; //选择关卡的id
-    };
-    const changelevel = () => {
-      console.log("点击调整关卡");
-    };
-    //获取关卡列表
-    const getDetail = () => {
-      console.log("props.id", props.id);
-      GetRouterDetail(props.id)
-        .then((res) => {
-          //给level赋初始值
-          state.chapterList = res.data.data.chapterList;
-          //增加两个字段
-          state.chapterList.forEach((item) => {
-            item["value"] = item.chapterId;
-            item["label"] = item.name;
-          });
-          console.log("路径图详情", res);
-        })
-        .catch((err) => {
-          message.error(err);
-        });
-    };
-    const changeChapter = (e, v) => {
-      console.log("eeeeeeeeeee", e, v);
-    };
-    onMounted(() => {
-      getDetail();
-    });
-    return {
-      ...toRefs(state),
-      closeChangeModal,
-      changelevel,
-      changeChapter,
-    };
+  ids: {
+    type: Array,
+    default: () => [],
  },
+});
+
+const option = computed(() => {
+  return props.stage.map(e => ({label: e.name, value: e.id}))
+})
+
+const selectStage = ref()
+
+const emit = defineEmits({})
+
+const closeChangeModal = () => {
+  emit("update:visiblene", false);
 };
+const changelevel = () => {
+  if(!selectStage.value){
+    message.error("请选择关卡")
+    return
+  }
+  emit("update:visiblene", false);
+  emit('finash', false)
+  moveStudent({targetId: selectStage.value, ids: props.ids}).then(()=>{
+    emit('finash', true)
+  })
+};
+//获取关卡列表
 </script>
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -63,13 +63,12 @@
          批量删除
        </a-button>
      </a-col>
-      <!--
-      <a-col :span="1.5" v-if="type == 2">
+      <a-col :span="1.5" v-if="type === 2">
        <a-button class="cus-btn white" @click="showChangeModal">
          <template #icon></template>
          批量调整关卡
        </a-button>
-      </a-col>-->
+      </a-col>
    </a-row>
    <div style="margin-top: 20px">
      <a-table
@@ -81,45 +80,12 @@
        :row-selection="stuRowSelection"
      >
        <template #action="{ record }">
-          <div style="display: flex; justify-content: center">
-           <!--  <div v-if="type == 2"
-              @click="del(record.id)"
-              style="
-                color: #4ea6ff;
-                font-size: 14px;
-                text-align: center;
-                margin-left: 20px;
-                cursor: pointer;
-              "
-            >
-              查看
-            </div>
-        
-            <div
-              @click="showChangeModal"
-              style="
-                color: #4ea6ff;
-                font-size: 14px;
-                text-align: center;
-                margin-left: 20px;
-                cursor: pointer;
-              "
-            >
-              调整
-            </div> -->
          <div
            @click="del(record.id)"
-              style="
-                color: #4ea6ff;
-                font-size: 14px;
-                text-align: center;
-                margin-left: 20px;
-                cursor: pointer;
-              "
+            style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
          >
            删除
          </div>
-          </div>
          <!-- <a-row gutter="12">
            <a-col>
              <slot name="extension" v-bind:data="{ record }"></slot>
@@ -143,7 +109,7 @@
    </div>
  </div>
  <!-- 批量调整关卡弹窗 -->
-  <ChangeLevelModal v-model:visiblene="visiblene" :id="id" />
+  <ChangeLevelModal v-model:visiblene="visiblene" :stage="stage" :ids="stuSelectKeys"  @finash="submitCall"/>
  <!-- 批量调整关卡弹窗 -->
 </template>
 <script setup>
@@ -151,7 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
 const props = defineProps({
  type: Number,
  id: String,
@@ -269,11 +235,12 @@ function getStuList() {

 function reset() {
  tableParam.value.studentName="";
+  getStuList();
 }

 function bathDel() {
  if( stuSelectKeys.value &&
-    stuSelectKeys.value.length == 0){
+    stuSelectKeys.value.length === 0){
      message.destroy();
    return message.warning("请先选中学员");
  }
@@ -302,9 +269,13 @@ function submitCall(flag) {

 // 调整关卡;
 const visiblene = ref(false);
-//const showChangeModal = () => {
- // visiblene.value = true;
-//};
+const showChangeModal = () => {
+  if(!stuSelectKeys.value.length){
+    message.error("请选择学员")
+    return
+  }
+  visiblene.value = true;
+};
 </script>
 <style>
 .studentopea1 {
@@ -339,5 +310,4 @@ const visiblene = ref(false);
  height: 40px;
  border-radius: 8px;
 }
-
 </style>
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -104,7 +104,7 @@
            </div>
            <div class="select" >
              <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                format="YYYY-MM-DD HH:mm"
                style="width: 424px"
                v-model:value="time"
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3281,11 +3281,11 @@ const columns7 = [
    key: "5",
    align: "center",
    customRender: ({ record }) => {
-      switch (String(record.source)) {
+      switch (String(record.status)) {
        case "0":
-          return "待审核";
-        case "1":
          return "审核通过";
+        case "1":
+          return "待审核";
        case "2":
          return "审核拒绝";
      }
@@ -3403,11 +3403,11 @@ export default defineComponent({
          key: "5",
          align: "center",
          customRender: ({ record }) => {
-            switch (String(record.source)) {
+            switch (String(record.status)) {
              case "0":
-                return "待审核";
-              case "1":
                return "审核通过";
+              case "1":
+                return "待审核";
              case "2":
                return "审核拒绝";
            }
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -150,7 +150,7 @@
              />
            </div>
            <div class="inname">路径图名称</div>
-            <div class="in">
+            <div class="in road">
              <!--              <a-input-->
              <!--                  v-model:value="pathName"-->
              <!--                  maxlength="20"-->
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -425,19 +425,19 @@
                    </div>
                    <div class="progress">
                      <div class="progresstext">
-                        {{ item.complete ? item.complete : 0 }}/{{
-                          item.total ? item.total : 0
+                        {{ item.finishStuNum }}/{{
+                          item.totalStuNum
                        }}人
                      </div>
                      <div style="display: flex">
                        <a-progress
                          :showInfo="false"
-                          :percent="item.percent"
+                          :percent="parseInt(item.finishStuNum / item.totalStuNum * 100)"
                          strokeColor="#FFC067"
                          trailColor="rgba(253, 209, 98, 0.2)"
                        />
                        <span class="progresstext" style="margin-left: 10px"
-                          >{{ item.percent ? item.percent : 0 }}%</span
+                          >{{ parseInt(item.finishStuNum / item.totalStuNum * 100) }}%</span
                        >
                      </div>
                    </div>
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -99,8 +99,8 @@

          <div class="in">
            <a-range-picker
-              show-time
              separator="至"
+              :show-time="{ format: 'HH:mm' }"
              :placeholder="['      开始时间', '        结束时间']"
              v-model:value="projectInfo.rangeTime"
              style="width: 100%; height: 40px; border-radius: 5px"
@@ -503,13 +503,8 @@ export default {
    };

    function managerChange(e, l, d, t) {
-      if (routers.query.parentId) {
-        return;
-      }
-      !state.projectInfo.sourceBelongId &&
-        (state.projectInfo.sourceBelongId = d);
-      !state.projectInfo.sourceBelongName &&
-        (state.projectInfo.sourceBelongName = t);
+      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongName = t
    }

    return {
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -36,7 +36,7 @@
        </div>
        <div class="select">
          <a-select
-            v-model:value="searchParam.status"
+              v-model:value="searchParam.searchStatus"
              style="width: 270px"
              placeholder="请选择状态"
              :options="sProjectStateList"
@@ -46,7 +46,7 @@
        <div class="select addTimeBox">
          <div class="addTime">创建时间：</div>
          <a-range-picker
-            show-time
+              :show-time="{ format: 'HH:mm' }"
              v-model:value="searchParam.valueDate"
              format="YYYY-MM-DD"
              style="border-radius: 8px; height: 40px; margin-left: 5px"
@@ -78,7 +78,7 @@
      <a-table
          :columns="columns"
          :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
+          :loading="tableLoading"
          :scroll="{ x: 700 }"
          @expand="expandTable"
          :pagination="false"
@@ -109,13 +109,13 @@
          style="background: linear-gradient(180deg, #ddeaff, #f0f8fe)"
      >
        <div class="leftt">
-          <img src="../../assets/images/taskpage/left2.png" />
+          <img src="../../assets/images/taskpage/left2.png"/>
        </div>
        <div class="photo">
-          <img src="../../assets/images/projectadd/nopro.png" />
+          <img src="../../assets/images/projectadd/nopro.png"/>
        </div>
        <div class="rightt">
-          <img src="../../assets/images/taskpage/right2.png" />
+          <img src="../../assets/images/taskpage/right2.png"/>
        </div>
        <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
          创建项目
@@ -283,13 +283,13 @@
            "
          >
            <div class="leftt">
-              <img src="../../assets/images/taskpage/left2.png" />
+              <img src="../../assets/images/taskpage/left2.png"/>
            </div>
            <div class="photo">
-              <img src="../../assets/images/taskpage/picture4.png" />
+              <img src="../../assets/images/taskpage/picture4.png"/>
            </div>
            <div class="rightt">
-              <img src="../../assets/images/taskpage/right2.png" />
+              <img src="../../assets/images/taskpage/right2.png"/>
            </div>
            <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
              单层子项目
@@ -303,13 +303,13 @@
            "
          >
            <div class="leftt">
-              <img src="../../assets/images/taskpage/left1.png" />
+              <img src="../../assets/images/taskpage/left1.png"/>
            </div>
            <div class="photo">
-              <img src="../../assets/images/taskpage/picture5.png" />
+              <img src="../../assets/images/taskpage/picture5.png"/>
            </div>
            <div class="rightt">
-              <img src="../../assets/images/taskpage/right1.png" />
+              <img src="../../assets/images/taskpage/right1.png"/>
            </div>
            <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
              多层子项目
@@ -370,13 +370,13 @@
                "
              >
                <div class="leftt">
-                  <img src="../../assets/images/taskpage/left2.png" />
+                  <img src="../../assets/images/taskpage/left2.png"/>
                </div>
                <div class="photo">
-                  <img src="../../assets/images/taskpage/picture6.png" />
+                  <img src="../../assets/images/taskpage/picture6.png"/>
                </div>
                <div class="rightt">
-                  <img src="../../assets/images/taskpage/right2.png" />
+                  <img src="../../assets/images/taskpage/right2.png"/>
                </div>
                <div class="centerbox" style="color: rgba(78, 166, 255, 1)">
                  单层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -395,13 +395,13 @@
              "
            >
              <div class="leftt">
-                <img src="../../assets/images/taskpage/left3.png" />
+                <img src="../../assets/images/taskpage/left3.png"/>
              </div>
              <div class="photo">
-                <img src="../../assets/images/taskpage/picture7.png" />
+                <img src="../../assets/images/taskpage/picture7.png"/>
              </div>
              <div class="rightt">
-                <img src="../../assets/images/taskpage/right3.png" />
+                <img src="../../assets/images/taskpage/right3.png"/>
              </div>
              <div class="centerbox1" style="color: rgba(93, 201, 136, 1)">
                多层{{ projectInfo.parentId ? "子" : "" }}项目
@@ -623,7 +623,7 @@
          class="aeLoading"
          :style="{ display: projectPubLoading ? 'flex' : 'none' }"
      >
-        <a-spin :spinning="projectPubLoading" />
+        <a-spin :spinning="projectPubLoading"/>
      </div>
    </a-modal>
    <!-- 撤回路径弹窗 -->
@@ -810,24 +810,24 @@
  </div>
 </template>
 <script>
-import { reactive, toRefs, ref, watch } from "vue";
-import { message, Modal } from "ant-design-vue";
-import { useRouter } from "vue-router";
+import {reactive, toRefs, ref, watch} from "vue";
+import {message, Modal} from "ant-design-vue";
+import {useRouter} from "vue-router";
 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
-import { storage } from "../../api/storage";
+import {storage} from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import dayjs from "dayjs";
 import * as moment from "moment";
-import { changeOwnership } from "@/api/method";
+import {changeOwnership} from "@/api/method";
 import NameInput from "@/components/project/NameInput";
-import { validateName } from "@/api/index1";
+import {validateName} from "@/api/index1";
 //import { toDate } from "../../api/method";

 export default {
@@ -845,6 +845,7 @@ export default {
  },
  setup() {
    const state = reactive({
+      tableLoading:false,
      projectName: null,
      selectTime: null,
      sonproject: false,
@@ -917,15 +918,12 @@ export default {
    // 数据接入 - start -
    const router = useRouter();
    const sProjectStateList = ref([
-      { value: 0, label: "草稿" },
-      { value: 1, label: "审核中" },
-      { value: 2, label: "审核通过" },
-      { value: 3, label: "已发布" },
-      { value: -5, label: "未通过" },
-      { value: -1, label: "已结束" },
+      {value: 0, label: "草稿"},
+      {value: 1, label: "进行中"},
+      {value: 2, label: "已结束"},
    ]);
    const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 };
+      state.searchParam = {pageNo: 1, pageSize: 10};
      getTableDate();
    };
    const searchSubmit = () => {
@@ -991,7 +989,7 @@ export default {
        state.currentPage = 1;
        state.projectInfo.projectId ||
        changeOwnership("project", res.data.data.projectId, [
-            { id: res.data.data.createId, name: res.data.data.createName },
+          {id: res.data.data.createId, name: res.data.data.createName},
        ]);
        getTableDate();
      });
@@ -1049,7 +1047,7 @@ export default {
      //获取学员总数
      api.projectStudentCount({
        pid: object.projectId,
-        type:1
+        type: 1
      }).then((res) => {
        state.projectStudentsNum = res.data.data
        state.projectPubLoading = false;
@@ -1209,7 +1207,7 @@ export default {
          message.success("模版保存成功");
          return;
        }
-        Modal.error({ title: res.data.msg });
+        Modal.error({title: res.data.msg});
      });
    };
    //关闭存为模版弹窗
@@ -1345,12 +1343,7 @@ export default {
                  0: () => "草稿",
                  1: () => "草稿",
                  2: () => "草稿",
-                    3: () =>
-                      dayjs().isBefore(value.record.beginTime)
-                        ? "未开始"
-                        : "进行中",
-                    4: () =>
-                      dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
+                  3: () => "进行中",
                  "-1": () => "已结束",
                  "-5": () => "草稿",
                }[value.record.status + ""]() || ""
@@ -1661,7 +1654,7 @@ export default {
                              onClick={() => {
                                router.push({
                                  path: "/taskpage",
-                            query: { projectId: value.record.projectId },
+                                  query: {projectId: value.record.projectId},
                                });
                                storage.set("projectId", value.record.projectId);
                              }}
@@ -1679,9 +1672,9 @@ export default {
        },
      },
    ]);
-    const getTableDate = () =>
-      api
-        .getProjectList({
+    const getTableDate = () =>{
+      state.tableLoading = true
+      api.getProjectList({
        ...state.searchParam,
        beginTime:
            state.searchParam.valueDate &&
@@ -1698,12 +1691,15 @@ export default {
          .then((res) => {
            // console.log("搜索", res, state.searchParam);
            state.tableDataTotal = Number(res.data.data.total);
+            state.tableLoading = false
            const data = res.data.data.rows;
            initDataSublist("", data);
            console.log(data);
            tableData.value = data;
            console.log("tableData", tableData);
          });
+    }
+

    function initDataSublist(parentName, data) {
      if (data && data.length) {
@@ -1804,14 +1800,8 @@ export default {
    );

    function managerChange(e, l, d, t) {
-      if (state.projectInfo.parentId) {
-        return;
-      }
-
-      !state.projectInfo.sourceBelongId &&
-        (state.projectInfo.sourceBelongId = d);
-      !state.projectInfo.sourceBelongName &&
-        (state.projectInfo.sourceBelongName = t);
+      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongName = t
    }

    return {
@@ -1875,7 +1865,7 @@ export default {
      okReminderModal,
    };
  },
-};
+  };
 </script>
 <style lang="scss">
 .projectManage {
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -89,7 +89,7 @@

          <div class="in">
            <a-range-picker
-                show-time
+                :show-time="{ format: 'HH:mm' }"
                separator="至"
                :placeholder="['      开始时间', '        结束时间']"
                v-model:value="projectInfo.rangeTime"
@@ -387,10 +387,8 @@ export default {
    };

    function managerChange(e, l, d, t) {
-      !state.projectInfo.sourceBelongId &&
-      (state.projectInfo.sourceBelongId = d);
-      !state.projectInfo.sourceBelongName &&
-      (state.projectInfo.sourceBelongName = t);
+      state.projectInfo.sourceBelongId = d
+      state.projectInfo.sourceBelongName = t
    }

    return {
--- a/src/views/research/components/ResearchAddAsk.vue
+++ b/src/views/research/components/ResearchAddAsk.vue
@@ -6,7 +6,7 @@
      <div class="tagname">问答题</div>
      <div class="deleteop" @click="handleTypesDel(3)">
        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
      </div>
    </div>
    <div class="name">
--- a/src/views/research/components/ResearchAddItem.vue
+++ b/src/views/research/components/ResearchAddItem.vue
@@ -17,6 +17,7 @@
      </div>
      <div class="delete" @click="handleDel">删除</div>
    </div>
+    <!--
    <div class="name uploadContent">
      <a-upload
        v-show="!curItem.imgVal"
@@ -43,6 +44,7 @@
        />
      </div>
    </div>
+    -->
  </div>
 </template>
 <script>
--- a/src/views/research/components/ResearchAddMulti.vue
+++ b/src/views/research/components/ResearchAddMulti.vue
@@ -6,7 +6,7 @@
      <div class="tagname">多选题</div>
      <div class="deleteop" @click="handleTypesDel(2)">
        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
      </div>
    </div>
    <div class="name">
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -6,7 +6,7 @@
      <div class="tagname">评分题</div>
      <div class="deleteop" @click="handleTypesDel(4)">
        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
      </div>
    </div>
    <div class="name">
--- a/src/views/research/components/ResearchAddSingle.vue
+++ b/src/views/research/components/ResearchAddSingle.vue
@@ -6,7 +6,7 @@
      <div class="tagname">单选题</div>
      <div class="deleteop" @click="handleTypesDel(1)">
        <div><img src="../../../assets/images/projectadd/delete.png" /></div>
-        <div class="del_text">删除选项</div>
+        <div class="del_text">删除题目</div>
      </div>
    </div>
    <div class="name">
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,14 +2,14 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-21 14:32:52
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 15:15:30
+ * @LastEditTime: 2022-12-14 17:38:38
 * @FilePath: /fe-manage/vue.config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
-const {defineConfig} = require("@vue/cli-service");
+const { defineConfig } = require("@vue/cli-service");

 module.exports = defineConfig({
-    publicPath: "/manage",
+    publicPath: "/manage-release",
    // transpileDependencies: true,
    devServer: {
        port: 8080,