Merge branch 'pre-dev' into 'develop'

Pre dev

See merge request !21

src/api/config.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 15:30:27
+ * @LastEditTime: 2022-12-14 09:04:31
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);

src/components/drawers/ActiveAttendance.vue

@@ -513,14 +513,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+       //   {
-          title: "所在岗位",
+         //   title: "所在岗位",
-          dataIndex: "gang",
+         //   dataIndex: "gang",
-          key: "gang",
+         //   key: "gang",
-          width: 50,
+          //  width: 50,
-          align: "center",
+          //  align: "center",
-          className: "h",
+          //  className: "h",
-        },
+        //  },
         {
           title: "签到时间",
           dataIndex: "cur",

src/components/drawers/AddDiscuss.vue

@@ -191,11 +191,12 @@ export default {
       }
     };
     const updateTask = async (res) => {
-      if(!props.isactive){
+   
+      if (props.isLevel == 1) {
+        if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         await RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.discussId,

src/components/drawers/AddEval.vue

@@ -177,11 +177,12 @@ export default {
     };
     //向关卡或阶段渲染
     const updateTask = async (value) => {
-      if(!props.isactive){
+    
+      if (props.isLevel == 1) {
+        if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         await RouterEditTask({
           chapterId: props.isactive,
           courseId: Number(value.evaluationId),

src/components/drawers/AddFaceteach.vue

@@ -702,11 +702,12 @@ export default {
     // 新增编辑或新增项目任务
     const updateTask = async (res) => {
       console.log("props.isLevel=====", props.isLevel);
-      if(!props.isactive){
+    
+      if (props.isLevel == 1) {
+        if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         let editObj1 = {
           chapterId: props.isactive,
           courseId: res.data.data.offcoursePlanId,

src/components/drawers/AddGroupMembers.vue

@@ -155,14 +155,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+         // {
-          title: "岗位",
+          //  title: "岗位",
-          dataIndex: "gangw",
+          //  dataIndex: "gangw",
-          key: "gangw",
+          //  key: "gangw",
-          width: 60,
+          //  width: 60,
-          align: "center",
+          //  align: "center",
-          className: "h",
+          //  className: "h",
-        },
+         // },
         // {
         //   title: "进度",
         //   dataIndex: "progress",

src/components/drawers/AddInvist.vue

@@ -21,21 +21,17 @@
         <div class="main">
           <div class="main_left">
             <AssessmentAll
-                      v-model:assessmentVisible="assessmentVisible"
+              v-model:assessmentVisible="assessmentVisible"
-                      v-model:assessmentId="assessmentId"
+              v-model:assessmentId="assessmentId"
-                      v-model:assessmentName="assessmentName"
+              v-model:assessmentName="assessmentName"
-                     
+            />
-                    />
-
           </div>
-         
         </div>
-    
       </div>
       <div class="main_btns">
-            <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
-            <button class="btn2" @click="updateTask">确定</button>
+        <button class="btn2" @click="updateTask">确定</button>
-          </div>
+      </div>
     </div>
   </a-drawer>
 </template>
@@ -119,15 +115,15 @@ export default {
       assessmentName: "",
       assessment: null,
       assessment1: null,
-      assessmentVisible:false,
+      assessmentVisible: false,
       titleTag: false,
     });
-   // const getCheckedAss = (ass) => {
+    // const getCheckedAss = (ass) => {
-     // state.assessmentId = ass.assessmentId;
+    // state.assessmentId = ass.assessmentId;
-     // state.assessment = ass;
+    // state.assessment = ass;
-     // console.log("state.assessment1",state.assessment);
+    // console.log("state.assessment1",state.assessment);
-   //  
+    //
-   // };
+    // };
 
     const closeDrawer = () => {
       ctx.emit("update:addinvistVisible", false);
@@ -138,43 +134,45 @@ export default {
       // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
-     
     };
     const checkAssDrawer = () => {
       state.assessmentVisible = true;
     };
     const afterVisibleChange = (bool) => {
-      if(bool && props.EditInvistId >0){
+      if (bool && props.EditInvistId > 0) {
         state.assessmentVisible = true;
         state.assessmentId = props.EditInvistId;
-      }else{
+      } else {
-        state.assessmentId =null;
+        state.assessmentId = null;
-        state.assessmentName =null;
+        state.assessmentName = null;
       }
-   
     };
 
     const updateTask = () => {
-      console.log("state.assessmentId ",state.assessmentId ,state.assessmentName );
+      console.log(
+        "state.assessmentId ",
+        state.assessmentId,
+        state.assessmentName
+      );
       if (!state.assessmentId) {
         return message.warning("请选择评估");
       }
       let l_data_id = [];
-      l_data_id.push(Number(state.assessmentId))
+      l_data_id.push(Number(state.assessmentId));
-      console.log("state.assessment",state.assessment,state.assessmentId);
+      console.log("state.assessment", state.assessment, state.assessmentId);
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
         IsExistence({
           chapterId: Number(props.isactive),
-          courseTaskId:l_data_id,
+          courseTaskId: l_data_id,
           routerId: props.routerId,
           type: 11,
         })
           .then((res) => {
-            console.log('shifouchongfu',res)
+            console.log("shifouchongfu", res);
             console.log("路径图中是否包含此评估了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
@@ -200,7 +198,9 @@ export default {
               })
                 .then(() => {
                   message.destroy();
-                  message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+                  message.success(
+                    `${props.edit ? "编辑" : "新增"}关卡任务成功`
+                  );
                   ctx.emit("changeData", false);
                   closeDrawer();
                   state.addLoading = false;
@@ -210,20 +210,20 @@ export default {
                   message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
                 });
             }
-          }).catch(err=>{
-            console.log(err)
           })
-
+          .catch((err) => {
-       
+            console.log(err);
+          });
       } else if (props.isLevel == 2) {
         IsExistenceProject({
           courseTaskId: l_data_id,
           projectId: props.projectId,
           stageId: props.chooseStageId || 0,
           type: 11,
-        }).then(res=>{
+        })
-          console.log(res)
+          .then((res) => {
-          console.log("项目中是否包含此评估了", res);
+            console.log(res);
+            console.log("项目中是否包含此评估了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
               let tipStr = "";
@@ -239,71 +239,70 @@ export default {
               return;
             } else {
               apiTask
-              .addTask({
+                .addTask({
-                courseId: state.assessmentId,
+                  courseId: state.assessmentId,
-                name: state.assessmentName,
+                  name: state.assessmentName,
-                projectId: props.projectId,
+                  projectId: props.projectId,
-                projectTaskId: props.projectTaskId || 0,
+                  projectTaskId: props.projectTaskId || 0,
-                stageId: props.chooseStageId || 0,
+                  stageId: props.chooseStageId || 0,
-                type: 11,
+                  type: 11,
-              })
+                })
-              .then(() => {
+                .then(() => {
-                message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+                  message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-                ctx.emit("changeData", false);
+                  ctx.emit("changeData", false);
-                closeDrawer();
+                  closeDrawer();
-              })
+                })
-              .catch(() => {
+                .catch(() => {
-                message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
+                  message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
-              });
+                });
             }
-        }).catch(err=>{
+          })
-          console.log(err)
+          .catch((err) => {
-        })
+            console.log(err);
-        
+          });
       } else if (props.isLevel == 3) {
         IsExistenceProjectTemplate({
           courseTaskId: l_data_id,
           projectTemplateId: props.projectTemplateId,
           stageId: props.chooseStageId || 0,
           type: 11,
-        }).then((res)=>{
+        }).then((res) => {
-          console.log(res)
+          console.log(res);
           console.log("项目中是否包含此评估了", res);
-            if (res.data.data.length) {
+          if (res.data.data.length) {
-              let strdata = res.data.data;
+            let strdata = res.data.data;
-              let tipStr = "";
+            let tipStr = "";
-              for (let i = 0; i < strdata.length; i++) {
+            for (let i = 0; i < strdata.length; i++) {
-                if (i == strdata.length - 1) {
+              if (i == strdata.length - 1) {
-                  tipStr += strdata[i].courseName;
+                tipStr += strdata[i].courseName;
-                } else {
+              } else {
-                  tipStr += strdata[i].courseName + "/";
+                tipStr += strdata[i].courseName + "/";
-                }
               }
-              message.destroy();
-              message.warning("评估（" + tipStr + "）重复添加");
-              return;
-            }else{
-          addTempTask({
-          courseId: state.assessmentId,
-          name: state.assessmentName,
-          projectTemplateId: props.projectTemplateId,
-          projectTaskId: props.projectTaskId || 0,
-          stageId: props.chooseStageId || 0,
-          type: 11,
-        })
-          .then(() => {
-            message.destroy();
-            message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
-            ctx.emit("changeData", false);
-            closeDrawer();
-          })
-          .catch(() => {
-            message.destroy();
-            message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
-          });
             }
+            message.destroy();
+            message.warning("评估（" + tipStr + "）重复添加");
+            return;
+          } else {
+            addTempTask({
+              courseId: state.assessmentId,
+              name: state.assessmentName,
+              projectTemplateId: props.projectTemplateId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId || 0,
+              type: 11,
+            })
+              .then(() => {
+                message.destroy();
+                message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
+                ctx.emit("changeData", false);
+                closeDrawer();
+              })
+              .catch(() => {
+                message.destroy();
+                message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
+              });
+          }
         });
-
       }
     };
 
@@ -313,7 +312,6 @@ export default {
       closeDrawer,
       updateTask,
       checkAssDrawer,
-    
     };
   },
 };
@@ -339,7 +337,6 @@ export default {
       }
     }
     .contentMain {
-    
       .main {
         width: 100%;
         .main_left {
@@ -410,7 +407,7 @@ export default {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            margin-bottom:3px;
+            margin-bottom: 3px;
             height: 40px;
             background-color: #e9f6fe;
             .mntc_left {

src/components/drawers/AssessmentAll.vue

@@ -1,59 +1,54 @@
 <!-- 评估列表 -->
 <template>
- 
+  <div class="main_item">
-    <div class="main_item">
+    <div class="fi_input">
-      <div class="fi_input">
+      <a-input
-        <a-input
+        v-model:value="inputV1"
-          v-model:value="inputV1"
+        style="width: 424px; height: 40px; border-radius: 8px"
-          style="width: 424px; height: 40px; border-radius: 8px;"
+        placeholder="请输入评估名称"
-          placeholder="请输入评估名称"
+        maxlength="20"
-          maxlength="20"
+      />
-        />
-      </div>
-      <div class="btns" @click="getAllInvistText">
-        <div class="search"></div>
-        <div class="btnText">搜索</div>
-      </div>
-      <div class="btnsn" @click="resetInvist">
-        <div class="search"></div>
-        <div class="btnText">重置</div>
-      </div>
     </div>
-    <div class="main_notice">
+    <div class="btns" @click="getAllInvistText">
-              <div class="mntc_left">
+      <div class="search"></div>
-                <div class="notice_icon"></div>
+      <div class="btnText">搜索</div>
-                <div v-if="assessment == null">
+    </div>
-                  <span class="title"
+    <div class="btnsn" @click="resetInvist">
-                    >已选择 <span class="data">0</span> 条</span
+      <div class="search"></div>
-                  >
+      <div class="btnText">重置</div>
-                </div>
+    </div>
-                <div v-else>
+  </div>
-                  <div >
+  <div class="main_notice">
-                    <span class="title"
+    <div class="mntc_left">
-                      >已选择 <span class="data">1</span> 条;</span
+      <div class="notice_icon"></div>
-                    >
+      <div v-if="assessment == null">
-                    <span class="title"
+        <span class="title">已选择 <span class="data">0</span> 条</span>
-                      >名称： <span class="data">{{ assessment.name }}</span>
+      </div>
-                    </span><!--
+      <div v-else>
+        <div>
+          <span class="title">已选择 <span class="data">1</span> 条;</span>
+          <span class="title"
+            >名称： <span class="data">{{ assessment.name }}</span> </span
+          ><!--
                     <span class="title"
                       >题数： <span class="data">{{ assessment.essayQuestionVoList?Number(assessment.essayQuestionVoList.length):0
                       +Number(assessment.multipleStemVoList?assessment.multipleStemVoList.length:0)
                       +Number(assessment.scoringQuestionVoList?assessment.scoringQuestionVoList.length:0)
                       +Number(assessment.singleStemVoList?assessment.singleStemVoList.length:0) }}</span>
                     </span>-->
-                    <span class="title"
+          <span class="title"
-                      >题数： <span class="data">{{ assessment.num }}</span>
+            >题数： <span class="data">{{ assessment.num }}</span>
-                    </span>
+          </span>
-                    <span class="title"
+          <span class="title"
-                      >创建人：
+            >创建人：
-                      <span class="data">{{ assessment.creator }}</span>
+            <span class="data">{{ assessment.creator }}</span>
-                    </span>
+          </span>
-                    <span class="title"
+          <span class="title"
-                      >创建时间：
+            >创建时间：
-                      <span class="data">{{ assessment.time }}</span>
+            <span class="data">{{ assessment.time }}</span>
-                    </span>
+          </span>
-                  </div>
+        </div>
-                  <!--
+        <!--
                   <div v-else>
                     <span class="title"
                       >已选择 <span class="data">1</span> 条;</span
@@ -78,27 +73,27 @@
                     </span>
                   </div>
                   -->
-                </div>
-              </div>
       </div>
+    </div>
+  </div>
 
-      <div class="main_table">
+  <div class="main_table">
-      <a-table
+    <a-table
-        style="border: 1px solid #f2f6fe"
+      style="border: 1px solid #f2f6fe"
-        :columns="tableDataFunc()"
+      :columns="tableDataFunc()"
-        :data-source="tableData"
+      :data-source="tableData"
-        :loading="tableDataTotal === -1 ? true : false"
+      :loading="tableDataTotal === -1 ? true : false"
-        expandRowByClick="true"
+      expandRowByClick="true"
-        @expand="expandTable"
+      @expand="expandTable"
-        :pagination="false"
+      :pagination="false"
-        :row-selection="{
+      :row-selection="{
-                  type: 'radio',
+        type: 'radio',
-                  selectedRowKeys: selectedRowKeys,
+        selectedRowKeys: selectedRowKeys,
-                  onChange: onSelectChange,
+        onChange: onSelectChange,
-                }"
+      }"
-        filterMultiple:false
+      filterMultiple:false
-      />
+    />
-      <div class="tableBox">
+    <div class="tableBox">
       <div class="pa">
         <a-pagination
           :showSizeChanger="false"
@@ -110,12 +105,12 @@
           class="pagination"
           @change="handelChangePage"
         />
-      </div></div>
+      </div>
     </div>
-
+  </div>
 </template>
 <script>
-import { reactive, toRefs,onMounted } from "vue";
+import { reactive, toRefs, onMounted, watch } from "vue";
 import * as api from "../../api/indexInvist.js";
 import dayjs from "dayjs";
 export default {
@@ -127,11 +122,11 @@ export default {
       type: Boolean,
       default: false,
     },
-    assessmentId:{
+    assessmentId: {
       type: Number,
       default: null,
     },
-    assessmentName:{
+    assessmentName: {
       type: String,
       default: null,
     },
@@ -145,38 +140,55 @@ export default {
       pageSize: 10,
       tableDataTotal: 0,
       tableData: [],
-      selectedRowKeys:[],
+      selectedRowKeys: [],
-      assessmentId:null,
+      assessmentId: null,
-      assessmentName:null,
+      assessmentName: null,
     });
     const closeDrawer = () => {
       ctx.emit("update:assessmentVisible", false);
     };
-     //清空所选
+    //清空所选
-     const clearLine = () => {
+    const clearLine = () => {
-      console.log("state.selectedRowKeys",state.selectedRowKeys)
+      console.log("state.selectedRowKeys", state.selectedRowKeys);
       state.selectedRowKeys = [];
       state.addOnlineList = [];
     };
     const queryInfo = () => {
       //if (props.edit) {
-       // state.titleTg = false;
+      // state.titleTg = false;
-        //编辑讨
+      //编辑讨
 
-        console.log("查询评估",props.assessmentId);
+      console.log("查询评估", props.assessmentId);
-        if(props.assessmentId){
+      if (props.assessmentId) {
-          api
+        api
           .queryAppraiseDetailById({ assessmentId: props.assessmentId })
           .then((res) => {
-            console.log(res);
+            console.log("查询评估xinxi ", res);
+            let info = res.data.data;
+            let obj = {
+              assessmentId: info.assessmentId,
+              name: info.assessmentName,
+              num: info.essayQuestionVoList
+                ? Number(info.essayQuestionVoList.length)
+                : 0 + info.multipleStemVoList
+                ? Number(info.multipleStemVoList.length)
+                : 0 + info.scoringQuestionVoList
+                ? Number(info.scoringQuestionVoList.length)
+                : 0 + info.singleStemVoList
+                ? Number(info.singleStemVoList.length)
+                : 0,
+              creator: info.createUser ? info.createUser : "-",
+              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+            };
             //更新讨论信息
-            state.assessment = res.data.data;
+            state.assessment = obj;
-          //  state.assessmentId = res.data.data.assessmentId;
+            state.selectedRowKeys = [info.assessmentId];
+            //  state.assessmentId = res.data.data.assessmentId;
           })
           .catch(() => {});
-        }
+      }
 
-    //  }
+      //  }
     };
     const tableDataFunc = () => {
       const columns = [
@@ -219,12 +231,11 @@ export default {
       state.addOnlineList = selectedRows;
       console.log(selectedRowKeys, selectedRows);
       state.assessment = selectedRows[0];
-        console.log("selectedRows=======", state.assessment);
+      console.log("selectedRows=======", state.assessment);
-        //  ctx.emit("checkedAss", state.assessment);
+      //  ctx.emit("checkedAss", state.assessment);
-        ctx.emit("update:assessmentId", state.assessment.assessmentId);
+      ctx.emit("update:assessmentId", state.assessment.assessmentId);
-        ctx.emit("update:assessmentName", state.assessment.name);
+      ctx.emit("update:assessmentName", state.assessment.name);
-    }
+    };
- 
 
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
@@ -234,21 +245,27 @@ export default {
     const getTableDate = (tableData) => {
       let data = tableData;
       let array = [];
-      data.map((value, index) => {
+      data.map((value) => {
         let obj = {
-          key: index,
+          key: value.assessmentId,
           assessmentId: value.assessmentId,
-          num: value.essayQuestionVoList?Number(value.essayQuestionVoList.length):0
+          num: value.essayQuestionVoList
-          +value.multipleStemVoList?Number(value.multipleStemVoList.length):0
+            ? Number(value.essayQuestionVoList.length)
-          +value.scoringQuestionVoList?Number(value.scoringQuestionVoList.length):0
+            : 0 + value.multipleStemVoList
-          +value.singleStemVoList?Number(value.singleStemVoList.length):0,
+            ? Number(value.multipleStemVoList.length)
+            : 0 + value.scoringQuestionVoList
+            ? Number(value.scoringQuestionVoList.length)
+            : 0 + value.singleStemVoList
+            ? Number(value.singleStemVoList.length)
+            : 0,
           name: value.assessmentName ? value.assessmentName : "-",
           creator: value.createUser ? value.createUser : "-",
           time: dayjs(value.createTime).format("YYYY-MM-DD"),
         };
         array.push(obj);
       });
-      (state.selectedRowKeys = []), (state.tableData = array);
+      state.selectedRowKeys = [];
+      state.tableData = array;
     };
     //获取全部评估信息接口
     const getAllInvistText = () => {
@@ -279,15 +296,34 @@ export default {
     };
     onMounted(() => {
       clearLine();
-      console.log("state.selectedRowKeys",state.selectedRowKeys)
+      console.log(
-      if(!state.assessmentId){
+        "state.selectedRowKeys",
+        state.selectedRowKeys,
+        state.assessmentId
+      );
+      if (!state.assessmentId) {
         clearLine();
       }
 
       queryInfo();
       getAllInvistText();
-      
     });
+    watch(
+      () => props.assessmentId,
+      () => {
+        if (!props.assessmentId) {
+          clearLine();
+          state.assessment = null;
+        } else {
+          queryInfo();
+        }
+        console.log("props.assessmentId", props.assessmentId);
+      },
+      {
+        deep: true,
+      }
+    );
+
     return {
       ...toRefs(state),
       onSelectChange,
@@ -322,7 +358,6 @@ export default {
       }
     }
     .contentMain {
-   
       .main_left {
         padding-right: 30px;
         margin-top: 32px;
@@ -398,36 +433,36 @@ export default {
       }
     }
     .main_table {
-        position: relative;
+      position: relative;
-        padding-bottom: 80px;
+      padding-bottom: 80px;
-        .ant-checkbox-wrapper {
+      .ant-checkbox-wrapper {
-          align-items: center;
+        align-items: center;
-          margin-top: -2px;
+        margin-top: -2px;
-        }
-        .ant-table-selection-column {
-          padding: 0px !important;
-          padding-left: 5px !important;
-        }
-        .ant-table-thead > tr > th {
-          background-color: rgba(239, 244, 252, 1);
-        }
-        th.h {
-          background-color: #eff4fc !important;
-        }
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .pa {
-          left: 0;
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          position: absolute;
-          bottom: 20px;
-        }
       }
+      .ant-table-selection-column {
+        padding: 0px !important;
+        padding-left: 5px !important;
+      }
+      .ant-table-thead > tr > th {
+        background-color: rgba(239, 244, 252, 1);
+      }
+      th.h {
+        background-color: #eff4fc !important;
+      }
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
+      .pa {
+        left: 0;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        position: absolute;
+        bottom: 20px;
+      }
+    }
     .main_btns {
       height: 72px;
       width: 100%;

src/components/drawers/MemberList.vue

@@ -231,22 +231,22 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+        //  {
-          title: "岗位",
+         //   title: "岗位",
-          dataIndex: "gangw",
+         //   dataIndex: "gangw",
-          key: "gangw",
+         //   key: "gangw",
-          width: 60,
+         //   width: 60,
-          align: "center",
+         //  align: "center",
-          className: "h",
+         //   className: "h",
-        },
+        //  },
-        {
+        //  {
-          title: "进度",
+         //   title: "进度",
-          dataIndex: "progress",
+          //  dataIndex: "progress",
-          key: "progress",
+         //   key: "progress",
-          width: 60,
+          //  width: 60,
-          align: "center",
+          //  align: "center",
-          className: "h",
+          //  className: "h",
-        },
+         // },
         {
           title: "操作",
           dataIndex: "operations",

src/components/project/NameInput.vue

@@ -12,7 +12,7 @@
   <div style="color:red;font-size: 10px" v-if="value && !validate">名称重复，请重新输入</div>
 </template>
 <script setup>
-import {defineProps, defineEmits, watch, ref} from "vue";
+import {defineProps, defineEmits, watch, ref, onMounted} from "vue";
 import {validateName} from "@/api/index1";
 
 const props = defineProps({
@@ -47,6 +47,10 @@ const emit = defineEmits({})
 
 const modelV = ref()
 
+onMounted(()=>{
+  modelV.value = props.value
+})
+
 watch(() => props.value, () => {
   if (props.value !== modelV.value) {
     modelV.value = props.value

src/components/project/ProjectClass.vue

@@ -1,46 +1,54 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:48
+ * @FilePath: /fe-manage/src/components/project/ProjectClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <!-- 评估管理-创建评估页面 -->
 <template>
   <a-select
-      :getPopupContainer="
+    :getPopupContainer="
-                          (triggerNode) => {
+      (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
+        return triggerNode.parentNode || document.body;
-                          }
+      }
-                        "
+    "
-      v-model:value="id"
+    v-model:value="id"
-      placeholder="请选择分类"
+    placeholder="请选择分类"
-      style="width: 100%"
+    style="width: 100%"
-      :options="options"
+    :options="options"
-      allowClear
+    allowClear
-      @change="change"
+    @change="change"
-      :disabled="disabled"
+    :disabled="disabled"
   >
   </a-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 
 const store = useStore();
 
 const props = defineProps({
   value: String,
-  disabled: String
+  disabled: String,
-})
+});
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
+  store.state.projectClass.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 const id = computed(() => {
-  return props.value
+  return props.value;
-})
+});
-
-onMounted(() => {
-  options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
 
 function change(key, obj) {
-  emit('update:name', obj[0])
+  emit("update:name", obj[0]);
-  emit('update:value', key)
+  emit("update:value", key);
 }
-
 </script>

src/components/project/ProjectLevel.vue

@@ -1,27 +1,34 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:21
+ * @FilePath: /fe-manage/src/components/project/ProjectLevel.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options?.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
-        :getPopupContainer="
+      :getPopupContainer="
-                          (triggerNode) => {
+        (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
+          return triggerNode.parentNode || document.body;
-                          }
+        }
-                        "
+      "
-        v-model:value="id"
+      v-model:value="id"
-        :options="options"
+      :options="options"
-        style="width: 100%"
+      style="width: 100%"
-        placeholder="请选择项目级别"
+      placeholder="请选择项目级别"
-        @change="change"
+      @change="change"
-        :disabled="disabled"
+      :disabled="disabled"
     />
   </template>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
-
 
 const store = useStore();
 const props = defineProps({
@@ -29,23 +36,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
+    default: false,
-  }
+  },
-})
+});
 
 const id = computed(() => {
-  return props.value || null
+  return props.value || null;
-})
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
-
+  store.state.projectLevel.map((e) => ({
-onMounted(() => {
+    value: parseInt(e.dictCode),
-  options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    label: e.dictName,
-})
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
 </script>

src/components/project/TrainClass.vue

@@ -1,27 +1,34 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:46
+ * @FilePath: /fe-manage/src/components/project/TrainClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
-        :getPopupContainer="
+      :getPopupContainer="
-                          (triggerNode) => {
+        (triggerNode) => {
-                            return triggerNode.parentNode || document.body;
+          return triggerNode.parentNode || document.body;
-                          }
+        }
-                        "
+      "
-        v-model:value="id"
+      v-model:value="id"
-        :options="options"
+      :options="options"
-        style="width: 100%"
+      style="width: 100%"
-        placeholder="请选择分类"
+      placeholder="请选择分类"
-        @change="change"
+      @change="change"
-        :disabled="disabled"
+      :disabled="disabled"
     />
   </template>
-
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 
 const store = useStore();
 
@@ -30,24 +37,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
+    default: false,
-  }
+  },
-})
+});
 
 const id = computed(() => {
-  return props.value
+  return props.value;
-})
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
-
+  store.state.projectSys.map((e) => ({
-onMounted(() => {
+    value: parseInt(e.dictCode),
-  options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
+    label: e.dictName,
-})
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
-
 </script>

src/views/courselibrary/CoursewareManage_Old.vue

@@ -3529,16 +3529,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-  {
+  //  //  {
-    title: "岗位",
+    //  title: "岗位",
-    width: 300,
+    //  width: 300,
-    dataIndex: "postion",
+    //  dataIndex: "postion",
-    key: "3",
+    //  key: "3",
-    align: "center",
+    //  align: "center",
-    customRender: ({ text }) => {
+   //   customRender: ({ text }) => {
-      return text ? text : "-";
+    //    return text ? text : "-";
-    },
+    //  },
-  },
+  //  },
   {
     title: "Band",
     width: 200,

src/views/courselibrary/components/seeModal.vue

@@ -156,7 +156,7 @@
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
-                  style="position:relative;"
+                  style="position: relative"
                   v-for="(item, index) in detail.attach"
                   :key="index"
                 >
@@ -207,21 +207,43 @@
                   <div class="file_detail">
                     <div class="file_name">
                       <!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
-                      <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
+                      <span
-                        {{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}  
+                        style="
+                          color: #6f6f6f;
+                          width: 200px;
+                          display: block;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                          position: absolute;
+                          top: 4px;
+                          left: 72px;
+                        "
+                      >
+                        {{
+                          item.indexOf("-") !== -1
+                            ? item.slice(
+                                item.lastIndexOf("/") + 1,
+                                item.lastIndexOf("-")
+                              ) + item.slice(item.lastIndexOf("."))
+                            : item
+                        }}
                       </span>
                     </div>
 
                     <div class="file_updata">
                       <div class="updatabox">
                         <div class="updatacolor"></div>
-                        <div class="updataxq" style="right:-62px;">上传完成</div>
+                        <div class="updataxq" style="right: -62px">
+                          上传完成
+                        </div>
                       </div>
                       <div class="upjd">
                         <span style="margin: auto 5px">100%</span>
                       </div>
                     </div>
                   </div>
+                  <a :href="item" style="margin-left: 5px">下载</a>
                 </div>
               </div>
             </div>
@@ -262,134 +284,140 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
-    console.log(props);
+    console.log("props", props);
     const state = reactive({
       imgList: [],
       options2222: [
         {
-          title: '领导力',
+          title: "领导力",
-          value: '100',
+          value: "100",
-          selectable:false,
+          selectable: false,
           children: [
             {
-              title: '领导业务',
+              title: "领导业务",
-              value: '1001',
+              value: "1001",
             },
             {
-              title: '领导团队',
+              title: "领导团队",
-              value: '1002',
+              value: "1002",
             },
             {
-              title: '领导自我',
+              title: "领导自我",
-              value: '1003',
+              value: "1003",
             },
           ],
         },
         {
-          title: '专业力',
+          title: "专业力",
-          value: '200',
+          value: "200",
-          selectable:false,
+          selectable: false,
           children: [
             {
-              title: '研发',
+              title: "研发",
-              value: '2001',
+              value: "2001",
             },
             {
-              title: '产品和解决方案',
+              title: "产品和解决方案",
-              value: '2002',
+              value: "2002",
             },
             {
-              title: '生产技术与制造',
+              title: "生产技术与制造",
-              value: '2003',
+              value: "2003",
             },
             {
-              title: '供应链',
+              title: "供应链",
-              value: '2004',
+              value: "2004",
             },
             {
-              title: '营销',
+              title: "营销",
-              value: '2005',
+              value: "2005",
             },
             {
-              title: '品质',
+              title: "品质",
-              value: '2006',
+              value: "2006",
             },
             {
-              title: '战略与企划',
+              title: "战略与企划",
-              value: '2007',
+              value: "2007",
             },
             {
-              title: '流程管理',
+              title: "流程管理",
-              value: '2008',
+              value: "2008",
             },
             {
-              title: '业绩管理',
+              title: "业绩管理",
-              value: '2009',
+              value: "2009",
             },
             {
-              title: '项目管理',
+              title: "项目管理",
-              value: '20010',
+              value: "20010",
             },
             {
-              title: '信息技术',
+              title: "信息技术",
-              value: '20011',
+              value: "20011",
             },
             {
-              title: '环境与安全',
+              title: "环境与安全",
-              value: '20012',
+              value: "20012",
             },
             {
-              title: '人力资源',
+              title: "人力资源",
-              value: '20013',
+              value: "20013",
             },
             {
-              title: '企业文化',
+              title: "企业文化",
-              value: '20014',
+              value: "20014",
             },
             {
-              title: '品牌',
+              title: "品牌",
-              value: '20015',
+              value: "20015",
             },
             {
-              title: '财务',
+              title: "财务",
-              value: '20016',
+              value: "20016",
             },
             {
-              title: '法务',
+              title: "法务",
-              value: '20017',
+              value: "20017",
             },
             {
-              title: '行政',
+              title: "行政",
-              value: '20018',
+              value: "20018",
             },
             {
-              title: '医工',
+              title: "医工",
-              value: '20019',
+              value: "20019",
-            }
+            },
           ],
         },
         {
-          title: '通用力',
+          title: "通用力",
-          value: '300',
+          value: "300",
-          selectable:false,
+          selectable: false,
           children: [
             {
-              title: '职业操守与道德',
+              title: "职业操守与道德",
-              value: '3001',
+              value: "3001",
             },
             {
-              title: '职业素养与技能',
+              title: "职业素养与技能",
-              value: '3002',
+              value: "3002",
             },
             {
-              title: '规章制度',
+              title: "规章制度",
-              value: '3003',
+              value: "3003",
             },
           ],
-        }
+        },
-      ]
+      ],
+      ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
+      ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
     });
 
+    // item.slice(
+    //                             item.lastIndexOf("/") + 1,
+    //                             item.indexOf("-")
+    //                           ) + item.slice(item.lastIndexOf("."))
     const filterTxt = (txt) => {
       if (txt) {
         return txt;
@@ -400,8 +428,8 @@ export default defineComponent({
     const filterClassTxt = (txt) => {
       let str = "-";
       if (txt) {
-        for(let i =0; i<options2.value.length;i++){
+        for (let i = 0; i < options2.value.length; i++) {
-          for(let j=0;j<options2.value[i].children.length;j++){
+          for (let j = 0; j < options2.value[i].children.length; j++) {
             if (String(options2.value[i].children[j].value) === String(txt)) {
               str = options2.value[i].children[j].title;
             }

src/views/examine/ProjectReviewedN.vue

@@ -151,14 +151,23 @@ export default {
           ellipsis: true,
           width:"20%",
         },
-        // todo 根项目保存
+        {
-        // {
+          title: "所属项目",
-        //   title: "所属项目",
+          dataIndex: "topName",
-        //   dataIndex: "sourceBelongName",
+          key: "topName",
-        //   key: "sourceBelongName",
+          align: "center",
-        //   align: "center",
+          ellipsis: true,
-        //   width: "11%",
+          width:"20%",
-        // },
+          customRender: ({ record: { gaName, faName, name } }) => (
+              <div>
+                {faName
+                    ? gaName !== null
+                        ? gaName + "/" + faName
+                        : faName
+                    : name}
+              </div>
+          ),
+        },
         {
           title: "项目经理",
           dataIndex: "manager",

src/views/learningpath/LevelAdd.vue

@@ -1483,14 +1483,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+        //  {
-          title: "岗位",
+         //   title: "岗位",
-          dataIndex: "gang",
+          //  dataIndex: "gang",
-          key: "gang",
+         //   key: "gang",
-          width: 110,
+         //   width: 110,
-          align: "center",
+          //  align: "center",
-          className: "h",
+         //   className: "h",
-        },
+        //  },
         {
           title: "当前关卡",
           dataIndex: "cur",
@@ -1499,14 +1499,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+       //   {
-          title: "进度",
+        //    title: "进度",
-          dataIndex: "jin",
+        //    dataIndex: "jin",
-          key: "jin",
+         //   key: "jin",
-          width: 110,
+         //   width: 110,
-          align: "center",
+         //   align: "center",
-          className: "h",
+         //   className: "h",
-        },
+        //  },
         {
           title: "开始时间",
           dataIndex: "time",

src/views/learningpath/LevelAddDetail.vue

@@ -1531,14 +1531,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+       //   {
-          title: "岗位",
+         //   title: "岗位",
-          dataIndex: "gang",
+         //   dataIndex: "gang",
-          key: "gang",
+         //   key: "gang",
-          width: 110,
+          //  width: 110,
-          align: "center",
+          //  align: "center",
-          className: "h",
+          //  className: "h",
-        },
+        //  },
         {
           title: "当前关卡",
           dataIndex: "cur",
@@ -1547,14 +1547,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+        //  {
-          title: "进度",
+         //   title: "进度",
-          dataIndex: "jin",
+         //   dataIndex: "jin",
-          key: "jin",
+         //   key: "jin",
-          width: 110,
+          //  width: 110,
-          align: "center",
+         //   align: "center",
-          className: "h",
+          //  className: "h",
-        },
+       //   },
         {
           title: "开始时间",
           dataIndex: "time",

src/views/projectcenter/LibraryAdd.vue

@@ -538,24 +538,6 @@
                       }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.remark
-                      }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
@@ -568,14 +550,32 @@
                       <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag"
+                      <a-radio v-model:checked="projectInfo.boeFlag"  :disabled="true"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{
+                          projectInfo.remark
+                        }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
             </a-tab-pane>

src/views/projectcenter/ProjectAdd.vue

@@ -211,7 +211,8 @@
             />
           </div>
         </div>
-        <div class="name name2">
+
+        <div v-if="projectInfo.status == -5" class="name name2">
           <div class="namebox">
             <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>

src/views/projectcenter/TaskPage.vue

@@ -707,6 +707,8 @@
                         placeholder="请输入姓名"
                       />
                     </div>
+                          <!-- 2022-11-30注释 后面放开 -->
+                    <!--
                     <div
                       style="
                         display: flex;
@@ -715,14 +717,14 @@
                         margin-bottom: 10px;
                       "
                     >
+               
                       <div class="groupname">小组名称：</div>
                       <a-input
                         v-model:value="valuestugroup"
                         placeholder="请输入小组名称"
                       />
                     </div>
-                    <!-- 2022-11-30注释 后面放开 -->
+                    <div
-                    <!-- <div
                       style="
                         display: flex;
                         align-items: center;
@@ -1144,29 +1146,13 @@
                       <span style="color: #999999">{{ sourceBelong }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{ remark }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
                       <span style="color: #999999"
                         ><ProjectLevel
                           v-model:value="level"
-                          :disabled="true"
+                          :tag="true"
                         ></ProjectLevel
                       ></span>
                     </div>
@@ -1177,11 +1163,21 @@
                       <span style="color: #999999"
                         ><TrainClass
                           v-model:value="systemId"
-                          :disabled="true"
+                          :tag="true"
                         ></TrainClass
                       ></span>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
@@ -1190,6 +1186,12 @@
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ remark }}</span>
+                    </div>
+                  </div>
                   <div class="set_content" v-if="isPass">
                     <div class="setc_name"><span>审核意见：</span></div>
                     <div class="setc_main">
@@ -3147,38 +3149,38 @@ export default {
           align: "center",
           className: "h",
         },
-        {
+        //  {
-          title: "岗位",
+         //   title: "岗位",
-          dataIndex: "gangw",
+         //   dataIndex: "gangw",
-          key: "gangw",
+         //   key: "gangw",
           // width: 50,
-          align: "center",
+          //  align: "center",
-          className: "h",
+           // className: "h",
-        },
+        //  },
-        {
+        //  {
-          title: "所属小组",
+          //  title: "所属小组",
-          dataIndex: "group",
+          //  dataIndex: "group",
-          key: "group",
+         //   key: "group",
           // width: 50,
-          align: "center",
+          //  align: "center",
-          className: "h",
+          //  className: "h",
-        },
+         // },
-        {
+       //   {
-          title: "进度",
+         //   title: "进度",
-          dataIndex: "progress",
+         //   dataIndex: "progress",
-          key: "progress",
+         //   key: "progress",
           // width: 30,
-          align: "center",
+         //   align: "center",
-          className: "h",
+         //   className: "h",
-        },
+        //  },
-        {
+        //  {
-          title: "证书",
+         //   title: "证书",
-          dataIndex: "diploma",
+          //  dataIndex: "diploma",
-          key: "diploma",
+          //  key: "diploma",
           // width: 30,
-          align: "center",
+          //  align: "center",
-          className: "h",
+           // className: "h",
-        },
+        //  },
         {
           title: "最近学习时间",
           dataIndex: "stutime",

src/views/projectcenter/TemplateLibrary.vue

@@ -11,8 +11,9 @@
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                " placeholder="请输入项目名称" />
+                " placeholder="请输入模板名称" />
             </div>
+            <!--
             <div class="inpbox1">
               <span>创建时间：</span>
               <a-date-picker v-model:value="time" type="date" placeholder="创建时间" style="
@@ -22,6 +23,8 @@
                 margin-right: 14px;
                 " />
             </div>
+-->
+
           </div>
         </div>
         <div class="tmplh_btn">

src/views/projectcenter/templateAdd.vue

@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-        @click="backPage"
+          @click="backPage"
-        style="cursor: pointer"
+          style="cursor: pointer"
-        to="/libraryAdd"
+          to="/libraryAdd"
-        class="goback"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -17,44 +17,32 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">模板名称</div>
           </div>
           <div class="in">
             <a-input
-              v-model:value="projectInfo.name"
+                v-model:value="projectInfo.name"
-              placeholder="请输入模板名称"
+                placeholder="请输入模板名称"
-              show-count
+                show-count
-              :maxlength="30"
+                :maxlength="30"
             />
           </div>
         </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
-          </div>
-        </div>
         <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="display: flex">
             <div
-              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-              style="
+                style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -62,19 +50,19 @@
                 position: relative;
                 overflow: hidden;
               "
-              v-for="(src, index) in projectPic"
+                v-for="(src, index) in projectPic"
-              :key="index"
+                :key="index"
-              @click="() => (projectInfo.picUrl = src.value)"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                :src="src.value"
+                  :src="src.value"
-                alt="avatar"
+                  alt="avatar"
               />
             </div>
           </div>
@@ -82,92 +70,61 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              separator="至"
+                separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
+                :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="projectInfo.rangeTime"
+                v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
+                style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
-              @change="timeChange"
+                @change="timeChange"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-              v-model:value="projectInfo.managerId"
+                v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
+                v-model:name="projectInfo.manager"
-              @onChange="managerChange"
+                @onChange="managerChange"
-              mode="multiple"
+                mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
+                v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
+                v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">模板说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
-            >
-          </div>
-        </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -178,8 +135,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训体系</div>
           </div>
@@ -190,8 +147,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
@@ -202,12 +159,45 @@
             </a-radio-group>
           </div>
         </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                :disabled="viewDetail ? true : false"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">模板说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+            />
+          </div>
+        </div>
       </div>
     </div>
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定
+        >确定
         </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
@@ -215,12 +205,11 @@
   </div>
 </template>
 <script setup>
-import { useStore } from "vuex";
+import {useStore} from "vuex";
-import { ref, onMounted, watch } from "vue";
+import {ref, onMounted, watch} from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
-import { useRouter, useRoute } from "vue-router";
+import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/indexTemplate";
-import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -231,7 +220,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-
+const courseSyncFlag = ref(false)
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -241,21 +230,22 @@ onMounted(() => {
 });
 
 watch(
-  () => route.query.projectTemplateId,
+    () => route.query.projectTemplateId,
-  () => {
+    () => {
-    getDetail();
+      getDetail();
-  }
+    }
 );
 
 const getDetail = () =>
-  route.query.projectTemplateId &&
+    route.query.projectTemplateId &&
-  api.templateDetail(route.query.projectTemplateId).then((res) => {
+    api.templateDetail(route.query.projectTemplateId).then((res) => {
-    projectInfo.value = res.data.data.projectTemplateInfo;
+      projectInfo.value = res.data.data.projectTemplateInfo;
-    projectInfo.value.rangeTime = [
+      projectInfo.value.rangeTime = [
-      projectInfo.value.beginTime,
+        projectInfo.value.beginTime,
-      projectInfo.value.endTime,
+        projectInfo.value.endTime,
-    ];
+      ];
-  });
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
+    });
 
 const backPage = () => {
   router.back();
@@ -290,16 +280,17 @@ const createProject = () => {
       return;
     }
   }
+  projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
   api
-    .templateEdit({
+      .templateEdit({
-      ...projectInfo.value,
+        ...projectInfo.value,
-      courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
+        courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
-    })
+      })
-    .then(() => {
+      .then(() => {
-      message.destroy();
+        message.destroy();
-      message.success("编辑成功");
+        message.success("编辑成功");
-      router.back();
+        router.back();
-    });
+      });
 };
 
 function managerChange(e, l, d, t) {
@@ -311,6 +302,7 @@ function managerChange(e, l, d, t) {
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }
+
 .projectAdd {
   width: 100%;
   // height: inherit;

src/views/research/ManagePage.vue

@@ -150,12 +150,12 @@ export default {
           dataIndex: "department",
           key: "department",
         },
-        {
+        //  {
-          width: 50,
+         //   width: 50,
-          title: "岗位",
+         //   title: "岗位",
-          dataIndex: "post",
+         //   dataIndex: "post",
-          key: "post",
+          //  key: "post",
-        },
+        //  },
         {
           title: "项目",
           width: 50,