From 171ad0af18b27715f0eff4945e4e35fc7dbbd4b9 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 13 Dec 2022 14:14:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=88=97=E8=A1=A8=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=AF=95=E5=8D=B7=E5=88=97=E8=A1=A8=EF=BC=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=88=86=E7=B1=BB=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelectTest.vue        | 36 +++++++++++---------
 src/components/project/NameInput.vue         |  2 +-
 src/views/courselibrary/CoursewareManage.vue |  6 +++-
 src/views/examine/CourseReviewed.vue         | 25 ++++++++++++--
 src/views/examine/CourseReviewedN.vue        | 15 ++++----
 src/views/learningpath/LearningPath.vue      | 25 +++++++++-----
 src/views/projectcenter/ProjectManage.vue    |  2 +-
 src/views/research/ResearchManage.vue        |  2 ++
 8 files changed, 77 insertions(+), 36 deletions(-)

diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index fcdeffe6..b12a379e 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/src/components/drawers/SelectTest.vue
@@ -162,43 +162,47 @@ export default {
     const tableDataFunc = () => {
       {
         const columns = [
-          {
-            title: "序号",
-            dataIndex: "paperId",
-            key: "paperId",
-            width: 90,
-            align: "center",
-            className: "h head",
-          },
+         // {
+           //  title: "序号",
+            // dataIndex: "paperId",
+            // key: "paperId",
+            // width: 90,
+           //  align: "center",
+            // className: "h head",
+         //  },
           {
             title: "试卷名称",
             dataIndex: "testName",
             key: "testName",
-            width: 110,
+            width: "40%",
             align: "center",
             className: "h head",
+            ellipsis: true,
           },
           {
             title: "随机模式",
             dataIndex: "paperMode",
             key: "paperMode",
-            width: 110,
+            width: "20%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
           {
             title: "创建人",
             dataIndex: "sysCreateBy",
             key: "sysCreateBy",
-            width: 90,
+            width: "20%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
           {
             title: "最近更新时间",
             dataIndex: "sysUpdateTime",
             key: "sysUpdateTime",
-            width: 150,
+            ellipsis: true,
+            width: "20%",
             align: "center",
             className: "h",
           },
@@ -248,7 +252,7 @@ export default {
         published: true,
       };
       api
-        .queryExaminationList(obj)
+        .queryExaminationPaperList(obj)
         .then((data) => {
           // getTableDate(res.data.data);
           //**   表格repaint   */
@@ -257,10 +261,10 @@ export default {
           let obj = {
           key: index + 1,
           sysCreateBy: value.sysCreateBy,
-          paperId: index + 1,
+          paperId:value.id,
           testName: value.testName,
-          paperMode: value.randomMode ? "是" : "否",
-          sysUpdateTime: value.sysUpdateTime,
+          paperMode: value.paperMode==1?"固定试卷":"随机",
+          sysUpdateTime:value.sysUpdateTime,
           id:value.id,
         };
         array.push(obj);
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index 6f92741c..d898b85a 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -73,7 +73,7 @@ function validateProName() {
     display: inline-block;
     width: 99%;
     min-width: 0;
-    padding: 0px 17px;
+    padding: 0px 8px;
     color: rgba(0, 0, 0, 0.85);
     font-size: 14px;
     line-height: 1.5715;
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 930dc096..6a1db8f9 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1967,6 +1967,7 @@
               </a-checkbox>
             </div>
           </div>
+          
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">签到设置</span>
@@ -1978,12 +1979,15 @@
                     是否允许未报名的学员签到
                   </span>
                 </a-radio>
+                <!--
                 <a-radio :value="1" @click="clear_xjkkradioV1">
                   <span style="color: #6d7584">签到是否需要口令</span>
-                </a-radio>
+                </a-radio>-->
               </a-radio-group>
             </div>
           </div>
+
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index b5d214fc..9babe163 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -14,6 +14,7 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
+            <!--
               <a-select
                 v-model:value="valueproj"
                 value-key="value"
@@ -21,7 +22,27 @@
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
                 ]"
-              />
+              />-->
+              <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="valueproj"
+              show-search
+       
+              :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>
+                <template v-else>{{ title }}</template>
+              </template>
+            </a-tree-select>
             </div>
             <div class="inpbox1">
               <a-input
@@ -140,7 +161,7 @@ export default {
   setup() {
     const state = reactive({
       calssifyList: [], //分类字典
-      valueproj: "",
+      valueproj:null,
       valuecreater: "",
       valuename: "",
       currentPage: 1,
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 460796df..635e46a8 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -16,7 +16,7 @@
             <div class="inpbox1">
             <!--
               <a-select
-                v-model:value="categoryId"
+                v-model:value="valueproj"
                 :options="[
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
@@ -28,11 +28,12 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="categoryId"
+              v-model:value="valueproj"
               show-search
+        
               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               placeholder="请选择内容分类"
-              allow-clear
+        
               tree-default-expand-all
               :tree-data="options2222"
             >
@@ -213,7 +214,7 @@ export default {
         },
       ],
       calssifyList: [], //分类字典
-      categoryId: "",
+      valueproj:null,
       valuecreater: "",
       valuename: "",
       // currentFacePage: 1,
@@ -488,7 +489,7 @@ export default {
       state.loading=true
       let objn = {
         auditStatus: 1,
-        categoryId: state.categoryId,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -557,7 +558,7 @@ export default {
     const searchList = () => {
       let objn = {
         auditStatus: 1,
-        categoryId: state.categoryId,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -622,7 +623,7 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      state.categoryId = "";
+      state.valueproj = "";
       state.valuecreater = null;
       state.valuename = null;
       getFaceList();
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 4257ad9c..8c76fb9d 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -203,6 +203,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
+            
               <div
                 @click="chooseImg(item)"
                 v-for="(item, index) in imgData"
@@ -331,6 +332,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
+       
               <div
                 @click="chooseImg2(item)"
                 v-for="(item, index) in imgData"
@@ -865,7 +867,7 @@ export default {
     const handleOut1 = () => {
       state.pathName = "";
       state.pathBg = "";
-      state.pathBgId = "";
+      state.pathBgId =1;
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -1620,14 +1622,21 @@ export default {
             state.organizationSelectId = detail.organizationId;
             state.pathIntro = detail.remark;
             state.editPathId = id;
-            // console.log("state.imgData", state.imgData);
-            let arr = imgData;
-            for (let i = 0; i < arr.length; i++) {
-              // console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
-              if (arr[i].dictValue === state.pathBg) {
-                state.pathBgId = arr[i].dictCode;
+            let arr = imgData.value;
+            arr.forEach((item) => {
+              if (item.dictValue === state.pathBg) {
+                state.pathBgId = item.dictCode;
+
               }
-            }
+            });
+
+            //for (let i = 0; i < arr.length; i++) {
+             //  console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
+            //  if (arr[i].dictValue === state.pathBg) {
+             //   state.pathBgId = arr[i].dictCode;
+
+           //   }
+          //  }
           }
         })
         .catch((err) => {
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index f641a035..aaab9c1e 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -44,7 +44,7 @@
           ></a-select>
         </div>
         <div class="select addTimeBox">
-          <div class="addTime">创建时间：</div>
+          <div class="addTime">项目起止时间：</div>
           <a-range-picker
               v-model:value="searchParam.valueDate"
               :show-time="{
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index c4683b86..032d52ea 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -426,6 +426,7 @@ export default {
             <div class="operation">
               {value.state === "2" ? (
                 <div class="fb">
+                 { /** 
                   <div class="jc"
                     onClick={() => {
                       handleToManagepage(value, "/managepage");
@@ -433,6 +434,7 @@ export default {
                   >
                     管理
                   </div>
+              */  }
                   <div
                     class="jc"
                     onClick={() => {