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

src/components/project/ProjectManager.vue

@@ -69,7 +69,7 @@ export default {
 
     onMounted(() => {
       console.log("onMounted");
-      // init()
+      init()
     });
 
     function getMember() {
@@ -138,13 +138,13 @@ export default {
         } else {
           state.managerArray = [];
         }
-        getMemberData();
+        // getMemberData();
         return;
       }
       if (!props.value) {
         if (!(state.options && state.options.length)) {
           state.options = [];
-          getMember();
+          // getMember();
         }
         return;
       }

src/components/vote/AddVote.vue

@@ -153,6 +153,8 @@
                   </span>
                 </a-tag>
               </div>
+              <button class="xkbtn" @click="downloadTemplate">下载模板
+              </button>
             </div>
           </div>
           <div class="main_item" style="margin-top: -25px">
@@ -465,8 +467,14 @@ export default {
       state.ballotId = null;
       console.log(e);
     };
+
+    function downloadTemplate() {
+      window.open('/manageApi/投票基础数据模版.xlsx')
+    }
+
     return {
       ...toRefs(state),
+      downloadTemplate,
       showDrawerCreVote,
       afterVisibleChange,
       closeDrawer,

src/views/courselibrary/CoursewareManage.vue

@@ -5164,7 +5164,6 @@ export default defineComponent({
       state.teacherId = item.teacherId;
       state.qdms_inputV6 = item.intro;
       state.member = { value: item.teacherId, name: item.teacher };
-
       if (item.attach == "") {
         state.imgList = [];
       } else {

src/views/learningpath/LearningPath.vue

@@ -200,6 +200,7 @@
                   'background-image': 'url(' + item.dictValue + ')',
                   display: index >= 5 ? 'none' : 'flex',
                 }"
+                style="background-size: 100% 100%"
               ></div>
               <div
                 @click="showLearnBgMore"
@@ -1720,7 +1721,7 @@ export default {
       getLearnPath();
       if (store.state.pathmapPic.length > 0) {
         console.log("store.state.pathmapPic", store.state.pathmapPic);
-        state.imgData = [store.state.pathmapPic[0]];
+        state.imgData = store.state.pathmapPic;
       }
     });
     //添加权限

src/views/learningpath/LevelAddDetail.vue

@@ -905,9 +905,7 @@
             <div class="close_exit" @click="closedeleteAll"></div>
           </div>
           <div class="body">
-            <span
+            <span>请确认是否批量删除任务</span>
-              >请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }}</span
-            >
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn1" @click="closedeleteAll">
@@ -1630,7 +1628,7 @@ export default {
       state.gqxy_hs = !state.gqxy_hs;
     };
     const showDeleteALLModal = (type) => {
-      if (state.selectRow.length === 0){
+      if (state.selectRow.length === 0) {
         message.destroy();
         return message.warning("请选择要删除的任务");
       }
@@ -1744,6 +1742,7 @@ export default {
           .then((res) => {
             console.log(res);
             state.deleteAll = false;
+            // state.deleteType = null;
             message.destroy();
             state.selectRow = []; //选择行
             state.selectAll = 0; //0：未选择，1：全选，2：部分选择

src/views/projectcenter/ProjectAdd.vue

@@ -68,36 +68,62 @@
             />
             <div class="inname">封面图</div>
           </div>
-          <div
+          <div class="in select" style="flex:1">
-            :class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"
+            <a-select
-            style="
+                :getPopupContainer="
-              width: 100px;
+                        (triggerNode) => {
-              height: 100px;
+                          return triggerNode.parentNode || document.body;
-              border-radius: 5px;
-              cursor: pointer;
-              position: relative;
-              overflow: hidden;
-            "
-            v-for="(src, index) in projectPic"
-            :key="index"
-            @click="
-              () => {
-                projectInfo.picUrl = src;
                         }
                       "
-          >
+                v-model:value="projectInfo.picUrl"
+                dropdownClassName="dropdown-style"
+                style="width: 440px"
+                placeholder="请选择"
+                :options="projectPic"
+                allowClear
+            ></a-select>
             <img
-              style="
+                style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
-                width: 100px;
+                v-if="projectInfo.picUrl"
-                height: 100px;
+                :src="projectInfo.picUrl"
-                margin-bottom: 4px;
-                margin-right: 4px;
-              "
-              :src="src"
                 alt="avatar"
             />
+            <div class="i_bottom">
+                      <span style="color: #999ba3">
+                        高宽比为16:9 (如:800*450) png或jpg图片
+                      </span>
             </div>
           </div>
+<!--          <div-->
+<!--            :class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"-->
+<!--            style="-->
+<!--              width: 100px;-->
+<!--              height: 100px;-->
+<!--              border-radius: 5px;-->
+<!--              cursor: pointer;-->
+<!--              position: relative;-->
+<!--              overflow: hidden;-->
+<!--            "-->
+<!--            v-for="(src, index) in projectPic"-->
+<!--            :key="index"-->
+<!--            @click="-->
+<!--              () => {-->
+<!--                projectInfo.picUrl = src;-->
+<!--              }-->
+<!--            "-->
+<!--          >-->
+<!--            <img-->
+<!--              style="-->
+<!--                width: 100px;-->
+<!--                height: 100px;-->
+<!--                margin-bottom: 4px;-->
+<!--                margin-right: 4px;-->
+<!--              "-->
+<!--              :src="src"-->
+<!--              alt="avatar"-->
+<!--            />-->
+<!--          </div>-->
+        </div>
         <div class="name">
           <div class="namebox">
             <img
@@ -333,7 +359,7 @@ export default {
     });
 
     onMounted(() => {
-      state.projectPic = store.state.projectPic.map((e) => e.dictValue);
+      state.projectPic = store.state.projectPic.map((e) => ({value:e.dictValue,label:e.dictName}));
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();

src/views/projectcenter/TaskPage.vue

@@ -2511,6 +2511,12 @@ export default {
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
               let taskarr = res.data.data.stageList;
+              console.log('11-22-33',taskarr)
+              if(taskarr.length==1){
+                if(taskarr[0].stageId == '0'){
+                  taskarr[0].name = '无阶段任务'
+                }
+              }
               state.taskSyllabus = taskarr;
             }
           }