From c4f12a5b3afd8e45738ac1b873e1aca7a3e0b962 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 28 Feb 2023 20:03:54 +0800
Subject: [PATCH 1/6] =?UTF-8?q?--=20fix=20=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/project/NameInput.vue  |  112 ++-
 src/views/research/ResearchAdd.vue    |   64 +-
 src/views/research/ResearchManage.vue | 1121 ++++++++-----------------
 3 files changed, 463 insertions(+), 834 deletions(-)

diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index a96f1ab7..efd00ba2 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -1,20 +1,18 @@
 <template>
   <a-input
-      v-model:value="modelV"
-      :placeholder="placeholder"
-      :show-count="showCount"
-      :maxlength="maxlength"
-      :validate="validate"
-      @change="validateProName"
+    v-model:value="modelV.value"
+    :placeholder="placeholder"
+    :show-count="showCount"
+    :maxlength="maxlength"
   />
-  <div style="color: red; font-size: 10px" v-if="modelV && !validated">
+  <div style="color: red; font-size: 10px" v-if="modelV.value && validated===0">
     名称重复，请重新输入
   </div>
 </template>
 <script setup>
-import {defineProps, defineEmits, watch, ref, onMounted} from "vue";
+import {defineProps, defineEmits, watch, ref} from "vue";
 import {validateName} from "@/api/index1";
-import {throttle} from "@/api/method";
+import {Form} from "ant-design-vue";
 
 const props = defineProps({
   value: {
@@ -38,70 +36,70 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  validated: {
+    type: Number,
+    default: 0,
+  }
 });
 
-const emit = defineEmits({});
+const emit = defineEmits(["update:value",'update:validated']);
 
-const modelV = ref();
-
-const validating = ref(false)
-const validated = ref(true)
-
-onMounted(() => {
-  modelV.value = props.value;
+const modelV = ref({
+  value: props.value
 });
 
-watch(
-    () => props.value,
-    () => {
-      if (props.value !== modelV.value) {
-        modelV.value = props.value;
+const rulesRef = ref({
+  value: [{
+    required: true,
+    validator: validateValue,
+    trigger: "change",
+    message: "请输入名称",
+  },
+  ],
+});
+
+Form.useForm(modelV, rulesRef, { debounce: { wait: 800 } });
+
+watch(props, () => {
+  modelV.value.value = props.value;
+});
+
+watch(() => modelV.value.value, () => {
+  emit("update:validated", 1);
+  emit("update:value", modelV.value.value);
+});
+
+async function validateValue() {
+  if (!modelV.value.value) {
+    return Promise.reject("请输入名称");
+  }
+  return validateName({ name: modelV.value.value, type: props.type, id: props.id }).then(res => {
+      if (res.data.data === 1) {
+        emit("update:validated", 0);
+        return Promise.reject("名称重复");
       }
+      emit("update:validated", 2);
+      return Promise.resolve();
     }
-);
-
-watch(modelV, () => {
-  emit("update:value", modelV.value);
-});
-
-function validate() {
-  console.log('validate')
-  ;
-}
-
-function validateNameFun() {
-  validateName({name: props.value, type: props.type, id: props.id}).then(res => {
-        validating.value = false
-        validated.value = res.data.data !== 1
-      }
-  )
-}
-
-const throttleValidateName = throttle(validateNameFun, 500)
-
-function validateProName() {
-  validating.value = true
-  validated.value = true
-  props.value && throttleValidateName()
+  );
 }
 </script>
 <style lang="scss">
 
-  .pro {
-    .ant-input-affix-wrapper {
-      padding: 4px 8px;
-      border-radius: 8px;
-    
-    }
+.pro {
+  .ant-input-affix-wrapper {
+    padding: 4px 8px;
+    border-radius: 8px;
+
   }
-  .road {
+}
+
+.road {
   .ant-input-affix-wrapper {
     padding: 0px 8px;
     border-radius: 8px;
   }
-  }
-
-
+}
 
 
 .b_input,
diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 3ff1c3ce..8b5fbbaf 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -92,9 +92,7 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, computed } from "vue";
-// import { message } from "ant-design-vue";
-// import { createResearch } from "../../api/indexResearch";
+import {reactive, toRefs} from "vue";
 import ResearchAddSingle from "./components/ResearchAddSingle.vue";
 import ResearchAddMulti from "./components/ResearchAddMulti.vue";
 import ResearchAddAsk from "./components/ResearchAddAsk.vue";
@@ -104,7 +102,7 @@ import {
   traverseArr,
   filterCommon,
   deepCloneFilterString,
-} from "../../utils/utils";
+} from "@/utils/utils";
 import {
   queryResearchDetailById,
   editResearchMessage,
@@ -112,9 +110,8 @@ import {
   deleteChoiceQuestion,
   deleteQuestionScAndQa,
 } from "@/api/indexResearch";
-import { useRouter } from "vue-router";
-import store from "@/store";
-import { message } from "ant-design-vue";
+import {useRoute, useRouter} from "vue-router";
+import {message} from "ant-design-vue";
 
 export default {
   name: "ResearchAdd",
@@ -126,10 +123,11 @@ export default {
   },
   setup() {
     const router = useRouter();
+    const route = useRoute();
     const state = reactive({
       assessmentId: "", //编辑时候传
       assessmentName: "",
-      assessmentNameNew: computed(() => store.state.assessmentName),
+      assessmentNameNew: route.query.name,
 
       allFormsData: [],
       valueMore: "",
@@ -612,10 +610,12 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .header {
     width: 100%;
     display: flex;
     justify-content: space-between;
+
     .title {
       color: #000000;
       font-size: 18px;
@@ -624,10 +624,12 @@ export default {
       padding-left: 37px;
       //font-weight: 500;
     }
+
     .goback {
       padding-right: 70px;
       //padding-top: 37px;
       position: relative;
+
       .return {
         display: inline-block;
         width: 42px;
@@ -636,6 +638,7 @@ export default {
         margin-right: 10px;
         background-image: url("../../assets/images/projectadd/return.png");
       }
+
       .returntext {
         display: inline-block;
         position: absolute;
@@ -645,16 +648,19 @@ export default {
       }
     }
   }
+
   .addtype {
     display: flex;
     border-bottom: 1px solid rgba(0, 0, 0, 0.1);
     margin-right: 20px;
     align-items: center;
     margin-left: 41px;
+
     .addtypen {
       color: #6f6f6f;
       font-size: 14px;
     }
+
     .types {
       cursor: pointer;
       width: 80px;
@@ -667,11 +673,13 @@ export default {
       align-items: center;
       margin: 20px 10px;
     }
+
     .typesCur {
       color: #fff;
       background: #4ea6ff;
     }
   }
+
   .content {
     display: flex;
     flex-direction: column;
@@ -680,9 +688,11 @@ export default {
     min-width: 690px;
     margin-left: 38px;
     margin-top: 20px;
+
     .tagbox {
       display: flex;
       justify-content: space-between;
+
       .tagname {
         width: 90px;
         height: 32px;
@@ -696,6 +706,7 @@ export default {
         color: rgba(64, 158, 255, 1);
         font-size: 16px;
       }
+
       .deleteop {
         display: flex;
         justify-content: center;
@@ -707,6 +718,7 @@ export default {
         border: 1px solid #4ea6ff;
         border-radius: 8px;
         cursor: pointer;
+
         .del_text {
           color: #4ea6ff;
           font-size: 14px;
@@ -714,21 +726,25 @@ export default {
         }
       }
     }
+
     .scorebox {
       display: flex;
       align-items: center;
       margin-top: 20px;
       margin-left: 70px;
+
       .scoretext {
         font-size: 14px;
         color: #56a3f9;
       }
+
       .number {
         display: flex;
         border: 1px solid #d7e5fd;
         border-radius: 5px;
         margin: 0 10px;
         padding: 5px;
+
         .btn {
           width: 40px;
           height: 40px;
@@ -744,30 +760,36 @@ export default {
           line-height: 24px;
           cursor: pointer;
         }
+
         .curBtn {
           background: #56a3f9;
           color: #fff;
         }
       }
     }
+
     .picture {
       width: 100px;
       display: flex;
       flex-direction: column;
       margin-top: 20px;
       margin-left: 133px;
+
       .pictureimg {
         width: 100px;
         height: 100px;
       }
+
       .picturename {
         color: #6f6f6f;
         font-size: 14px;
       }
     }
+
     .options {
       display: flex;
     }
+
     .delete {
       cursor: pointer;
       margin-top: 32px;
@@ -776,10 +798,12 @@ export default {
       color: #4ea6ff;
       font-size: 14px;
     }
+
     .name2 {
       display: flex;
       align-items: flex-start;
     }
+
     .name {
       width: 60%;
       // background-color: lightcoral;
@@ -794,20 +818,24 @@ export default {
         align-items: center;
         justify-content: flex-end;
         flex-shrink: 0;
+
         .nameimg {
           width: 10px;
           height: 10px;
         }
       }
+
       .inname {
         color: #6f6f6f;
         font-size: 14px;
         margin-left: 7px;
         font-weight: 700;
       }
+
       .in {
         margin-left: 14px;
         flex: 1;
+
         .assess {
           display: flex;
           width: 226px;
@@ -822,6 +850,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .assesswhole {
             width: 50%;
             background: rgba(86, 163, 249, 0.1);
@@ -831,6 +860,7 @@ export default {
             justify-content: center;
             align-items: center;
           }
+
           .ratio {
             position: absolute;
             right: 10px;
@@ -839,24 +869,29 @@ export default {
             font-size: 14px;
           }
         }
+
         .addimg {
           cursor: pointer;
           color: rgba(78, 166, 255, 1);
           font-size: 14px;
         }
+
         .text {
           color: rgba(109, 117, 132, 1);
           font-size: 14px;
           //line-height: 24px;
         }
+
         .ant-radio-wrapper {
         }
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 35px;
         }
+
         .ant-select-selector {
           border-radius: 5px;
           // height: 120%;
@@ -864,26 +899,32 @@ export default {
           height: 40px;
         }
       }
+
       .numberInp {
         width: 200px;
+
         .ant-input-number {
           width: 200px;
           height: 40px;
           border-radius: 8px;
         }
+
         // .ant-input-number-input-wrap {
         //   width: 200px;
         // }
       }
     }
   }
+
   .name2 {
     display: flex;
     align-items: flex-start;
   }
+
   .opinion {
     display: flex;
     margin-top: 30px;
+
     .namebox {
       width: 120px;
       display: flex;
@@ -891,27 +932,33 @@ export default {
       justify-content: flex-end;
       flex-shrink: 0;
     }
+
     .in {
       margin-left: 14px;
       width: 500px;
+
       .ant-input-textarea-show-count {
         position: relative;
         height: 110px;
       }
+
       .ant-input-textarea-show-count::after {
         position: absolute;
         right: 10px;
         bottom: 0px;
       }
+
       .ant-input {
         border-radius: 8px;
       }
     }
   }
+
   .footer {
     width: 100%;
     margin-top: 31px;
     margin-bottom: 14px;
+
     .btn {
       display: flex;
       margin-bottom: 20px;
@@ -922,6 +969,7 @@ export default {
 
   .uploadContent {
     display: block !important;
+
     .uploadBtn {
       margin-left: 120px !important;
     }
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index cd91cc88..997e46e1 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -6,7 +6,7 @@
       <div class="filterItems">
         <div class="select">
           <a-input
-            v-model:value="projectName"
+            v-model:value="searchData.assessmentName"
             style="width: 270px; height: 40px; border-radius: 8px"
             placeholder="请输入评估名称"
           />
@@ -14,11 +14,10 @@
 
         <div class="select">
           <a-select
-            v-model:value="projectStatus"
+            v-model:value="searchData.releaseStatus"
             style="width: 270px"
             placeholder="请选择状态"
             :options="projectStateList"
-            @change="handleProjectState"
             allowClear
           ></a-select>
         </div>
@@ -26,9 +25,11 @@
           <div class="select addTimeBox">
             <div class="addTime">创建时间：</div>
             <a-range-picker
-              v-model:value="projectTime"
+              v-model:value="dateTime"
               style="width: 420px"
+              @change="timeChange"
               format="YYYY-MM-DD"
+              valueFormat="YYYY-MM-DD"
               separator="至"
               :placeholder="['      开始时间', '        结束时间']"
             />
@@ -57,23 +58,49 @@
     <div class="tableBox">
       <a-table
         style="border: 1px solid #f2f6fe"
-        :columns="tableDataFunc()"
-        :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
-        expandRowByClick="true"
+        :columns="column"
+        :data-source="data"
+        :loading="loading"
         :scroll="{ x: 1500 }"
-        @expand="expandTable"
         :pagination="false"
-      />
+      >
+        <template #operation="{ record }">
+          <a-space style="padding-right:10px">
+            <a-button v-if="record.releaseStatus === '1' && checkPer(record.permissions)"
+                      @click=" handleOper(record,'push')" type="link">发布
+            </a-button>
+            <a-button v-if="record.releaseStatus === '1' && checkPer(record.permissions)"
+                      @click=" editOper(record)" type="link">编辑
+            </a-button>
+            <a-button v-if="record.releaseStatus === '1' && checkPer(record.permissions)"
+                      @click=" handleEditPage(record.id)" type="link">基础信息
+            </a-button>
+            <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
+                      @click=" toManage(record.id)" type="link">管理
+            </a-button>
+            <a-button v-if="checkPer(record.permissions)" @click=" handleOper(record,'copy')" type="link">复制
+            </a-button>
+            <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
+                      @click="() =>  handleOper(record,'withdraw')" type="link">撤回
+            </a-button>
+            <a-button v-if="record.releaseStatus === '2' && checkPer(record.permissions)"
+                      @click=" handleOper(record,'end')" type="link">结束
+            </a-button>
+            <a-button v-if="record.releaseStatus !== '2' && checkPer(record.permissions)"
+                      @click=" handleOper(record,'del')" type="link">删除
+            </a-button>
+          </a-space>
+        </template>
+      </a-table>
     </div>
     <div class="pa">
       <a-pagination
         :showSizeChanger="false"
-        showQuickJumper="true"
-        hideOnSinglePage="true"
-        :pageSize="pageSize"
-        :current="currentPage"
-        :total="tableDataTotal"
+        :showQuickJumper="true"
+        :hideOnSinglePage="true"
+        :pageSize="searchData.pageSize"
+        :current="searchData.pageNo"
+        :total="total"
         class="pagination"
         @change="handelChangePage"
       />
@@ -84,12 +111,12 @@
       :footer="null"
       :closable="false"
       style="margin-top: 250px"
-      :centered="center"
+      :centered="true"
     >
       <div class="out">
         <div class="top">
-          <img class="topimg" src="../../assets/images/courseManage/add1.png" />
-          <div class="topc">{{ !assessmentId ? "创建" : "编辑" }}评估</div>
+          <img class="topimg" src="../../assets/images/courseManage/add1.png"/>
+          <div class="topc">{{ !formData.id ? "创建" : "编辑" }}评估</div>
           <div
             style="margin-left: 500px; cursor: pointer"
             @click="handleCancel"
@@ -104,774 +131,265 @@
           <div class="name">
             <div class="inname">评估名称</div>
             <div class="in">
-              <!-- <a-input
-                v-model:value="assessmentName"
-                show-count
-                :maxlength="15"
-                style="border-radius: 8px"
-              /> -->
               <NameInput
+                ref="nameRef"
                 placeholder="请输入评估名称"
-                v-model:value="assessmentName"
-                v-model:validate="validate"
+                v-model:value="formData.assessmentName"
+                v-model:validated="formData.validated"
+                :id="formData.id"
                 :maxlength="15"
                 show-count
                 :type="4"
-                :id="assessmentId ? assessmentId : null"
               ></NameInput>
             </div>
           </div>
           <div class="btn">
             <button class="samtn btn1" @click="handleCancel">取消</button>
-            <button class="samtn btn2" @click="handleNext">
-              {{ !assessmentId ? "下一步" : "确定" }}
-            </button>
-          </div>
-        </div>
-      </div></a-modal
-    >
-    <!--操作弹窗 -->
-    <a-modal
-      v-model:visible="delete_hs"
-      :footer="null"
-      :closable="closableQR"
-      wrapClassName="DelModal"
-      style="margin-top: 400px"
-      @cancel="handleCancelModal"
-    >
-      <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <img src="@/assets/images/coursewareManage/QR.png" alt="" />
-            <span style="margin-left: 9px">提示</span>
-            <div class="close_exit" @click="handleCancelModal"></div>
-          </div>
-          <div class="body">
-            <div :style="{ display: del_hs ? 'block' : 'none' }">
-              <span>您确定要删除此评估吗</span>
-            </div>
-            <div :style="{ display: over_hs ? 'block' : 'none' }">
-              <span>您确定要结束此评估吗</span>
-            </div>
-            <div :style="{ display: copy_hs ? 'block' : 'none' }">
-              <span>您确定要复制此评估吗</span>
-            </div>
-            <div :style="{ display: back_hs ? 'block' : 'none' }">
-              <span>您确定要撤回此评估吗</span>
-            </div>
-            <div :style="{ display: pub_hs ? 'block' : 'none' }">
-              <span>您确定要发布此评估吗</span>
-            </div>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn1" @click="handleCancelModal">
-              <div class="btnText">取消</div>
-            </div>
-            <div class="del_btn btn2" v-if="!addLoading" @click="handleSure">
-              <div class="btnText">确定</div>
-            </div>
-            <div class="del_btn btn2" v-else>
-              <div class="btnText">确定</div>
-            </div>
+            <a-button class="samtn btn2" @click="handleNext" :loading="formData.validated===1">
+              {{ !formData.id ? "下一步" : "确定" }}
+            </a-button>
           </div>
         </div>
       </div>
-    </a-modal>
-    <!--操作弹窗 -->
-  </div>
-  <!--  加载动画 -->
-  <div
-    class="aeLoading"
-    style="z-index: 100"
-    :style="{ display: addLoading ? 'flex' : 'none' }"
-  >
-    <a-spin :spinning="addLoading" tip="" />
+    </a-modal
+    >
   </div>
 </template>
-<script>
-import { reactive, toRefs, onMounted, ref } from "vue";
-// import { message } from "ant-design-vue";
-import {
-  queryResearchDetailList,
-  editAssessmentName,
-  editReleaseStatus,
-  deleteResearch,
-  createResearch,
-} from "@/api/indexResearch";
-import { traverseArr } from "../../utils/utils";
-import { useRouter } from "vue-router";
-import { toDate } from "../../api/method.js";
-import store from "@/store";
-import { message } from "ant-design-vue";
+<script setup>
+import {ref} from "vue";
+import {createResearch, deleteResearch, editAssessmentName, editReleaseStatus,} from "@/api/indexResearch";
+import {checkPer} from "@/utils/utils";
+import {Form, message} from "ant-design-vue";
 import NameInput from "@/components/project/NameInput";
-import { validateName } from "@/api/index1";
-export default {
-  name: "learningPath",
-  components: {
-    NameInput,
+import {useRowsPage} from "@/api/request";
+import {ASSESSMENT_PAGE} from "@/api/apis";
+import {useRouter} from "vue-router";
+import dialog from "@/utils/dialog";
+
+const router = useRouter();
+const projectStateList = [
+  {
+    value: null,
+    label: "请选择状态", //发布
   },
-  setup() {
-    const router = useRouter();
-    const state = reactive({
-      addLoading: false,
-      // projectNameList: [
-      //   {
-      //     id: 1,
-      //     value: "项目一",
-      //     label: "项目一",
-      //   },
-      //   {
-      //     id: 2,
-      //     value: "项目二",
-      //     label: "项目二",
-      //   },
-      //   {
-      //     id: 3,
-      //     value: "项目三",
-      //     label: "项目三",
-      //   },
-      //   {
-      //     id: 4,
-      //     value: "项目四",
-      //     label: "项目四",
-      //   },
-      // ],
-      projectStateList: [
-        {
-          value: 1,
-          label: "待发布", //发布
-        },
-        {
-          value: 2,
-          label: "已发布", //撤回
-        },
-        {
-          value: 3,
-          label: "已结束",
-        },
-      ],
-      projectName: "",
-      projectStatus: null,
-      projectTime: "",
+  {
+    value: 1,
+    label: "待发布", //发布
+  },
+  {
+    value: 2,
+    label: "已发布", //撤回
+  },
+  {
+    value: 3,
+    label: "已结束",
+  },
+];
 
-      newNext: false,
-      number: null,
-      selectTime: null,
-      tableData: [
-        // {
-        //   key: 1,
-        //   number: 1,
-        //   manager: "产品经理评估",
-        //   state: "已发布",
-        //   creater: "管理员",
-        //   pubtime: "2022-07-20 9:03",
-        //   cretime: "2022-07-20 9:03",
-        //   haspub: false,
-        // },
-        // {
-        //   key: 2,
-        //   number: 2,
-        //   manager: "高级产品经理评估",
-        //   state: "已发布",
-        //   creater: "管理员",
-        //   pubtime: "2022-07-20 9:03",
-        //   cretime: "2022-07-20 9:03",
-        //   haspub: false,
-        // },
-        // {
-        //   key: 3,
-        //   number: 3,
-        //   manager: "管理者进阶腾飞班管理者进阶腾飞班评估",
-        //   state: "待发布",
-        //   creater: "管理员",
-        //   pubtime: "2022-07-20 9:03",
-        //   cretime: "2022-07-20 9:03",
-        //   haspub: true,
-        // },
-        // {
-        //   key: 4,
-        //   number: 4,
-        //   manager: "HR评估",
-        //   state: "已结束",
-        //   creater: "管理员",
-        //   pubtime: "2022-07-20 9:03",
-        //   cretime: "2022-07-20 9:03",
-        //   haspub: true,
-        // },
-      ],
-      currentPage: 1,
-      tableDataTotal: 0,
-      pageSize: 10,
-      // value1: " ",
-
-      assessmentId: "", //区分新建/编辑
-      assessmentName: "",
-      copyItem: {},
-
-      value2: ref(),
-      valueE: ref(" "),
-      valueEE: ref(" "),
-      valuei: ref(" "),
-      delete_hs: false,
-      del_hs: false,
-      over_hs: false,
-      copy_hs: false,
-      back_hs: false,
-      pub_hs: false,
-
-      validate: true,
-    });
-    const tableDataFunc = () => {
-      const columns = [
-        //   {
-        //       title: "序号",
-        //       dataIndex: "number",
-        //  //      key: "number",
-        //     width: 100,
-        //     align: "center",
-        //    className: "h",
-        //    customRender: ({ index }) => {
-        //{ text, record, index, column }
-        //      return index + 1;
-        //   },
-        //   },
-        {
-          title: "名称",
-          dataIndex: "manager",
-          key: "manager",
-          width: "30%",
-          align: "center",
-          ellipsis: true,
-          className: "h",
-          customRender: ({ text }) => {
-            return text ? text : "-";
-          },
-        },
-        {
-          title: "状态",
-          dataIndex: "state",
-          key: "state",
-          width: "10%",
-          align: "center",
-          className: "h",
-          customRender: ({ record }) => {
-            switch (record.releaseStatus) {
-              case "1":
-                return "待发布";
-              case "2":
-                return "已发布";
-              case "3":
-                return "已结束";
-            }
-          },
-        },
-        {
-          title: "创建人",
-          dataIndex: "createName",
-          key: "createName",
-          width: "10%",
-          align: "center",
-          className: "h",
-          customRender: ({ text }) => {
-            return text ? text : "-";
-          },
-        },
-        {
-          title: "发布时间",
-          dataIndex: "pubtime",
-          key: "pubtime",
-          width: "10%",
-          align: "center",
-          className: "h",
-          customRender: ({ text }) => {
-            return text ? text : "-";
-          },
-        },
-        {
-          title: "创建时间",
-          dataIndex: "cretime",
-          key: "cretime",
-          width: "10%",
-          align: "center",
-          className: "h",
-          customRender: ({ text }) => {
-            return text ? text : "-";
-          },
-        },
-        {
-          title: "操作",
-          className: "h",
-          dataIndex: "opacation",
-          key: "opacation",
-          width: "20%",
-          align: "center",
-          fixed: "right",
-        },
-      ];
-      return columns;
-    };
-
-    const getTableDate = async () => {
-      // let data = state.tableData;
-      state.addLoading = true;
-      let startTime,
-        endTime = "";
-      if (state.projectTime) {
-        startTime = toDate(
-          new Date(state.projectTime[0].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-        endTime = toDate(
-          new Date(state.projectTime[1].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-      }
-      let res = await queryResearchDetailList({
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        releaseStatus: state.projectStatus,
-        assessmentName: state.projectName,
-        searchEndTime: endTime,
-        searchStartTime: startTime,
-      });
-      const { rows, total } = res.data.data;
-      state.tableDataTotal = total;
-      const data = traverseArr(
-        rows,
-        {
-          key: "assessmentId",
-          number: "assessmentId",
-          manager: "assessmentName",
-          state: "releaseStatus",
-          creater: "createUserName",
-          pubtime: "releaseTime",
-          cretime: "createTime",
-          haspub: "assessmentId",
-        },
-        true
-      );
-      state.addLoading = false;
-      data.map((value) => {
-        {
-          //单层项目
-          value.opacation = (
-            <div class="operation">
-              {value.state === "2" ? (
-                <div class="fb">
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleToManagepage(value, "/managepage");
-                    }}
-                  >
-                    管理
-                  </div>
-
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleCopy(value);
-                    }}
-                  >
-                    复制
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleStatuts(value, "2");
-                    }}
-                  >
-                    撤回
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleStatuts(value, "3");
-                    }}
-                  >
-                    结束
-                  </div>
-                </div>
-              ) : (
-                <div></div>
-              )}
-              {value.state === "1" ? (
-                <div class="fb">
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleStatuts(value, "1");
-                    }}
-                  >
-                    发布
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleToResearchadd(value, "/researchadd");
-                    }}
-                  >
-                    基础信息
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleCopy(value);
-                    }}
-                  >
-                    复制
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleEditName(value);
-                    }}
-                  >
-                    编辑
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleDel(value);
-                    }}
-                  >
-                    删除
-                  </div>
-                </div>
-              ) : (
-                <div></div>
-              )}
-              {value.state === "3" ? (
-                <div class="fb">
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleCopy(value);
-                    }}
-                  >
-                    复制
-                  </div>
-                  <div
-                    class="jc"
-                    onClick={() => {
-                      handleDel(value);
-                    }}
-                  >
-                    删除
-                  </div>
-                </div>
-              ) : (
-                <div></div>
-              )}
-            </div>
-          );
-        }
-      });
-      state.tableData = data;
-    };
-    getTableDate();
-    const handelChangePage = (page, pageSize) => {
-      state.currentPage = page;
-      state.pageSize = pageSize;
-      getTableDate();
-    };
-    const handleSearch = () => {
-      getTableDate();
-    };
-    const handleRest = () => {
-      state.projectName = "";
-      state.projectStatus = null;
-      state.projectTime = "";
-      getTableDate();
-    };
-
-    const handleProjectState = (value) => {
-      state.projectStatus = value;
-    };
-    const handleNew = () => {
-      state.newNext = true;
-    };
-    const handleEditName = (item) => {
-      state.id = item.id;
-      state.assessmentName = item.assessmentName;
-      state.newNext = true;
-    };
-    const handleNext = async () => {
-      if (!state.id) {
-        if (!state.assessmentName) {
-          message.destroy();
-          message.error("请输入评估名称");
-          return false;
-        }
-        if (!state.validate) {
-          message.destroy();
-          return message.warning("该评估名称已存在");
-        }
-        const offName = await validateName({
-          name: state.assessmentName,
-          type: 4,
-          id: state.id,
-        }).then((res) => {
-          return res.data.data == 1;
-        });
-        if (offName) {
-          message.destroy();
-          return message.warning("课程名称重复，请重新填写");
-        }
-
-        store.commit("SET_assessmentName", state.assessmentName);
-        router.push("/researchadd");
-        handleCancel();
-      } else {
-        if (!state.assessmentName) {
-          message.destroy();
-          message.error("请输入评估名称");
-          return false;
-        }
-        editAssessmentName({
-          assessmentId: state.id,
-          assessmentName: state.assessmentName,
-        }).then((res) => {
-          if (res.data.code === 200) {
-            getTableDate();
-            handleCancel();
-          }
-        });
-      }
-    };
-    const handleCancel = () => {
-      state.id = "";
-      state.assessmentName = "";
-      // store.commit("SET_assessmentName", "");
-      state.newNext = false;
-    };
-
-    const handleStatuts = (item, status) => {
-      state.id = item.id;
-      switch (status) {
+const column = [
+  {
+    title: "名称",
+    dataIndex: "assessmentName",
+    key: "assessmentName",
+    width: "20%",
+    align: "center",
+    ellipsis: true,
+    className: "h",
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
+  {
+    title: "状态",
+    dataIndex: "state",
+    key: "state",
+    width: "10%",
+    align: "center",
+    className: "h",
+    customRender: ({ record }) => {
+      switch (record.releaseStatus) {
         case "1":
-          // 发布
-          state.delete_hs = true;
-          state.pub_hs = true;
-          break;
+          return "待发布";
         case "2":
-          // 撤回
-          state.delete_hs = true;
-          state.back_hs = true;
-          break;
+          return "已发布";
         case "3":
-          // 结束
-          state.delete_hs = true;
-          state.over_hs = true;
-          break;
+          return "已结束";
       }
-    };
-    const handleDel = (item) => {
-      state.id = item.id;
-      state.delete_hs = true;
-      state.del_hs = true;
-    };
-    const handleCopy = (item) => {
-      state.id = item.id;
-      state.copyItem = item;
-      state.delete_hs = true;
-      state.copy_hs = true;
-    };
-    const handleSure = () => {
-      // 发布
-      if (state.pub_hs) {
-        editReleaseStatus({
-          assessmentId: state.id,
-          releaseStatus: "2",
-        }).then((res) => {
-          console.log(res);
-          handleCancelModal();
-          getTableDate();
-        });
-      }
-      // 撤回
-      if (state.back_hs) {
-        editReleaseStatus({
-          assessmentId: state.id,
-          releaseStatus: "1",
-        }).then((res) => {
-          console.log(res);
-          handleCancelModal();
-          getTableDate();
-        });
-      }
-      // 结束
-      if (state.over_hs) {
-        editReleaseStatus({
-          assessmentId: state.id,
-          releaseStatus: "3",
-        }).then((res) => {
-          console.log(res);
-          handleCancelModal();
-          getTableDate();
-        });
-      }
-      // 删除
-      if (state.del_hs) {
-        deleteResearch({
-          assessmentId: Number(state.id),
-        }).then((res) => {
-          console.log(res);
-          handleCancelModal();
-          getTableDate();
-        });
-      }
-      // 复制
-      if (state.copy_hs) {
-        state.addLoading = true;
-        let resultPost = restData(state.copyItem);
-        resultPost.assessmentName = resultPost.assessmentName + "(1)";
-        console.log("resultPost");
-        console.log(resultPost);
-        createResearch(resultPost).then((res) => {
-          state.addLoading = false;
-          console.log(res);
-          handleCancelModal();
-          getTableDate();
-        });
-      }
-    };
-    const handleCancelModal = () => {
-      state.id = "";
-      state.delete_hs = false;
-      state.del_hs = false;
-      state.over_hs = false;
-      state.copy_hs = false;
-      state.back_hs = false;
-      state.pub_hs = false;
-    };
-    const handleToManagepage = (item, path) => {
-      router.push({
-        path: path + "/" + item.id,
-      });
-    };
-    const handleToResearchadd = (item, path) => {
-      // console.log("item.id");
-      // console.log(item.id);
-      // console.log(item);
-      router.push({
-        path: path + "/" + item.id,
-      });
-    };
-
-    onMounted(() => {
-      // console.log("执行");
-    });
-
-    // 转换成后端格式
-    const restData = (obj) => {
-      const resultArr = {
-        assessmentName: obj.assessmentName,
-        assessmentMark: obj.assessmentMark,
-        assessmentSingleChoiceDtoList: [],
-        assessmentMultipleChoiceDtoList: [],
-        assessmentEssayQuestionDtoList: [],
-        assessmentScoringQuestionDtoList: [],
-      };
-      if (obj.singleStemVoList.length) {
-        let single = obj.singleStemVoList;
-        let singleArr = [];
-        single.forEach((item) => {
-          item.assessmentSingleChoiceVoList.forEach((itm) => {
-            singleArr.push({
-              singleStemName: item.singleStemName,
-              questionType: item.questionType,
-              orderNumber: item.orderNumber,
-              optionOrderNum: itm.optionOrderNum,
-              singleOptionName: itm.singleOptionName,
-              singleOptionPictureAddress: itm.singleOptionPictureAddress,
-            });
-          });
-        });
-        resultArr.assessmentSingleChoiceDtoList = singleArr;
-      }
-      if (obj.multipleStemVoList.length) {
-        let multi = obj.multipleStemVoList;
-        let multiArr = [];
-        multi.forEach((item) => {
-          item.multipleChoiceVoList.forEach((itm) => {
-            multiArr.push({
-              multipleStemName: item.multipleStemName,
-              questionType: item.questionType,
-              orderNumber: item.orderNumber,
-              optionOrderNum: itm.optionOrderNum,
-              multipleOptionName: itm.multipleOptionName,
-              multipleOptionPictureAddress: itm.multipleOptionPictureAddress,
-            });
-          });
-        });
-        resultArr.assessmentMultipleChoiceDtoList = multiArr;
-      }
-      if (obj.essayQuestionVoList.length) {
-        let Ques = obj.essayQuestionVoList;
-        let QuesArr = [];
-        Ques.forEach((item) => {
-          QuesArr.push({
-            questionType: item.questionType,
-            assessmentQaTitle: item.assessmentQaTitle,
-            assessmentQaDescribe: item.assessmentQaDescribe,
-            orderNumber: item.orderNumber,
-          });
-        });
-        resultArr.assessmentEssayQuestionDtoList = QuesArr;
-      }
-      if (obj.scoringQuestionVoList.length) {
-        let scor = obj.scoringQuestionVoList;
-        let scorsArr = [];
-        scor.forEach((item) => {
-          scorsArr.push({
-            questionType: item.questionType,
-            assessmentScTitle: item.assessmentScTitle,
-            assessmentMinScore: item.assessmentMinScore,
-            assessmentMaxScore: item.assessmentMaxScore,
-            weightScale: item.weightScale,
-            orderNumber: item.orderNumber,
-          });
-        });
-        resultArr.assessmentScoringQuestionDtoList = scorsArr;
-      }
-      console.log(111);
-      console.log(resultArr);
-      return resultArr;
-    };
-
-    const expandTable = (e, a) => {
-      // console.log("惦记了");
-      console.log("e", e, a);
-    };
-    const chooseImg = (id) => {
-      console.log(id);
-    };
-
-    return {
-      ...toRefs(state),
-      handleProjectState,
-      expandTable,
-      tableDataFunc,
-      chooseImg,
-      getTableDate,
-      handleCopy,
-      handleSure,
-      handleCancelModal,
-      handelChangePage,
-      handleSearch,
-      handleRest,
-      handleCancel,
-      handleNext,
-      handleNew,
-      handleEditName,
-      handleStatuts,
-      handleDel,
-      handleToManagepage,
-      handleToResearchadd,
-    };
+    },
   },
+  {
+    title: "创建人",
+    dataIndex: "createName",
+    key: "createName",
+    width: "10%",
+    align: "center",
+    className: "h",
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
+  {
+    title: "发布时间",
+    dataIndex: "releaseTime",
+    key: "releaseTime",
+    width: "10%",
+    align: "center",
+    className: "h",
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
+  {
+    title: "创建时间",
+    dataIndex: "createTime",
+    key: "createTime",
+    width: "10%",
+    align: "center",
+    className: "h",
+    customRender: ({ text }) => {
+      return text ? text : "-";
+    },
+  },
+  {
+    title: "操作",
+    width: "20%",
+    className: "h",
+    dataIndex: "id",
+    key: "id",
+    fixed: "right",
+    align: "right",
+    slots: { customRender: "operation" },
+  },
+];
+const searchData = ref({
+  pageNo: 1,
+  pageSize: 10,
+  releaseStatus: null,
+  assessmentName: "",
+  searchEndTime: "",
+  searchStartTime: "",
+});
+const formData = ref({
+  assessmentName: "",
+  id: "",
+  validated: 0,
+});
+
+const newNext = ref(false);
+const dateTime = ref([]);
+const nameRef = ref();
+const rulesRef = ref({
+  assessmentName: [
+    {
+      required: true,
+      message: "请输入评估名称",
+    },
+  ],
+});
+
+const { resetFields } = Form.useForm(searchData, {});
+const { resetFields: resetFormFields, validate } = Form.useForm(formData, rulesRef);
+
+const { data, total, loading, fetch } = useRowsPage(ASSESSMENT_PAGE, searchData.value);
+const handle = record => ({
+  push: () => {
+    message.info("发布成功！");
+    record.releaseStatus = "2";
+    editReleaseStatus({ assessmentId: record.id, releaseStatus: 2 });
+  },
+  withdraw: () => {
+    message.info("撤回成功！");
+    record.releaseStatus = "1";
+    editReleaseStatus({ assessmentId: record.id, releaseStatus: 1 });
+  },
+  end: () => {
+    message.info("结束成功！");
+    record.releaseStatus = "3";
+    editReleaseStatus({ assessmentId: record.id, releaseStatus: 3 });
+  },
+  del: async () => {
+    loading.value = true;
+    message.info("删除成功！");
+    await deleteResearch({ assessmentId: record.id });
+    fetch();
+  },
+  copy: async () => {
+    loading.value = true;
+    message.info("删除成功！");
+    await createResearch({ ...record, assessmentName: record.assessmentName + "(1)" });
+    fetch();
+  }
+});
+const handleMsg = {
+  push: "您确定要发布此评估吗",
+  withdraw: "您确定要撤回此评估吗",
+  end: "您确定要结束此评估吗",
+  del: "您确定要删除此评估吗",
+  copy: "您确定要复制此评估吗",
+};
+
+function handleOper(record, type) {
+  dialog({ content: handleMsg[type], ok: handle(record)[type] });
+}
+
+function editOper(record) {
+  formData.value = { ...record };
+  newNext.value = true;
+}
+
+const handelChangePage = (page) => {
+  searchData.value.pageNo = page;
+  fetch();
+};
+
+function timeChange(time, timeStr) {
+  searchData.value.searchStartTime = timeStr[0];
+  searchData.value.searchEndTime = timeStr[1];
+}
+
+const handleSearch = () => {
+  fetch();
+};
+const handleRest = () => {
+  dateTime.value = [];
+  resetFields();
+  fetch();
+};
+
+function handleCancel() {
+  resetFormFields();
+  newNext.value = false;
+}
+
+const handleNew = () => {
+  newNext.value = true;
+};
+
+function handleEditPage(id) {
+  router.push("/researchadd/" + id);
+}
+
+function toManage(id) {
+  router.push("/managepage/" + id);
+}
+const handleNext = async () => {
+  await validate().catch(({ errorFields }) => {
+    message.warning(errorFields[0].errors.join());
+    throw Error("数据校验不通过");
+  });
+  if (!formData.value.validated) {
+    message.warning("名称重复");
+    return;
+  }
+  if (!formData.value.id) {
+    router.push({ path: "/researchadd", query: { name: formData.value.assessmentName } });
+  } else {
+    newNext.value = false
+    loading.value = true;
+    message.info("编辑成功！");
+    await editAssessmentName({ assessmentId: formData.value.id, assessmentName: formData.value.assessmentName });
+    fetch();
+  }
 };
 </script>
 <style lang="scss">
@@ -881,6 +399,7 @@ export default {
   display: block;
   clear: both;
 }
+
 .addTimeBox {
   position: relative;
   display: flex;
@@ -901,6 +420,7 @@ export default {
     margin-left: 85px;
   }
 }
+
 .out {
   //display: flex;
   display: block;
@@ -912,27 +432,31 @@ export default {
   left: 50%;
   top: 50%;
   transform: translate(-50%, -50%);
+
   .top {
     width: 100%;
     height: 68px;
 
     background: linear-gradient(
-      rgba(78, 166, 255, 0.2) 0%,
-      rgba(78, 166, 255, 0) 100%
+        rgba(78, 166, 255, 0.2) 0%,
+        rgba(78, 166, 255, 0) 100%
     );
     display: flex;
     align-items: center;
+
     .topimg {
       width: 18px;
       height: 18px;
       margin-left: 27px;
     }
+
     .topc {
       color: #000000;
       font-size: 16px;
       margin-left: 8px;
     }
   }
+
   .mid {
     width: 100%;
     height: 100%;
@@ -940,11 +464,13 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
+
     .d {
       // margin-top: 8px;
       // color: #ff4e4e;
       margin-left: -5px;
     }
+
     .name {
       width: 78%;
       // background-color: lightcoral;
@@ -959,15 +485,18 @@ export default {
         font-size: 14px;
         margin-left: 7px;
       }
+
       .in {
         margin-left: 14px;
         width: 81%;
+
         .ant-input {
           border-radius: 5px;
           // height: 120%;
           width: 100%;
           height: 30px;
         }
+
         .showcount {
           position: absolute;
           right: 10px;
@@ -976,12 +505,14 @@ export default {
         }
       }
     }
+
     .btn {
       width: 33%;
       margin-top: 30px;
       display: flex;
       justify-content: space-between;
       margin-bottom: 30px;
+
       .samtn {
         width: 100px;
         height: 40px;
@@ -990,10 +521,12 @@ export default {
         border-radius: 8px;
         cursor: pointer;
       }
+
       .btn1 {
         background-color: #fff;
         color: #4ea6ff;
       }
+
       .btn2 {
         margin-left: 10px;
         background-color: #4ea6ff;
@@ -1002,12 +535,14 @@ export default {
     }
   }
 }
+
 .researchmanage {
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
   position: relative;
+
   .filter {
     margin-left: 38px;
     margin-right: 38px;
@@ -1015,13 +550,16 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
+
     .filterItems {
       display: flex;
       flex-wrap: wrap;
+
       .select {
         margin-right: 20px;
         margin-bottom: 20px;
       }
+
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -1033,9 +571,11 @@ export default {
         margin-right: 14px;
         flex-shrink: 0;
         cursor: pointer;
+
         .search {
           background-size: 100%;
         }
+
         .btnText {
           font-size: 14px;
           font-weight: 400;
@@ -1044,6 +584,7 @@ export default {
           margin-left: 5px;
         }
       }
+
       .btnn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -1056,9 +597,11 @@ export default {
         margin-right: 14px;
         flex-shrink: 0;
         cursor: pointer;
+
         .search {
           background-size: 100%;
         }
+
         .btnText {
           font-size: 14px;
           font-weight: 400;
@@ -1067,6 +610,7 @@ export default {
           margin-left: 5px;
         }
       }
+
       .btn1 {
         .search {
           width: 15px;
@@ -1074,6 +618,7 @@ export default {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
       }
+
       .btn2 {
         .search {
           width: 16px;
@@ -1081,27 +626,35 @@ export default {
           background-image: url("../../assets/images/courseManage/reset1.png");
         }
       }
+
       .btn1:hover {
         background: rgba(64, 158, 255, 0.76);
+
         .search {
           background-image: url("../../assets/images/courseManage/search0.png");
         }
+
         .btnText {
           color: #ffffff;
         }
       }
+
       .btn1:active {
         background: #0982ff;
       }
+
       .btn2:hover {
         background: rgba(64, 158, 255, 0.1);
       }
+
       .btn2:active {
         background: rgba(64, 158, 255, 0.2);
       }
     }
+
     .btns {
       display: flex;
+
       .btn {
         padding: 0px 26px 0px 26px;
         height: 38px;
@@ -1114,9 +667,11 @@ export default {
         margin-right: 14px;
         flex-shrink: 0;
         cursor: pointer;
+
         .search {
           background-size: 100%;
         }
+
         .btnText {
           font-size: 14px;
           font-weight: 400;
@@ -1125,28 +680,35 @@ export default {
           margin-left: 5px;
         }
       }
+
       .btn3 {
         margin-right: 0px;
+
         .search {
           width: 17px;
           height: 18px;
           background-image: url("../../assets/images/courseManage/add0.png");
         }
       }
+
       .btn3:hover {
         background: rgba(64, 158, 255, 0.76);
+
         .search {
           background-image: url("../../assets/images/courseManage/add0.png");
         }
+
         .btnText {
           color: #ffffff;
         }
       }
+
       .btn3:active {
         background: #0982ff;
       }
     }
   }
+
   .tableBox {
     margin: 20px 38px 30px;
     display: flex;
@@ -1158,24 +720,28 @@ export default {
       text-align: center;
       color: #999ba3;
     }
+
     td.ant-table-cell {
       text-align: center;
     }
 
     .ant-table-tbody
-      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-      > td {
+    > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+    > td {
       background: #f6f9fd;
     }
   }
+
   .pa {
     width: 100%;
     display: flex;
     justify-content: center;
     margin-bottom: 20px;
+
     .pagination {
       margin-bottom: 20px;
     }
+
     .ant-pagination-item-link,
     .ant-pagination-item,
     .ant-select-selector,
@@ -1191,9 +757,11 @@ export default {
   .operation {
     display: flex;
     justify-content: right;
+
     .fb {
       display: flex;
       margin-right: 20px;
+
       .jc {
         color: #4ea6ff;
         font-size: 14px;
@@ -1204,10 +772,12 @@ export default {
     }
   }
 }
+
 .DelModal {
   .ant-modal {
     .ant-modal-content {
       width: 424px !important;
+
       .ant-modal-body {
         .delete {
           z-index: 9999;
@@ -1219,29 +789,34 @@ export default {
           left: 50%;
           top: 10%;
           transform: translate(-50%, -50%);
+
           .del_header {
             position: absolute;
             width: calc(100%);
             height: 40px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%
             );
           }
+
           .del_main {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .del-icon {
                 width: 16px;
                 height: 16px;
                 position: relative;
                 margin-right: 10px;
+
                 img {
                   width: 100%;
                   height: 100%;
@@ -1251,6 +826,7 @@ export default {
                   background-size: 100% 100%;
                 }
               }
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -1258,6 +834,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -1268,6 +845,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -1275,10 +853,12 @@ export default {
               justify-content: center;
               align-items: center;
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -1290,16 +870,19 @@ export default {
                 margin-right: 14px;
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;

From e56ae852fba2570b5762364a496825aba9c79ff9 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 28 Feb 2023 20:06:31 +0800
Subject: [PATCH 2/6] =?UTF-8?q?--=20fix=20=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examine/OnlineReviewed.vue     | 2 +-
 src/views/examine/TobeOnlineReviewed.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/examine/OnlineReviewed.vue b/src/views/examine/OnlineReviewed.vue
index 95b7dfcc..3e800711 100644
--- a/src/views/examine/OnlineReviewed.vue
+++ b/src/views/examine/OnlineReviewed.vue
@@ -3,7 +3,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 100%"
-      :src="iframeUrl + '/iframe/course/reviewed'"
+      :src="iframeUrl + '/pc/iframe/course/reviewed'"
       frameborder="0"
       name="myframe"
       security="restricted"
diff --git a/src/views/examine/TobeOnlineReviewed.vue b/src/views/examine/TobeOnlineReviewed.vue
index 46a488d2..5efa7dfc 100644
--- a/src/views/examine/TobeOnlineReviewed.vue
+++ b/src/views/examine/TobeOnlineReviewed.vue
@@ -3,7 +3,7 @@
     <iframe
       id="iframe"
       style="width: 100%; height: 100%"
-      :src="iframeUrl + '/iframe/course/noapproved'"
+      :src="iframeUrl + '/pc/iframe/course/noapproved'"
       frameborder="0"
       name="myframe"
       security="restricted"

From 960e294352a2a6e8c6d79b75356b9bf18b7dfb5a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 28 Feb 2023 20:46:55 +0800
Subject: [PATCH 3/6] =?UTF-8?q?--=20fix=20=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue |  29 ++--
 src/views/courselibrary/courseModal.vue      |  10 +-
 src/views/learningpath/LearningPath.vue      |   5 +-
 src/views/projectcenter/ProjectAdd.vue       | 154 ++++++++++---------
 src/views/projectcenter/ProjectManage.vue    |   5 +-
 5 files changed, 105 insertions(+), 98 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 4b66c4ec..eb7d995e 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -135,10 +135,11 @@
                 <NameInput
                   placeholder="请输入课程名称"
                   v-model:value="xzinputV1"
-                  v-model:validate="validate"
+                  v-model:validated="validated"
+                  :id="offcourseId"
                   :maxlength="20"
                   show-count
-                  :type="3"
+                  :type="2"
                 ></NameInput>
                 <!--                <a-input-->
                 <!--                  v-model:value="xzinputV1"-->
@@ -286,9 +287,9 @@
               <div class="btn btn5" @click="of_exit1">
                 <div class="btnText">取消</div>
               </div>
-              <div class="btn btn6" @click="createft">
-                <div class="btnText">确定</div>
-              </div>
+              <a-button class="btn btn6" @click="createft" :loading="validated===1">
+                确定
+              </a-button>
             </div>
           </div>
         </div>
@@ -918,10 +919,10 @@
               <NameInput
                 maxlength="30"
                 v-model:value="xjkkinputV1"
-                v-model:validate="validate"
+                v-model:validated="validated"
                 show-count
-                :id="offcourseId"
-                :type="2"
+                :id="offcoursePlanId"
+                :type="5"
                 style="width: 440px; height: 40px; border-radius: 8px"
                 placeholder="请输入开课名称"
               ></NameInput>
@@ -1168,9 +1169,9 @@
             <div class="cstm_btn btn5" @click="handleCancelStu">
               <div class="btnText">取消</div>
             </div>
-            <div class="cstm_btn btn6" @click="handleSureStu">
-              <div class="btnText">确定</div>
-            </div>
+            <a-button class="cstm_btn btn6" @click="handleSureStu" :loading="validated===1">
+              确定
+            </a-button>
           </div>
         </div>
       </div>
@@ -2575,7 +2576,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate: true,
+      validated: 0,
       attach: "",
       pageSize2: 10,
       currentPage2: 0,
@@ -3501,9 +3502,7 @@ export default defineComponent({
         return message.warning("请输入必填项");
       }
 
-      console.log("state.validate", state.validate);
-
-      if (!state.validate) {
+      if (!state.validated == 2) {
         message.destroy();
         return message.warning("该课程名称已存在");
       }
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 1b500710..4216ee9f 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -54,7 +54,7 @@
                       ref="inputRef"
                       placeholder="请输入课程名称"
                       v-model:value="qdms_inputV1"
-                      v-model:validate="validate"
+                      v-model:validated="validated"
                       :maxlength="20"
                       show-count
                       :type="2"
@@ -457,9 +457,9 @@
             <div class="btn btn5" @click="noEditClose">
               <div class="btnText">取消</div>
             </div>
-            <div class="btn btn6" @click="handlePush">
+            <a-button class="btn btn6" @click="handlePush" :loading="validated===1">
               <div class="btnText">保存</div>
-            </div>
+            </a-button>
           </div>
         </div>
       </div>
@@ -507,7 +507,7 @@
       </div>
       <div class="btn">
         <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
-        <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+        <a-button class="samtn btn2" @click="closeLearnBgMore">确定</a-button>
       </div>
     </div>
   </a-modal>
@@ -556,7 +556,7 @@ export default defineComponent({
       hideshow: true,
       ft_eidt: false,
       attach: "",
-      validate: true,
+      validated: 0,
       ft_hs: false,
       addLoading: false,
       statusJuJue: 0,
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 958b336f..e1074981 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -210,7 +210,7 @@
               <NameInput
                 placeholder="请输入路径名称"
                 v-model:value="pathName"
-                v-model:validate="validate"
+                v-model:validated="validated"
                 :maxlength="20"
                 show-count
                 :type="3"
@@ -285,7 +285,7 @@
             <a-button
               class="samtn btn2"
               @click="createLearnPath"
-              :loading="confirmLoading"
+              :loading="confirmLoading || validated === 1"
               >确定</a-button
             >
           </div>
@@ -780,6 +780,7 @@ export default {
       selectTime: null,
       sh: false,
       validate: true,
+      validated: 0,
       tableData: [
         // {
         //   key: 1,
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 090b1751..a2a87d26 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -2,8 +2,9 @@
 <template xmlns:display="http://www.w3.org/1999/xhtml">
   <div class="projectAdd">
     <div class="header">
-      <span class="title">{{ projectInfo.id ? "编辑" : "创建"
-      }}{{ ptojectType == "3" ? "班级" : "项目" }}</span>
+      <span class="title">{{
+          projectInfo.id ? "编辑" : "创建"
+        }}{{ ptojectType == "3" ? "班级" : "项目" }}</span>
       <div @click="backPage" style="cursor: pointer" to="/projectmanage" class="goback">
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -12,7 +13,7 @@
       <div class="main">
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
@@ -23,19 +24,20 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">
               {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
             </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate"
-              :maxlength="30" show-count :id="projectInfo.id"></NameInput>
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
+                       v-model:validated="projectInfo.validated" :type="1"
+                       :maxlength="30" show-count :id="projectInfo.id"></NameInput>
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
@@ -54,7 +56,7 @@
                     height: 100px;
                     margin-bottom: 4px;
                     margin-right: 4px;
-                  " :src="src.value" alt="avatar" />
+                  " :src="src.value" alt="avatar"/>
             </div>
             <div @click="showLearnBgMore" v-if="projectPic.length > 3" style="
                   width: 100px;
@@ -74,47 +76,49 @@
                   line-height: 36px;
                 ">
               查看更多
-              <img src="../../assets/images/projectadd/go.png" alt="" />
+              <img src="../../assets/images/projectadd/go.png" alt=""/>
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
-            <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }" :placeholder="['      开始时间', '        结束时间']"
-              :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
-              style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false" format="YYYY-MM-DD HH:mm"
-              valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail" />
+            <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }"
+                            :placeholder="['      开始时间', '        结束时间']"
+                            :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
+                            style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false"
+                            format="YYYY-MM-DD HH:mm"
+                            valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail"/>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
-              @onChange="managerChange" mode="multiple"></ProjectManager>
+                            @onChange="managerChange" mode="multiple"></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"
-              v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
+                      v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">项目级别</div>
           </div>
           <div class="in select">
@@ -123,7 +127,7 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">培训分类</div>
           </div>
           <div class="in select">
@@ -132,7 +136,7 @@
         </div>
         <div class="name">
           <div class="namebox">
-            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
+            <img class="nameimg" src="../../assets/images/basicinfo/asterisk.png"/>
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
@@ -177,7 +181,7 @@
           </div>
           <div class="in">
             <a-textarea v-model:value="projectInfo.remark" style="height: 80px" placeholder="请输入说明" show-count
-              :maxlength="200" :disabled="viewDetail ? true : false" />
+                        :maxlength="200" :disabled="viewDetail ? true : false"/>
           </div>
         </div>
 
@@ -197,7 +201,7 @@
             <a-select :getPopupContainer="
               (triggerNode) => triggerNode.parentNode || document.body
             " placeholder="请选择模版" style="width: 100%" :options="classifyList5" @change="classificationChange5"
-              @popupScroll="templateScroll" :fieldNames="{
+                      @popupScroll="templateScroll" :fieldNames="{
                 label: 'name',
                 value: 'id',
               }">
@@ -215,18 +219,18 @@
     </div>
     <!-- 更多背景图 v-model:visible="learnBgMore"  -->
     <a-modal :closable="sh" centered="true" v-model:visible="learnBgMore" :footer="null" :width="650"
-      wrapClassName="learnBgMoreModal" :z-index="9999">
+             wrapClassName="learnBgMoreModal" :z-index="9999">
       <div class="main">
         <div class="top">
           <div class="topc">封面图</div>
         </div>
         <div class="imagesBox">
-        <!-- <div
-                  @click="() => (projectInfo.picUrl = src.value)"
-                  v-for="item in projectPic"
-                  :key="item.code"
-                  class="learnBgItem"
-            > -->
+          <!-- <div
+                    @click="() => (projectInfo.picUrl = src.value)"
+                    v-for="item in projectPic"
+                    :key="item.code"
+                    class="learnBgItem"
+              > -->
           <div @click="chooseImg2(item)" v-for="item in projectPic" :key="item.code" class="learnBgItem" :style="{
             border:
               projectInfo.picUrl === item.value
@@ -239,27 +243,27 @@
         </div>
         <div class="btn">
           <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
-          <button class="samtn btn2" @click="closeLearnBgMore">确定</button>
+          <a-button class="samtn btn2" @click="closeLearnBgMore" :loading="projectInfo.validated===1">确定</a-button>
         </div>
       </div>
     </a-modal>
   </div>
 </template>
 <script>
-import { onMounted, reactive, toRefs, watch } from "vue";
-import { message } from "ant-design-vue";
-import { useRoute, useRouter } from "vue-router";
+import {onMounted, reactive, toRefs, watch} from "vue";
+import {message} from "ant-design-vue";
+import {useRoute, useRouter} from "vue-router";
 import * as api from "../../api/index";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import * as api2 from "../../api/indexAudit";
-import { validateName } from "@/api/index1";
+import {validateName} from "@/api/index1";
 import dayjs from "dayjs";
-import { scrollLoad } from "@/api/method";
+import {scrollLoad} from "@/api/method";
 
 export default {
   name: "projectAdd",
@@ -283,7 +287,7 @@ export default {
       pageSize: 10, //每页10条数据
       totalPages: 0, //总页数
       viewDetail: null,
-      projectInfo: { id: "" },
+      projectInfo: { id: "", validated: 0 },
       projectPic: [],
       memberParam: {
         pageNo: 1,
@@ -330,43 +334,43 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.id = routers.query.projectId;
       (state.projectInfo.id || state.projectInfo.parentId) &&
-        api
-          .getProjectDetail({
-            projectId: state.projectInfo.id || state.projectInfo.parentId,
-          })
-          .then((res) => {
-            state.projectInfo = {
-              ...res.data.data.projectInfo,
-              ...state.projectInfo,
+      api
+        .getProjectDetail({
+          projectId: state.projectInfo.id || state.projectInfo.parentId,
+        })
+        .then((res) => {
+          state.projectInfo = {
+            ...res.data.data.projectInfo,
+            ...state.projectInfo,
+          };
+          !routers.query.projectId &&
+          !!routers.query.parentId &&
+          (state.projectInfo.name = "");
+          state.timeRange = [
+            state.projectInfo.beginTime,
+            state.projectInfo.endTime,
+          ];
+          state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+          if (Number(state.projectInfo.status) === -5) {
+            let obj = {
+              project_id: state.projectInfo.id,
+              type: 1,
+              pageNo: 1,
+              pageSize: 1,
             };
-            !routers.query.projectId &&
-              !!routers.query.parentId &&
-              (state.projectInfo.name = "");
-            state.timeRange = [
-              state.projectInfo.beginTime,
-              state.projectInfo.endTime,
-            ];
-            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
-            if (Number(state.projectInfo.status) === -5) {
-              let obj = {
-                project_id: state.projectInfo.id,
-                type: 1,
-                pageNo: 1,
-                pageSize: 1,
-              };
-              api2.auditList(obj).then((d) => {
-                if (d.data.code === 200) {
-                  let res = d.data.data;
-                  if (res.rows && res.rows.length > 0) {
-                    let i = res.rows.length;
-                    state.auditDescription = res.rows[i - 1].description
-                      ? res.rows[i - 1].description
-                      : "-";
-                  }
+            api2.auditList(obj).then((d) => {
+              if (d.data.code === 200) {
+                let res = d.data.data;
+                if (res.rows && res.rows.length > 0) {
+                  let i = res.rows.length;
+                  state.auditDescription = res.rows[i - 1].description
+                    ? res.rows[i - 1].description
+                    : "-";
                 }
-              });
-            }
-          });
+              }
+            });
+          }
+        });
     }
 
     const backPage = () => {
@@ -453,7 +457,7 @@ export default {
       /**
        if (!state.projectInfo.validate) {
         message.destroy();
-        message.warning('项目名称重复，请修改名称！');
+        message.warning("项目名称重复，请修改名称！");
         return;
       }*/
       const offName = await validateName({
@@ -508,9 +512,11 @@ export default {
     const closeLearnBgMore = () => {
       state.learnBgMore = false;
     };
+
     function calendarChange(date, dateStr, partial) {
       state.datePartial = partial;
     }
+
     const chooseImg2 = (item) => {
       // console.log(item);
       state.projectInfo.picUrl = item.value;
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 8cc62e43..e2d1632d 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -304,7 +304,8 @@
               <NameInput
                 placeholder="请输入项目名称"
                 v-model:value="projectInfo.name"
-                v-model:validate="projectInfo.validate"
+                v-model:validated="projectInfo.validated"
+                :type="1"
                 :maxlength="30"
                 show-count
                 :id="projectInfo.projectId"
@@ -358,7 +359,7 @@
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="createStoreyProject"
+            <a-button class="pubtn2" @click="createStoreyProject" :loading="projectInfo.validated===1"
               >确定
             </a-button>
           </div>

From cddfa6efde87ed950d73a9e8852181ede86afa4d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 28 Feb 2023 21:01:58 +0800
Subject: [PATCH 4/6] =?UTF-8?q?--=20fix=20=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectManage.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index e2d1632d..ad1f355d 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -359,7 +359,7 @@
           </div>
           <div class="pubtn">
             <a-button class="pubtn1" @click="closeModal2">取消</a-button>
-            <a-button class="pubtn2" @click="createStoreyProject" :loading="projectInfo.validated===1"
+            <a-button class="pubtn2" @click="createStoreyProject" :loading="buttonLoading || projectInfo.validated===1"
               >确定
             </a-button>
           </div>
@@ -974,6 +974,7 @@ export default {
   setup() {
     const state = reactive({
       tableLoading: false,
+      buttonLoading: false,
       projectName: null,
       selectTime: null,
       sonproject: false,
@@ -1083,6 +1084,7 @@ export default {
 
     // 创建多层项目
     const createStoreyProject = async () => {
+      state.buttonLoading = true
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
@@ -1091,6 +1093,7 @@ export default {
         sourceBelongId: "请选择资源归属",
       };
       if (!validate(state.projectInfo, errorMsgs)) {
+        state.buttonLoading = false
         return;
       }
       /**
@@ -1107,6 +1110,7 @@ export default {
         return res.data.data == 1;
       });
       if (offName) {
+        state.buttonLoading = false
         message.destroy();
         return message.warning("项目名称重复，请重新填写");
       }
@@ -1115,6 +1119,7 @@ export default {
         message.destroy();
         message.success("创建成功");
         state.currentPage = 1;
+        state.buttonLoading = false
         getTableDate();
       });
     };

From fd19d93ef0772174839f72038c88f472c335c870 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Tue, 28 Feb 2023 23:14:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/student/CommonStudent.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index 381fe1f0..d19306c3 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -393,6 +393,7 @@ const getStu = () => {
     type: props.type
   };
   projectListTotal.value = -1;
+  debugger
   console.log("获取项目学员", obj);
   getStuPage(obj).then((res) => {
     console.log("获取项目学员", res);
@@ -401,8 +402,9 @@ const getStu = () => {
     arr.map((value) => {
       let obj = {
         id: value.id,
+        studentId: value.studentId,
         realName: value.studentName,
-        userNo: value.studentId,
+        userNo: value.studentUserNo,
         isLeader: value.isLeader,
         groupId: value.groupId,
         orgName: value.studentOrgName ? value.studentOrgName : "-",
@@ -792,7 +794,7 @@ function handleDialogOk() {
 }
 
 function handleStageOk() {
-  // debugger
+   debugger
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
     if (props.groupMemberCount !== null) {  // 只有添加组员的时候判断
@@ -804,21 +806,26 @@ function handleStageOk() {
         if (haveGroupNum.length > 0) {
           message.warning("部分学员已经有小组，再次添加会被添加到当前小组.");
         }
+        // 判断是否是组长，组长不能添加
+        const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
+        if (leaderArray.length > 0) {
+          return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
+        }
       } else if (activeKey.value === 1) {
         selectMember = selectsData.value.studentList.length;
+
+
       } else if (activeKey.value === 2) {
         selectMember = selectsData.value.groupList.length;
       } else if (activeKey.value === 3) {
         selectMember = selectsData.value.deptList.length;
       }
+
+
       if (props.groupMemberCount < selectMember + Number(props.groupMemberNumber)) {
         return message.warning("添加小组学员超过最大值");
       }
-      // 判断是否是组长，组长不能添加
-      const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === "1");
-      if (leaderArray.length > 0) {
-        return message.warning("当前选中学员" + leaderArray[0].realName + "已是小组长，请勿重复选择。");
-      }
+
 
     }
   }
@@ -826,6 +833,7 @@ function handleStageOk() {
   visiable.value = false;
   emit("finash", false);
   nameSearch.value.keyword = "";
+  debugger
   saveStu({
     targetId: props.id,
     type: props.type,

From 92b4284ae9564929dc2cb62956be861ca8c36f94 Mon Sep 17 00:00:00 2001
From: lpq <lpq@ultron-soft.com>
Date: Tue, 28 Feb 2023 23:33:26 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/MemberList.vue    | 1 -
 src/components/student/CommonStudent.vue | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue
index 312ba0d7..e2049235 100644
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -358,7 +358,6 @@ export default {
     };
     //把数据放到state里
     const getTableDataList = (tableData) => {
-      debugger
       let data = tableData;
       let array = [];
       data.map((value) => {
diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue
index d19306c3..40f38e6d 100644
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -393,7 +393,6 @@ const getStu = () => {
     type: props.type
   };
   projectListTotal.value = -1;
-  debugger
   console.log("获取项目学员", obj);
   getStuPage(obj).then((res) => {
     console.log("获取项目学员", res);
@@ -794,7 +793,6 @@ function handleDialogOk() {
 }
 
 function handleStageOk() {
-   debugger
   // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人
   if (props.type === 1) {
     if (props.groupMemberCount !== null) {  // 只有添加组员的时候判断
@@ -833,7 +831,6 @@ function handleStageOk() {
   visiable.value = false;
   emit("finash", false);
   nameSearch.value.keyword = "";
-  debugger
   saveStu({
     targetId: props.id,
     type: props.type,