修改主页的日历

oa-ui/src/components/Calendar/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 10:00:26
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-07 10:14:41
+ * @LastEditTime: 2024-03-12 13:54:04
 -->
 
 <template>
@@ -67,18 +67,18 @@ export default {
       };
       let calendar = document.querySelector('.calendar');
       const month_names = [
-        'January',
-        'February',
-        'March',
-        'April',
-        'May',
-        'June',
-        'July',
-        'August',
-        'September',
-        'October',
-        'November',
-        'December',
+        '一月',
+        '二月',
+        '三月',
+        '四月',
+        '五月',
+        '六月',
+        '七月',
+        '八月',
+        '九月',
+        '十月',
+        '十一月',
+        '十二月',
       ];
       let month_picker = document.querySelector('#month-picker');
       const dayTextFormate = document.querySelector('.day-text-formate');
@@ -238,12 +238,12 @@ export default {
   height: max-content;
   position: relative;
   display: flex;
-  padding: 2% 0px 0px 0px;
+  // padding: 2% 0px 0px 0px;
   justify-content: center;
-  top: 10%;
-  right: 0%;
-  width: 100%;
-  height: 100%;
+  // top: 10%;
+  // right: 0%;
+  // width: 100%;
+  // height: 100%;
 }
 
 .calendar {
@@ -333,7 +333,7 @@ export default {
 }
 
 .year-change {
-  height: 30px;
+  // height: 30px;
   width: 30px;
   border-radius: 50%;
   display: grid;
@@ -437,7 +437,7 @@ export default {
   font-family: Dubai Light, Century Gothic;
   position: relative;
   display: inline;
-  top: 140px;
+  top: 74px;
   justify-content: center;
 }
 

oa-ui/src/views/flowable/form/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-11 16:55:39
+ * @LastEditTime: 2024-03-12 09:46:54
 -->
 <!--
  * @Author: wrh
@@ -93,13 +93,13 @@
               </el-row>
               <el-divider></el-divider>
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px"  v-if="taskName != '工会审核'">
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
                   :disabled="taskName != '部门审核'">
                 </el-input>
               </el-form-item>
               <!-- 分管审核意见 -->
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px">
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px"  v-if="taskName != '工会审核'">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
@@ -415,4 +415,11 @@ export default {
   width: 100px;
   background: #E1F3D8;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #121212 !important;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner {
+  color: #121212 !important;
+}
 </style>

oa-ui/src/views/flowable/task/todo/detail/flowview.vue

@@ -56,7 +56,7 @@ export default {
       const self = this
       try {
         await self.bpmnViewer.importXML(flowData.xmlData);
-        // self.fitViewport()
+        self.fitViewport()
         if (flowData.nodeData !==undefined && flowData.nodeData.length > 0 ) {
           self.fillColor(flowData.nodeData)
         }

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-07 10:13:48
+ * @LastEditTime: 2024-03-12 15:59:04
 -->
 
 <template>
@@ -17,9 +17,12 @@
           <div class="username">
             {{ user.nickName }}
           </div>
+          <div class="user-info">
+            
+          </div>
         </div>
       </el-col>
-      <el-col :span="15" :xs="24">
+      <el-col :span="16" :xs="24">
         <div class="header">快捷入口</div>
         <div class="nav-wrapper">
           <div class="nav-item" v-for="nav in navItem" @click="goToPath(nav.id)">
@@ -32,18 +35,29 @@
           </div>
         </div>
       </el-col>
+      
     </el-row>
-    <el-row>
+    <el-row :gutter="20">
       <el-col :span="8">
         <div class="header">日历</div>
-        <div class="calendar">
-          <Calendar></Calendar>
-          <!-- <el-calendar v-model="times">
-          </el-calendar> -->
+        <div class="calendar-warpper">
+          <!-- <Calendar></Calendar> -->
+          <el-calendar v-model="times">
+          </el-calendar>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="header">公告</div>
+        <div class="notice-content">
+          
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div class="header">项目流转</div>
+        <div class="project-content">
+          
         </div>
       </el-col>
-      <el-col></el-col>
-      <el-col></el-col>
     </el-row>
   </div>
 </template>
@@ -273,14 +287,47 @@ export default {
     font-weight: bold;
     font-family: '微软雅黑';
   }
+  .user-info{
+    display: grid;
+    
+  }
+}
+.notice-content{
+  width: 100%;
+  height: 400px;
+  background-color: #ffffff;
+  border-radius: 15px;
 }
 
-
-.calendar {
-  // height: 300px;
+.calendar-warpper {
+  width: 100%;
+  height: 400px;
+  background-color: #ffffff;
+  border-radius: 15px;
+}
+.project-content{
+  width: 100%;
+  height: 400px;
+  background-color: #ffffff;
+  border-radius: 15px;
 }
 
 ::v-deep .el-calendar-table .el-calendar-day {
-  height: 32px;
+  height: 39px;
+  text-align: center;
+  line-height: 22px;
+}
+::v-deep .el-calendar__body{
+  padding: 15px 31px 10px;
+}
+::v-deep .el-calendar__header{
+  padding: 20px;
+}
+::v-deep .el-calendar-table td.is-today{
+  background-color: #1890ff;
+  color: #ffffff;
+}
+::v-deep .el-calendar-table td.is-selected{
+  color: #242d42;
 }
 </style>

oa-ui/src/views/oa/car/index.vue

@@ -41,7 +41,11 @@
       <el-table-column label="品牌" align="center" prop="brand" />
       <el-table-column label="车型" align="center" prop="series" />
       <el-table-column label="购置时间" align="center" prop="acquisitionTime" />
-      <el-table-column label="是否为租车" align="center" prop="isRent" >{{ idRent == "0" ? "否" : "是" }}</el-table-column>
+      <el-table-column label="是否为租车" align="center" prop="isRent" >
+        <template slot-scope="scope">
+          {{ scope.row.isRent == "0" ? "否" : "是" }}
+        </template>
+      </el-table-column>
       <el-table-column label="总价" align="center" prop="cost">
         <template slot-scope="scope">
           {{ scope.row.cost + '万元' }}