Merge remote-tracking branch 'origin/manage-release' into release

src/api/indexProjStu.js

@@ -29,6 +29,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess',
 
 //是否优秀学员
 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
+export const updateStudent = (obj) => http.post('/admin/student/updateStudent', obj)
 
 //项目概览
 export const overview = (obj) => http.get('/admin/project/overview', { params: obj })

src/components/drawers/AddHomework.vue

@@ -264,7 +264,7 @@ export default {
 				workEnclosureAddress: state.attach
 					? state.attach
 					: "",
-				workId: props.edit ? props.EditWorkId : 0,
+				workId: props.EditWorkId >0 ? props.EditWorkId:0 ,
 				workName: state.name,
 				workRequirement: state.workRequirement,
 			};

src/components/drawers/AddTest.vue

@@ -540,8 +540,10 @@ export default {
       //考试推送
         state.test.targetId = 0;
           state.test.type = 0;
+          state.test.chapterId=0;
         if(props.isLevel == 1){
           state.test.targetId = props.routerId;
+          state.test.chapterId = props.isactive;
           state.test.type = 2;
 
       } else if (props.isLevel == 2) {

src/components/drawers/ProjectAudit.vue

@@ -39,7 +39,7 @@
                 <div class="set_content">
                   <div class="setc_name"><span>资源归属：</span></div>
                   <div class="setc_main">
-                    <span style="color: #999999">{{ projectInfo.sourceBelongName }}</span>
+                    <span style="color: #999999">{{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}</span>
                   </div>
                 </div>
                 <div class="set_content">

src/components/drawers/SeeStu.vue

@@ -15,7 +15,8 @@
           @click="closeDrawer"
         />
       </div>
-      <div class="main">
+      <a-spin v-if="loading" :spinning="loading"/>
+      <div v-if="!loading" class="main">
         <div class="stuinfor">
           <div class="portrait">
             <img src="../../assets/images/studentimg/character.png" />
@@ -176,6 +177,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      loading:false,
       userName: null, //用户名
       deptName: null, //部门
       jobName: null, //岗位
@@ -302,11 +304,13 @@ export default {
       state.stageList = array;
     };
     const check = () => {
+      state.loading = true
       let obj = {
-        projectId: 37,
+        projectId: props.projectId,
-        studentId: 3,
+        studentId: props.checkStuId,
       };
       studentProcess(obj).then((res) => {
+        state.loading = false
         console.log("查看了学员", res.data.data);
         let result = res.data.data;
         state.userName = result.userInfoBo.userName;

src/components/project/OrgClass.vue

@@ -43,9 +43,9 @@ const id = computed(() => {
   return props.value
 })
 
-function change(key, obj) {
+function change(key, obj, {triggerNode: {props: {namePath}}}) {
-  console.log(obj[0], key, props.value);
   emit('update:name', obj[0])
+  emit('update:fullName', namePath)
   emit('update:value', key)
 }
 

src/components/project/ProjectManagerNew.vue

@@ -107,7 +107,7 @@ function change(e, l) {
   memberParam.value.page = 1
   isOpen.value = false
   Array.isArray(l) && (selectOptions.value = l)
-  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName)
+  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName)
   if (Array.isArray(l)) {
     emit('update:name', l.map(t => t.label).join(','))
     emit('update:value', l.map(t => t.value).join(','))

src/components/student/TableStudent.vue

@@ -46,7 +46,7 @@
       <a-table :columns="tablecolumns" :data-source="tableData.list" :pagination="stuPagination"
                :loading="tableData.loading" row-key="id" :row-selection="stuRowSelection">
         <template #action="{ record }">
-					<div style="display:flex;justify-content: center;align-items: center;">
+          <!--					<div style="display:flex;justify-content: center;align-items: center;">-->
           <!-- <div v-if="props.type == 1" @click="excellentStudent(record)"
             style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
             优秀学员
@@ -61,30 +61,18 @@
             style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
             调整
           </div> -->
-
+          <!--					</div>-->
-						<div @click="del(record.id)"
+          <a-row gutter="12">
-							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>
             </a-col>
             <a-col>
-              <a-select style="width: 80px" value="更多">
+              <div @click="del(record.id)"
-                <a-select-option value="删除" label="删除">
+                   style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;">
-                  <div @click="del(record.id)">删除</div>
-                </a-select-option>
-              </a-select>
-              <div
-                @click="del(record.id)"
-                style="color: #4ea6ff; font-size: 14px; text-align: center"
-              >
                 删除
               </div>
             </a-col>
-          </a-row> -->
+          </a-row>
         </template>
       </a-table>
     </div>
@@ -155,6 +143,7 @@ import ChangeLevelModal from "./ChangeLevelModal.vue";
 import {message} from "ant-design-vue";
 // import { topStudent } from "../../api/indexProjStu";
 import SeeStu from "../../components/drawers/SeeStu";
+
 const props = defineProps({
   type: Number,
   id: String,
@@ -179,6 +168,21 @@ const tablecolumns = ref([
     width: "8%",
     align: "left",
     className: "h",
+    customRender: ({record: {studentName, topFlag}}) => (topFlag ? <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+        }}
+    >
+      <span className="stydentName">{studentName}</span>
+      <div className="studentExcellent">
+        <img
+            className="studentExcellentImg"
+            src={require("../../assets/images/taskpage/excellent.png")}
+        />
+        <span className="studentExcellentT">优秀</span>
+      </div>
+    </div> : <div>{studentName}</div>)
   },
   {
     title: "工号",
@@ -205,7 +209,7 @@ const tablecolumns = ref([
     width: 100,
     align: "center",
     customRender: ({record: {source}}) =>
-			({ 1: "快速添加", 2: "组织", 3: "受众" }[source]),
+        ({1: "快速添加", 2: "组织", 3: "受众", 4: '报名'}[source]),
   },
   ...props.columns,
   {
@@ -344,6 +348,7 @@ const canclestu1 = ref(false)
 function cancelyou() {
   canclestu.value = false;
 }
+
 // 优秀学员-设置优秀学员
 function closeModal1() {
   canclestu.value = false;
@@ -356,6 +361,7 @@ function closeModal1() {
 function cancelcanyou() {
   canclestu1.value = false;
 }
+
 // 取消优秀学员-取消优秀学员
 function closeModal3() {
   canclestu1.value = false;
@@ -381,7 +387,37 @@ const projectId = ref(null)
 // }
 
 </script>
-<style>
+<style lang="scss">
+.stydentName {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.studentExcellent {
+  width: 64px;
+  height: 24px;
+  border-radius: 2px;
+  border: 1px solid #ffb64e;
+  background-color: rgba(255, 182, 78, 0.1);
+  margin-left: 24px;
+  display: flex;
+  align-items: center;
+
+  .studentExcellentImg {
+    width: 16px;
+    height: 16px;
+    margin-left: 7px;
+  }
+
+  .studentExcellentT {
+    font-size: 12px;
+    font-weight: 400;
+    color: #ffb64e;
+    line-height: 17px;
+    margin-left: 3px;
+  }
+}
+
 .studentopea1 {
   font-size: 14px;
   font-weight: 400;
@@ -645,5 +681,6 @@ const projectId = ref(null)
 .canclestu > .ant-modal {
   width: 424px !important;
   height: 258px !important;
-} */
+}
+ */
 </style>

src/views/courselibrary/CoursewareManage.vue

@@ -10,7 +10,8 @@
                      placeholder="请输入创建人"/>
           </div>
           <div class="pathnameInp">
-						<a-input v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入名称" />
+            <a-input v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px"
+                     placeholder="请输入名称"/>
           </div>
           <div class="pathnameInp">
             <a-input v-model:value="projectName" style="width: 200px; height: 40px; border-radius: 8px"
@@ -36,7 +37,8 @@
 								return triggerNode.parentNode || document.body;
 							}
 						" v-model:value="categoryId" show-search style="width: 200px"
-							:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" allow-clear
+                           :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类"
+                           allow-clear
                            tree-default-expand-all :tree-data="options2222">
               <template #title="{ value: val, title }">
                 <b v-if="val === '11111'" style="color: #08c">sss</b>
@@ -97,7 +99,8 @@
                 <span style="margin-right: 3px">课程名称：</span>
               </div>
               <div class="in b_input">
-								<NameInput placeholder="请输入课程名称" v-model:value="xzinputV1" v-model:validate="validate" :maxlength="20"
+                <NameInput placeholder="请输入课程名称" v-model:value="xzinputV1" v-model:validate="validate"
+                           :maxlength="20"
                            show-count :type="2"></NameInput>
                 <!--                <a-input-->
                 <!--                  v-model:value="xzinputV1"-->
@@ -1079,7 +1082,8 @@
               <div class="tableBox" style="margin-top: 50px">
                 <div class="pa">
                   <a-pagination :showSizeChanger="false" showQuickJumper="true" hideOnSinglePage="true"
-										:pageSize="pageSize2" :current="currentPage2" :total="tableDataTotal2" class="pagination"
+                                :pageSize="pageSize2" :current="currentPage2" :total="tableDataTotal2"
+                                class="pagination"
                                 @change="handelChangePage2"/>
                 </div>
               </div>
@@ -1141,7 +1145,8 @@
             <div class="select fitems">
               <a-range-picker style="width: 440px; height: 40px; border-radius: 8px" :show-time="{ format: 'HH:mm' }"
                               :disabled-date="disabledDate" :disabled-time="disabledRangeTime" format="YYYY-MM-DD HH:mm"
-								v-model:value="xjkkinputV3" separator="至" :placeholder="['        开始时间', '        结束时间']" />
+                              v-model:value="xjkkinputV3" separator="至"
+                              :placeholder="['        开始时间', '        结束时间']"/>
             </div>
           </div>
           <div class="cstm_items">
@@ -1329,11 +1334,40 @@
               </div>
               <div class="stmm_i5">
                 <TableStudent :type="3" :id="offcoursePlanId" :columns="stuColumns" :visable="sm_hs">
-									<!--                  <template #extension = "data">-->
+                  <template #extension="{data:{record}}">
-									<!--                    <div style="display: flex">-->
+                    <div style="display:flex">
-									<!--                      <button @click="handlJoinStu(data)">成绩录入</button>-->
+                      <div
-									<!--                    </div>-->
+                          v-if="record.source===4 && record.status ===1"
-									<!--                  </template>-->
+                          @click="()=>{
+                            record.status = 0
+                            auditStudent(record)
+                          }"
+                          style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
+                      >
+                        审核通过
+                      </div>
+                      <div
+                          v-if="record.source===4 && record.status ===1"
+                          @click="()=>{
+                            record.status = 2
+                            auditStudent(record)
+                          }"
+                          style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
+                      >
+                        拒绝
+                      </div>
+                      <div
+                          v-if="record.source===4 && (record.status ===0 || record.status ===2)"
+                          @click="()=>{
+                            record.status = 1
+                            auditStudent(record)
+                          }"
+                          style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
+                      >
+                        撤回
+                      </div>
+                    </div>
+                  </template>
                 </TableStudent>
               </div>
               <div class="tableBox" style="margin-top: 20px">
@@ -1820,6 +1854,7 @@ import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
 import TableStudent from "@/components/student/TableStudent";
 import FJUpload from "@/components/common/FJUpload";
+import {updateStudent} from "@/api/indexProjStu";
 //列表表格
 const columns1 = [
   // {
@@ -4741,11 +4776,14 @@ export default defineComponent({
         disabledSeconds: () => [55, 56],
       };
     };
+    function auditStudent(record){
+      updateStudent(record)
+    }
 
     return {
       ...toRefs(state),
       CourseModalRef,
-
+      auditStudent,
       getdateToDateFn,
       moment,
       disabledDate,
@@ -7110,8 +7148,6 @@ export default defineComponent({
                 justify-content: space-between;
 
 
-
-
               }
 
               .stmm_i6 {
@@ -7449,7 +7485,6 @@ export default defineComponent({
 }
 
 
-
 // .tableSelect {
 //   position: relative;
 //   .hoverList {

src/views/courselibrary/components/seeModal.vue

@@ -76,13 +76,13 @@
 									</div>
 								</div>
 							</div>
-							<div class="mbl_items" v-if="detail.sceneId">
+							<div class="mbl_items" v-if="detail.sceneContent">
 								<div class="item_nam">
 									<span style="margin-right: 14px">场景：</span>
 								</div>
 								<div class="item_inp">
 									<div class="select i7_input">
-										{{ filterSenceTxt(detail.sceneId) }}
+										{{ detail.sceneContent }}
 									</div>
 								</div>
 							</div>

src/views/courselibrary/courseModal.vue

@@ -193,12 +193,22 @@
 								</div>
 							</div>
 
-			<!--				
 							<div class="mbl_items">
 								<div class="item_nam">
 									<span style="margin-right: 14px">场景</span>
 								</div>
 								<div class="item_inp">
+									<div class="i1_input">
+										<a-input v-model:value="chang_jin" maxlength="50"
+											style="width: 440px; height: 40px; border-radius: 8px" placeholder="请输入场景" />
+										<div class="inp_num">
+											<span style="color: #c7cbd2">
+												{{ chang_jin.length }}/50
+											</span>
+										</div>
+									</div>
+								</div>
+								<!-- <div class="item_inp">
 									<div class="select i7_input">
 										<a-select :getPopupContainer="
 	(triggerNode) => {
@@ -207,10 +217,8 @@
 " v-model:value="chang_jin" dropdownClassName="dropdown-style" style="width: 440px" placeholder="请选择"
 											:options="options3" allowClear showSearch />
 									</div>
+								</div> -->
 							</div>
-							</div>
-
--->
 
 							<div class="mbl_items">
 								<div class="item_nam">
@@ -359,7 +367,7 @@ export default defineComponent({
 			fen_lei: null,
 			fen_lei1: null,
 			feng_mian_1: null,
-			chang_jin: null,
+			chang_jin: "",
 			tags_val_single: "",
 			tags_val: [],
 			qdms_inputV6: "",
@@ -564,7 +572,7 @@ export default defineComponent({
 			state.fen_lei = null;
 			state.fen_lei1 = null;
 			state.feng_mian_1 = null;
-			state.chang_jin = null;
+			state.chang_jin = "";
 			state.tags_val_single = "";
 			state.tags_val = [];
 			state.qdms_inputV6 = "";
@@ -751,7 +759,7 @@ export default defineComponent({
 				targetUser: state.qdms_inputV2,
 				meaning: state.qdms_inputV3,
 				categoryId: state.fen_lei,
-				sceneId: state.chang_jin,
+				sceneContent: state.chang_jin,
 				tips: state.tags_val ? state.tags_val.join(",") : null,
 				teacherId: state.member.value,
 				teacher: state.member.name,
@@ -841,7 +849,7 @@ export default defineComponent({
 			state.qdms_inputV3 = item.meaning;
 			state.fen_lei = String(item.categoryId);
 			state.fen_lei1 = changeTreeSelectValue(String(item.categoryId));
-			state.chang_jin = String(item.sceneId);
+			state.chang_jin = String(item.sceneContent ? item.sceneContent : '');
 			state.tags_val = item.tips ? item.tips.split(",") : [];
 			state.qdms_inputV6 = item.intro;
 			state.member = { value: item.teacherId, name: item.teacher };

src/views/projectcenter/LibraryAdd.vue

@@ -536,7 +536,7 @@
                     <div class="setc_name"><span>资源归属：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999">{{
-                        projectInfo.sourceBelongName
+                          (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName
                       }}</span>
                     </div>
                   </div>

src/views/projectcenter/ProjectAdd.vue

@@ -3,7 +3,8 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-        >{{ projectInfo.projectId ? "编辑" : "创建"
+      >{{
+          projectInfo.projectId ? "编辑" : "创建"
         }}{{ ptojectType == "3" ? "班级" : "项目" }}</span
       >
       <div
@@ -141,6 +142,7 @@
             <OrgClass
                 v-model:value="projectInfo.sourceBelongId"
                 v-model:name="projectInfo.sourceBelongName"
+                v-model:fullName="projectInfo.sourceBelongFullName"
             ></OrgClass>
           </div>
         </div>
@@ -504,10 +506,12 @@ export default {
       });
     };
 
-    function managerChange(e, l, d, t) {
+    function managerChange(e, l, d, t, orgName) {
       state.projectInfo.sourceBelongId = d
       state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongFullName = orgName
     }
+
     const disabledDate = (current) => {
       return current && current < dayjs().startOf('day');
     };

src/views/projectcenter/ProjectManage.vue

@@ -231,6 +231,7 @@
               <OrgClass
                   v-model:value="projectInfo.sourceBelongId"
                   v-model:name="projectInfo.sourceBelongName"
+                  v-model:fullName="projectInfo.sourceBelongFullName"
               ></OrgClass>
             </div>
           </div>
@@ -1229,22 +1230,13 @@ export default {
     };
     //确认复制
     const copyProject = () => {
-      let obj = {
+      state.tableLoading = true
+      api.handleProject({
         projectId: state.copyProjectId,
         type: 2,
-      };
+      }).then(() => getTableDate())
-      api
-          .handleProject(obj)
-          .then((res) => {
-            console.log("复制成功", res);
-            message.destroy();
       message.success("复制成功");
       state.copyModal = false;
-            getTableDate();
-          })
-          .catch((err) => {
-            console.log("复制失败", err);
-          });
     };
     //打开提交审核弹窗
     const showReviewModal = (projectId) => {
@@ -1803,9 +1795,10 @@ export default {
         }
     );
 
-    function managerChange(e, l, d, t) {
+    function managerChange(e, l, d, t,orgName) {
       state.projectInfo.sourceBelongId = d
       state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongFullName = orgName
     }
 
     return {

src/views/projectcenter/SonProject.vue

@@ -83,7 +83,7 @@
 					</div>
 
 					<div class="in select">
-						<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass>
+						<OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName" v-model:fullName="projectInfo.sourceBelongFullName"></OrgClass>
 					</div>
 				</div>
 				<div class="name">
@@ -313,9 +313,10 @@ export default {
 			});
 		};
 
-		function managerChange(e, l, d, t) {
+		function managerChange(e, l, d, t,orgName) {
 			state.projectInfo.sourceBelongId = d
 			state.projectInfo.sourceBelongName = t
+      state.projectInfo.sourceBelongFullName = orgName
 		}
 		const disabledDate = (current) => {
 			return current && current < dayjs().startOf('day');

src/views/projectcenter/TaskPage.vue

@@ -700,7 +700,24 @@
                   :columns="stuColumns"
                   :stage="stage"
                   :visable ="tabFlag"
-                ></TableStudent>
+                >
+                  <template #extension="{data:{record}}">
+                    <div style="display:flex">
+                      <div
+                          @click="showStudent(record)"
+                          style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
+                      >
+                        查看
+                      </div>
+                      <div
+                          @click="settingTopFlag(record)"
+                          style="color: #4ea6ff; font-size: 14px; text-align: center;margin-left: 20px;cursor: pointer;"
+                      >
+                        {{record.topFlag?'取消优秀':'优秀学员'}}
+                      </div>
+                    </div>
+                  </template>
+                </TableStudent>
               </a-tab-pane>
             </a-tabs>
           </div>
@@ -1275,7 +1292,7 @@
         :closable="close"
         wrapClassName="canclestu"
         centered="true"
-        @cancel="closeModal1"
+        @cancel="cancelyou"
       >
         <div class="delete">
           <div class="del_header"></div>
@@ -1288,11 +1305,11 @@
               <span>您是否授予此学员优秀学员称号？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
+              <div class="del_btn btn1" @click="cancelyou">
-                <div class="btnText" @click="cancelyou">取消</div>
+                <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2">
+              <div class="del_btn btn2"  @click="closeModal1">
-                <div class="btnText" @click="closeModal1">确定</div>
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
@@ -1320,11 +1337,11 @@
               <span>您是否取消此学员优学员称号？</span>
             </div>
             <div class="del_btnbox">
-              <div class="del_btn btn1">
+              <div class="del_btn btn1" @click="cancelcanyou">
-                <div class="btnText" @click="cancelcanyou">取消</div>
+                <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2">
+              <div class="del_btn btn2" @click="closeModal3">
-                <div class="btnText" @click="closeModal3">确定</div>
+                <div class="btnText">确定</div>
               </div>
             </div>
           </div>
@@ -1678,7 +1695,7 @@ import {
   getGroupList,
   deleteGroup,
   editGroup,
-  topStudent,
+  updateStudent,
 } from "../../api/indexProjStu";
 import { message, Modal } from "ant-design-vue";
 import * as apitl from "../../api/index";
@@ -1725,6 +1742,7 @@ export default {
     const store = useStore();
     const route = useRoute();
     const state = reactive({
+      editRecord:{},
       tabFlag:true,
       stage: [],
       stuColumns: [
@@ -2559,24 +2577,10 @@ export default {
     };
     //点击确定授予优秀学员后
     const closeModal1 = () => {
-      let obj = {
+      state.editRecord.topFlag = 1
-        projectId: state.projectId,
+      updateStudent(state.editRecord)
-        studentIds: state.changeGoods,
-        topFlag: 1,
-      };
-      topStudent(obj)
-        .then((res) => {
-          console.log(`优秀学员授予成功${res.data}`);
-          message.success("优秀学员称号授予成功");
-
-          getStu();
-        })
-        .catch((err) => {
-          console.log(`优秀学员授予成功${err}`);
-          message.warning("优秀学员称号授予失败");
-        });
-      state.changeGoods = [];
       state.canclestu = false;
+      message.success("优秀学员称号授予成功");
     };
 
     //点击取消授予优秀学员后
@@ -2589,24 +2593,10 @@ export default {
     };
     //点击确定取消优秀学员称号
     const closeModal3 = () => {
-      let obj = {
+      state.editRecord.topFlag = 0
-        projectId: state.projectId,
+      updateStudent(state.editRecord)
-        studentIds: state.changeGoods,
-        topFlag: 0,
-      };
-      topStudent(obj)
-        .then((res) => {
-          console.log(`取消优秀学员称号成功${res}`);
-          message.success("优秀学员称号取消成功");
-
-          getStu();
-        })
-        .catch((err) => {
-          console.log(`取消优秀学员称号失败${err}`);
-          message.warning("优秀学员称号取消失败");
-        });
-      state.changeGoods = [];
       state.canclestu1 = false;
+      message.success("优秀学员称号取消成功");
     };
     //点击取消取消授予优秀学员后
     const cancelcanyou = () => {
@@ -3390,7 +3380,7 @@ export default {
           let end = info.endTime;
           state.tstartTime = info.beginTime;
           state.tendTime = info.endTime;
-          state.tsourceBelong = info.sourceBelongName;
+          state.tsourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
           state.parentId = info.parentId;
           state.name = info.name;
           state.startTime = start;
@@ -3417,7 +3407,7 @@ export default {
 
           // state.attach = info.attach;
           // state.templateId = info.templateId;
-          state.sourceBelong = info.sourceBelongName;
+          state.sourceBelong = (info.sourceBelongFullName || '')+info.sourceBelongName;
           // state.fileList=info.attach.split(",")
           let d = info.attach.indexOf(",");
           // console.log(info.attach, "xgo", info.attach.length);
@@ -4024,9 +4014,19 @@ export default {
       };
       state.codeInfo = obj;
     };
+    function settingTopFlag(record){
+      record.topFlag?(state.canclestu1 = true):(state.canclestu=true)
+      state.editRecord = record
+    }
+    function showStudent(record){
+      state.Seevisible = true
+      state.checkStuId = record.studentId
+    }
     return {
       ...toRefs(state),
       ...toRefs(levelList),
+      showStudent,
+      settingTopFlag,
       totask,
       tostudent,
       showModal,

src/views/projectcenter/templateAdd.vue

@@ -119,6 +119,7 @@
             <OrgClass
                 v-model:value="projectInfo.sourceBelongId"
                 v-model:name="projectInfo.sourceBelongName"
+                v-model:fullName="projectInfo.sourceBelongFullName"
             ></OrgClass>
           </div>
         </div>
@@ -296,9 +297,10 @@ const createProject = () => {
       });
 };
 
-function managerChange(e, l, d, t) {
+function managerChange(e, l, d, t,orgName) {
   projectInfo.value.valuesourceBelongId = d;
   projectInfo.value.sourceBelongName = t;
+  projectInfo.value.sourceBelongFullName = orgName
 }
 </script>
 <style lang="scss">