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

.gitignore

@@ -27,3 +27,4 @@ src/api/config.js
 src/api/config.js
 src/api/config.js
 src/api/config.js
+fe-manage-develop.iml

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("版本1.01------------");
+    console.log("版本1.02------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/components/drawers/AddHomework.vue

@@ -3,7 +3,7 @@
 		@after-visible-change="afterVisibleChange">
 		<div class="drawerMain">
 			<div class="header">
-				<div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
+				<div class="headerTitle">{{ edit ? "编辑" : "添加" }}任务</div>
 				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
 					@click="closeDrawer2" />
 			</div>

src/components/drawers/AddTest.vue

@@ -391,6 +391,7 @@ export default {
       id: "",
       testName: "",
       TestName: "",
+ 
       testObj: {
         name: "",
         paperId: "",
@@ -511,6 +512,19 @@ export default {
         (state.test.examinationPaperId = state.paperId);
       //TODO缺少paperName字段
       state.test.examinationTestName = state.paperName;
+      //考试推送
+        state.test.targetId = 0;
+          state.test.type = 0;
+        if(props.isLevel == 1){
+          state.test.targetId = props.routerId;
+          state.test.type = 1;
+
+        }else if(props.isLevel == 2){
+          state.test.targetId = props.projectId;
+          state.test.type = 2;
+
+        }
+   
 
       if (props.EditTestId > 0) {
         // 编辑任务

src/components/student/TableStudent.vue

@@ -128,6 +128,10 @@ const props = defineProps({
   stage: {
     type: Array,
     default: () => [],
+  }, 
+  visable: {
+    type: Boolean,
+    default:false,
   },
 });
 const tablecolumns = ref([
@@ -202,8 +206,15 @@ onMounted(() => {
 });
 
 watch(props, () => {
+  if(!props.visable){
+    stuSelectKeys.value =[];
+    console.log("关闭了");
+  }
+  console.log("props.visable",props.visable)
   tableParam.value.pid = props.id;
   getStuList();
+ 
+    
 });
 
 function onStuSelectChange(e) {

src/views/courselibrary/CoursewareManage.vue

@@ -638,6 +638,12 @@
                 </div>
                 <div class="mbl_items2">
                   <div class="item_nam">
+                    <div class="asterisk_icon">
+                      <img
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt="asterisk"
+                      />
+                    </div>
                     <span style="margin-right: 14px">课程简介</span>
                   </div>
                   <div class="item_inp">
@@ -681,7 +687,7 @@
                     </span>
                   </div>
                 </div>
-                <div class="mbl_items12">
+                <div class="mbl_items12">{{imgList}}
                   <div
                     class="i12_box1"
                     v-for="(item, index) in imgList"
@@ -2279,6 +2285,7 @@
                   :type="3"
                   :id="offcoursePlanId"
                   :columns="stuColumns"
+                  :visable ="sm_hs"
                 >
                   <!--                  <template #extension = "data">-->
                   <!--                    <div style="display: flex">-->
@@ -4988,7 +4995,6 @@ export default defineComponent({
     const sm_exit = () => {
       state.sm_hs = false;
       state.hideshow = true;
-
       state.tableData7 = [];
     };
     const clear_valueE1 = (value) => {
@@ -5592,7 +5598,8 @@ export default defineComponent({
           // });
           // console.log(state.filesList);
           console.log(res.data.data);
-          state.filesList = [res.data.data];
+          state.filesList.push([res.data.data]);
+      
           // state.hasImgName = res.data.data;
         }
       });

src/views/courselibrary/courseModal.vue

@@ -837,6 +837,7 @@ export default defineComponent({
         postData.categoryId,
         postData.teacherId,
         postData.picUrl,
+        postData.qdms_inputV6,
       ];
       if (!checkVal(checkList)) {
         message.destroy();

src/views/projectcenter/TaskPage.vue

@@ -1,3 +1,5 @@
+<!-- eslint-disable vue/valid-v-model -->
+<!-- eslint-disable vue/no-parsing-error -->
 <!-- 任务页面 -->img
 <template>
   <div class="taskpage">
@@ -686,16 +688,18 @@
             <div style="display: flex; height: 20px"></div>
           </div>
         </a-tab-pane>
+    
         <a-tab-pane key="3" tab="学员">
           <div class="split"></div>
           <div class="content3">
             <a-tabs v-model:activeKey="activeKey1">
-              <a-tab-pane key="8" tab="学员管理">
+              <a-tab-pane key="8" tab="学员管理" >
                 <TableStudent
                   :type="1"
                   :id="projectId"
                   :columns="stuColumns"
                   :stage="stage"
+                  :visable ="tabFlag"
                 ></TableStudent>
               </a-tab-pane>
             </a-tabs>
@@ -1721,6 +1725,7 @@ export default {
     const store = useStore();
     const route = useRoute();
     const state = reactive({
+      tabFlag:true,
       stage: [],
       stuColumns: [
         {
@@ -2573,6 +2578,7 @@ export default {
       state.changeGoods = [];
       state.canclestu = false;
     };
+  
     //点击取消授予优秀学员后
     const cancelyou = () => {
       state.changeGoods = [];
@@ -3065,6 +3071,8 @@ export default {
 
     //tabs切换
     const tabsChange = (e) => {
+   
+     
       //排行榜
       if (e == 6) {
         //获取进度榜
@@ -3073,9 +3081,13 @@ export default {
         getbillboard(2, 1);
         //获取学时榜
         getbillboard(3, 1);
-      } else {
+      } else if(e == 3){
+        state.tabFlag =true;
+      }else{
         rankReset();
+        state.tabFlag =false;
       }
+      console.log("切换了",state.tabFlag);
     };
 
     // start -------排行榜---------------排行榜------------排行榜------------------排行榜---------
@@ -4025,6 +4037,7 @@ export default {
       closeModal2,
       showModal3,
       closeModal3,
+     
       showDeleteOne,
       closeDeleteOne,
       showTime,

vue.config.js

@@ -9,23 +9,23 @@
 const { defineConfig } = require("@vue/cli-service");
 
 module.exports = defineConfig({
-    publicPath: "/manage-release",
+	publicPath: "/manage",
-    // transpileDependencies: true,
+	// transpileDependencies: true,
-    devServer: {
+	devServer: {
-        port: 8080,
+		port: 8080,
-        proxy: {
+		proxy: {
-            "/manageApi": {
+			"/manageApi": {
-                target: process.env.VUE_APP_PROXY_URL,
+				target: process.env.VUE_APP_PROXY_URL,
-                changeOrigin: true, //表示是否改变原域名
+				changeOrigin: true, //表示是否改变原域名
-                // secure: false,
+				// secure: false,
-                // ws: false, //表示WebSocket协议
+				// ws: false, //表示WebSocket协议
-                pathRewrite: {
+				pathRewrite: {
-                    "^/manageApi": "",
+					"^/manageApi": "",
-                },
+				},
-            },"/userbasic": {
+			}, "/userbasic": {
-                target: process.env.VUE_APP_BOE_API_URL,
+				target: process.env.VUE_APP_BOE_API_URL,
-                changeOrigin: true, //表示是否改变原域名
+				changeOrigin: true, //表示是否改变原域名
-            },
+			},
-        },
+		},
-    },
+	},
 });