From b0d57bf577285c6d90ddfc3243f1c425c295fca2 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 22 Dec 2022 09:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/ProjectAudit.vue | 10 ++-----
 src/views/examine/ProjectReviewed.vue   | 36 +++++++++++++++++++----
 src/views/projectcenter/SonProject.vue  |  4 +--
 src/views/research/ResearchManage.vue   | 39 ++++++++++++++++++++-----
 4 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue
index 94a76617..67115e24 100644
--- a/src/components/drawers/ProjectAudit.vue
+++ b/src/components/drawers/ProjectAudit.vue
@@ -63,16 +63,12 @@
                         :unCheckedValue="0"
                         :disabled="true"
                     ><span
-                        style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
+                        style="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>
diff --git a/src/views/examine/ProjectReviewed.vue b/src/views/examine/ProjectReviewed.vue
index b47e954f..61446229 100644
--- a/src/views/examine/ProjectReviewed.vue
+++ b/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="border-radius: 8px; height: 40px; margin-left: 5px"
+                style="width: 360px"
+                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] : "",
-        endTime: state.valueDate ? state.valueDate[1] : "",
+        beginTime: state.valueDate ? dayjs(state.valueDate[0]).format("YYYY-MM-DD") : "",
+        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%;
 
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 30aab7eb..c5171682 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/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>
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 00cbb91d..e970fa48 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -24,12 +24,17 @@
           ></a-select>
         </div>
         <div class="select">
-          <a-range-picker
-            v-model:value="projectTime"
-            separator="至"
-            :placeholder="['        开始时间', '        结束时间']"
-          />
-        </div>
+            <div class="select addTimeBox">
+              <div class="addTime">创建时间：</div>
+              <a-range-picker
+                v-model:value="projectTime"
+                style="width: 420px"
+                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;