Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/project/NameInput.vue

src/App.vue

@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.17------------");
+    console.log("版本0.9.18------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/api/request.js

@@ -138,7 +138,7 @@ export async function request(_url, params) {
         }
     }
     const body = method !== 'get' ? params || {} : {}
-    // url = process.env.VUE_APP_BOE_API_URL + url
+    url = process.env.VUE_APP_BOE_API_URL + url
     return fetch(url, {
         method,
         headers: {

src/components/drawers/NoticeHis.vue

@@ -12,9 +12,9 @@
       <div class="itemtime">{{ item.pubtime }}</div>
     </div>
   </div>
-</template>s
+</template>
 <script>
-import { reactive, toRefs, onMounted } from "vue";
+import { reactive, toRefs, onMounted, watch } from "vue";
 import { getTask } from "../../api/indexTaskadd";
 import { noticeList } from "../../api/indexNotice";
 import emitter from "../../utils/bus";
@@ -26,6 +26,10 @@ export default {
       type: Number,
       default: null,
     },
+    show: {
+      type: String,
+      default: null,
+    },
   },
 
   setup(props) {
@@ -89,6 +93,19 @@ export default {
       getTaskInfo();
       getNotice();
     });
+    watch(
+      () => props.show,
+      () => {
+        console.log("props.show", props.show);
+        if (props.show == 12) {
+          getTaskInfo();
+          getNotice();
+        }
+      },
+      {
+        deep: true,
+      }
+    );
     return {
       ...toRefs(state),
       getTaskInfo,

src/components/drawers/NoticePub.vue

@@ -4,11 +4,11 @@
   <div class="noticeTitle">
     <!-- <div class="notitle"><span class="titlespan">公告</span></div> -->
     <div class="switch">
-      <a-switch v-model:checked="noticeChecked" @click="noticeFlag"  size="small" /><span
+      <a-switch
-        style="margin-left: 16px"
+        v-model:checked="noticeChecked"
-      >
+        @click="noticeFlag"
-        开启
+        size="small"
-      </span>
+      /><span style="margin-left: 16px"> 开启 </span>
     </div>
     <template v-if="noticeChecked">
       <p>当前公告内容：</p>
@@ -23,10 +23,8 @@
       </template>
       <!-- 编辑 -->
       <template v-if="editOn">
-      
+        <div class="txt-content">
-          <div class="txt-content">
+          {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-            {{ noticeContent1 ? noticeContent1 : "暂无公告" }}
-        
         </div>
         <p>编辑新公告：</p>
         <a-textarea
@@ -74,29 +72,30 @@ export default {
         state.projectInfo = res.data.data.projectInfo;
         state.noticeContent1 = state.projectInfo.notice;
         state.noticeContent = state.projectInfo.notice;
-        state.noticeChecked = state.projectInfo.noticeFlag==0?false:true;
+        state.noticeChecked = state.projectInfo.noticeFlag == 0 ? false : true;
       });
-      console.log("state.noticeChecked",state.noticeChecked);
+      console.log("state.noticeChecked", state.noticeChecked);
     };
 
     const handleEdit = () => {
       state.editOn = true;
     };
     const handleCancel = () => {
-      
       state.editOn = false;
     };
-    const noticeFlag =()=>{
+    const noticeFlag = () => {
       //state.noticeChecked = !state.noticeChecked;
-      console.log("111",state.projectInfo);
+      console.log("111", state.projectInfo);
-      state.projectInfo.noticeFlag = state.noticeChecked?1:0;
+      state.projectInfo.noticeFlag = state.noticeChecked ? 1 : 0;
-      editProj(state.projectInfo).then((res)=>{
+      editProj(state.projectInfo)
-        console.log("res",res.data.data.projectInfo);
+        .then((res) => {
-      }).catch((error)=>{
+          console.log("res5555555555", res);
-        console.log(error);
+        })
-      });
+        .catch((error) => {
-      console.log("222",state.projectInfo);
+          console.log(error);
-    }
+        });
+      console.log("222", state.projectInfo);
+    };
     const pubNotice = () => {
       if (state.noticeContent == "") {
         message.destroy();
@@ -107,15 +106,22 @@ export default {
           projectId: props.projectId,
           title: "",
         };
-        publishNotice(obj);//加入历史
+        publishNotice(obj); //加入历史
-        state.projectInfo.notice =state.noticeContent;
+        state.projectInfo.notice = state.noticeContent;
-        editProj(state.projectInfo).then((res) => {
+        console.log("222444444", state.projectInfo);
+        state.noticeContent1 =
+          state.noticeContent == "" ? "暂无公告" : state.noticeContent;
+        message.success("发布成功");
+        handleCancel();
+        editProj(state.projectInfo)
+          .then((res) => {
             // console.log("res");
             // console.log(res);
             if (res.data.code === 200) {
               message.destroy();
-              message.success("发布成功", res);
+              // message.success("发布成功");
-              state.noticeContent1 = res.data.data.notice==""?"暂无公告":res.data.data.notice;
+              state.noticeContent1 =
+                res.data.data.notice == "" ? "暂无公告" : res.data.data.notice;
               handleCancel();
               emitter.emit("setNotice", false);
             }
@@ -125,8 +131,6 @@ export default {
             message.warning("发布失败");
             console.log(err);
           });
-    
-       
       }
     };
     onMounted(() => {

src/components/student/TableStudent.vue

@@ -209,6 +209,7 @@ function changePagination(page) {
 function getStuList() {
   tableData.value.loading = true;
   getStuPage(tableParam.value).then((res) => {
+    console.log("学员管理-获取学员", res.data);
     tableData.value.total = res.data.data.total;
     tableData.value.list = res.data.data.records;
     tableData.value.loading = false;

src/views/projectcenter/TaskPage.vue

@@ -708,7 +708,10 @@
               <NoticePub v-model:projectId="projectId"></NoticePub>
             </a-tab-pane>
             <a-tab-pane key="12" tab="历史公告" force-render>
-              <NoticeHis v-model:projectId="projectId"></NoticeHis>
+              <NoticeHis
+                v-model:projectId="projectId"
+                :show="activeKeyNotice"
+              ></NoticeHis>
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>

src/views/research/ResearchManage.vue

@@ -107,9 +107,10 @@
                 style="border-radius: 8px"
               /> -->
               <NameInput
-                placeholder="请输入路径名称"
+                placeholder="请输入评估名称"
                 v-model:value="assessmentName"
                 v-model:validate="validate"
+                v-model:finished="finished"
                 :maxlength="15"
                 show-count
                 :type="4"
@@ -311,7 +312,7 @@ export default {
       copy_hs: false,
       back_hs: false,
       pub_hs: false,
-
+      finished:false,
       validate: true,
     });
     const tableDataFunc = () => {
@@ -436,7 +437,7 @@ export default {
           number: "assessmentId",
           manager: "assessmentName",
           state: "releaseStatus",
-          creater: "createUser",
+          creater: "createUserName",
           pubtime: "releaseTime",
           cretime: "createTime",
           haspub: "assessmentId",
@@ -595,11 +596,14 @@ export default {
           message.error("请输入评估名称");
           return false;
         }
-        if (!state.validate) {
+        if (!state.finished) {
-          message.destroy();
+        return;
-          message.warning("评估名称重复");
+      }
-          return;
+
-        }
+      if (!state.validate && state.finished) {
+        message.destroy();
+        return message.warning("该评估名称已存在");
+      }
         store.commit("SET_assessmentName", state.assessmentName);
         router.push("/researchadd");
         handleCancel();