feat:合并

src/components/drawers/AddCase.vue

@@ -374,6 +374,7 @@ export default {
     };
     //搜索案例列表
     const searchList = () => {
+      state.selectedRowKeys = [];
       if (state.inputV1 !== "") {
         getAllCaseText();
       } else {

src/components/drawers/AddOnline.vue

@@ -692,6 +692,8 @@ export default {
     //搜索在线列表
     const searchList = () => {
       if (state.inputV1 || state.selectV) {
+        state.selectedRowKeys = [];
+        state.addOnlineList = [];
         getAllOnlineText();
       } else {
         resetOnline();

src/components/drawers/AddProject.vue

@@ -374,9 +374,11 @@ export default {
     //   this.selectedRows = selectedRows;
     // };
     const searchProjectList = () => {
+      state.selectedRowKeys = [];
       getAllProjText();
     };
     const resetProjectList = () => {
+      state.selectedRowKeys = [];
       state.inputV1 = "";
       state.inputV2 = "";
       state.inputV3 = "";

src/components/drawers/AssessmentAll.vue

@@ -9,7 +9,7 @@
         maxlength="20"
       />
     </div>
-    <div class="btns" @click="getAllInvistText">
+    <div class="btns" @click="searchList">
       <div class="search"></div>
       <div class="btnText">搜索</div>
     </div>
@@ -144,14 +144,19 @@ export default {
       assessmentId: null,
       assessmentName: null,
     });
+    const afterVisibleChange=()=>{
+
+    }
     const closeDrawer = () => {
       ctx.emit("update:assessmentVisible", false);
+     
     };
     //清空所选
     const clearLine = () => {
       console.log("state.selectedRowKeys", state.selectedRowKeys);
       state.selectedRowKeys = [];
       state.addOnlineList = [];
+      state.inputV1 = "";
     };
     const queryInfo = () => {
       //if (props.edit) {
@@ -185,8 +190,8 @@ export default {
               assessmentId: info.assessmentId,
               name: info.assessmentName,
               num: num,
-              creator: info.createUser ? info.createUser : "-",
+              creator: info.createUserName ? info.createUserName : "-",
-              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+              time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
             };
             //更新讨论信息
             state.assessment = obj;
@@ -277,8 +282,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
+          creator: value.createUserName ? value.createUserName : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });
@@ -287,6 +292,7 @@ export default {
     };
     //获取全部评估信息接口
     const getAllInvistText = () => {
+     
       api
         .queryAssessmentDetailList({
           assessmentName: state.inputV1,
@@ -308,9 +314,15 @@ export default {
           // state.createLoading = false;
         });
     };
+ //重置评估信息
+  const searchList = () => {
+      state.selectedRowKeys = [];
   
+      getAllInvistText();
+    };
     //重置评估信息
     const resetInvist = () => {
+      state.selectedRowKeys = [];
       state.inputV1 = "";
       getAllInvistText();
     };
@@ -321,10 +333,7 @@ export default {
         state.selectedRowKeys,
         state.assessmentId
       );
-      if (!state.assessmentId) {
+      state.inputV1 = "";
-        clearLine();
-      }
-
       queryInfo();
       getAllInvistText();
     });
@@ -336,6 +345,7 @@ export default {
           state.assessment = null;
         } else {
           queryInfo();
+          console.log("dd");
         }
         console.log("props.assessmentId", props.assessmentId);
       },
@@ -353,6 +363,8 @@ export default {
       resetInvist,
       handelChangePage,
       queryInfo,
+      searchList,
+      afterVisibleChange,
     };
   },
 };

src/components/drawers/AssessmentList.vue

@@ -202,8 +202,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
+          creator: value.createUserName ? value.createUserName : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });

src/components/drawers/EvList.vue

@@ -243,6 +243,7 @@ export default {
     };
     //搜索测评列表
     const searchList = () => {
+      state.selectedRowKeys = [];
       if (state.inputV1 !== "") {
         getAllEvalText();
       } else {

src/components/drawers/ProjectAudit.vue

@@ -63,16 +63,12 @@
                         :unCheckedValue="0"
                         :disabled="true"
                     ><span
-                        style="
+                        style="width: 100%;color: rgba(109, 117, 132, 1);font-size: 14px;"
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
                     >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
                     ></a-switch>
                   </div>
                 </div>
-                <div class="set_content">
+                <div class="set_content" v-if="projectInfo.boeFlag">
                   <div class="setc_name"><span>是否BOEU实施：</span></div>
                   <div class="setc_main">
                     <a-switch
@@ -83,7 +79,7 @@
                     ></a-switch>
                   </div>
                 </div>
-                <div class="set_content">
+                <div class="set_content" v-if="projectInfo.remark ">
                   <div class="setc_name"><span>项目说明：</span></div>
                   <div class="setc_main">
                     <span style="color: #999999">{{ projectInfo.remark }}</span>

src/components/drawers/SelFacet.vue

@@ -527,6 +527,7 @@ export default {
     };
     //搜索
     const search = () => {
+      state.selectedRows = [];
       //重新获取列表
       getClassList();
     };

src/components/drawers/SelectTest.vue

@@ -245,6 +245,7 @@ export default {
     // };
     //获取选择考试列表
     const getManageList = () => {
+      state.selectedRowKeys = [];
       let obj = {
         keyWord: state.inputPname,
         pageIndex: state.currentPage,

src/components/student/CommonStudent.vue

@@ -507,6 +507,7 @@ const auditRowSelection = computed(() => ({
 }));
 const closeDrawer = () => {
   visiable.value = false;
+  stuData.value = [];
 };
 const openDrawer = () => {
   visiable.value = true;
@@ -574,6 +575,7 @@ const auditChangePagination = (page) => {
 const resetStu = () => {
   deleteDepSelect();
   nameSearch.value = { keyword: "", page: 1, pageSize: 10 };
+
 };
 //清空选择部门信息
 const deleteDepSelect = () => {

src/components/student/TableStudent.vue

@@ -6,7 +6,7 @@
       style="padding-left: 20px; margin-right: 0px"
     >
       <a-col>
-        <a-form-item title="姓名：" @click="getStuList">
+        <a-form-item title="姓名：" >
           <a-input
             class="cus-input"
             v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button class="cus-btn" style="width: 100px">
+        <a-button class="cus-btn" style="width: 100px"  @click="getStuList">
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -149,6 +149,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
+import { message } from "ant-design-vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -222,7 +223,7 @@ const tableData = ref({
 });
 
 const stuRowSelection = computed(() => ({
-  columnWidth: 10,
+  columnWidth: 20,
   selectedRowKeys: stuSelectKeys.value,
   onChange: onStuSelectChange,
   preserveSelectedRowKeys: true,
@@ -264,9 +265,16 @@ function getStuList() {
   });
 }
 
-function reset() {}
+function reset() {
+  tableParam.value.studentName="";
+}
 
 function bathDel() {
+  if( stuSelectKeys.value &&
+    stuSelectKeys.value.length == 0){
+      message.destroy();
+    return message.warning("请先选中学员");
+  }
   stuSelectKeys.value &&
     stuSelectKeys.value.length &&
     delStudentList({

src/views/examine/ProjectReviewed.vue

@@ -49,16 +49,21 @@
                 placeholder="请输入创建人"
               />
             </div>
+     
+
             <div class="inpbox1">
+            <div class="select addTimeBox">
+              <div class="addTime">审核时间：</div>
               <a-range-picker
                 v-model:value="valueDate"
-                show-time
+                style="width: 360px"
-                style="border-radius: 8px; height: 40px; margin-left: 5px"
+                format="YYYY-MM-DD"
+                separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
-                format="YYYY/MM/DD HH:mm"
               />
             </div>
           </div>
+          </div>
         </div>
         <div class="tmplh_btn">
           <div class="btn btn1" @click="getProjList">
@@ -144,6 +149,7 @@
 import { onMounted, reactive, toRefs } from "vue";
 import { auditedlist } from "../../api/indexAudit";
 import * as moment from "moment";
+import dayjs from "dayjs";
 
 export default {
   name: "ProjectViewed",
@@ -324,8 +330,8 @@ export default {
     const getProjList = () => {
       state.loading=true
       let objn = {
-        beginTime: state.valueDate ? state.valueDate[0] : "",
+        beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
-        endTime: state.valueDate ? state.valueDate[1] : "",
+        endTime: state.valueDate ? dayjs(state.valueDate[1]).format("YYYY-MM-DD") : "",
         createName: state.valuecreater,
         manager: state.valuename,
         name: state.valueproj,
@@ -408,6 +414,7 @@ export default {
 </script>
 <style lang="scss">
 .projAuditModal {
+  
   .ant-modal {
     width: 816px !important;
     min-height: 420px !important;
@@ -539,7 +546,26 @@ export default {
 
 .projectviewed {
   width: 100%;
+  .addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
 
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+
+  .ant-picker {
+    padding-left: 85px;
+  }
+
+  .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px;
+  }
+}
   .tmpl {
     width: 100%;
 

src/views/learningpath/LevelAddDetail.vue

@@ -1516,7 +1516,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          width: 60,
+          width: 160,
           align: "left",
           ellipsis: true,
           className: "classify",

src/views/projectcenter/LibraryAdd.vue

@@ -332,7 +332,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-
+<!--
         <a-tab-pane key="3" tab="项目积分">
           <div class="split"></div>
           <div class="projectscore">
@@ -478,6 +478,8 @@
             </div>
           </div>
         </a-tab-pane>
+-->
+
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>

src/views/projectcenter/SonProject.vue

@@ -175,7 +175,7 @@
             </a-radio-group>
           </div>
         </div>
-        <div class="name name2">
+        <div class="name name2" v-if="courseSyncFlag">
           <div class="namebox">
             <div class="inname">同步学习记录</div>
           </div>
@@ -194,7 +194,7 @@
             >
           </div>
         </div>
-        <div class="name name2">
+        <div class="name name2" v-if="projectInfo.remark">
           <div class="namebox">
             <div class="inname" style="margin-top: 13px">项目说明</div>
           </div>

src/views/research/ResearchManage.vue

@@ -24,12 +24,17 @@
           ></a-select>
         </div>
         <div class="select">
-          <a-range-picker
+            <div class="select addTimeBox">
-            v-model:value="projectTime"
+              <div class="addTime">创建时间：</div>
-            separator="至"
+              <a-range-picker
-            :placeholder="['        开始时间', '        结束时间']"
+                v-model:value="projectTime"
-          />
+                style="width: 420px"
-        </div>
+                format="YYYY-MM-DD"
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
+            </div>
+          </div>
         <div style="display: flex; margin-bottom: 20px">
           <div class="btn btn1" @click="handleSearch">
             <div class="search"></div>
@@ -414,7 +419,7 @@ export default {
       if (state.projectTime) {
         startTime = toDate(
           new Date(state.projectTime[0].$d).getTime() / 1000,
-          "Y-M-D"
+          "Y-M-D hh:mm"
         );
         endTime = toDate(
           new Date(state.projectTime[1].$d).getTime() / 1000,
@@ -865,6 +870,26 @@ export default {
   display: block;
   clear: both;
 }
+.addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+
+  .ant-picker {
+    padding-left: 85px;
+  }
+
+  .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px;
+  }
+}
 .out {
   //display: flex;
   display: block;