songxy hai 1 ano
pai
achega
a950475364

+ 1 - 0
client/src/main.ts

@@ -63,6 +63,7 @@ window.addEventListener('message', (evt) => {
     }
     if (eData.msgreceiveevent === 'updateHandleCenterCorner') {
       subscribe.emit('updateHandleCenterCorner', null)
+      return;
     }
     if (payload && payload['title']) {
       const lRoutePayload = LinkRouteMap[payload['title']]

+ 2 - 2
client/src/router/modules/remaining.ts

@@ -370,7 +370,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
         }
       },
       {
-        path: 'oaSystem/DeptCenter/dailyStatistic',
+        path: 'dailyStatistic2',
         component: () => import('@/views/OaSystem/personnelManagement/dailyStatistic/index.vue'),
         name: 'dailyStatistic',
         meta: {
@@ -378,7 +378,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
         }
       },
       {
-        path: 'oaSystem/DeptCenter/weeklyStatistic',
+        path: 'weeklyStatistic2',
         component: () => import('@/views/OaSystem/personnelManagement/weeklyStatistic/index.vue'),
         name: '"DeptWeeklyStatistic"',
         meta: {

+ 0 - 2
client/src/views/OaSystem/mineCenter/components/leftInfo.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="mineCenterLeft">
     <img class="leftImgs" src="@/assets/imgs/OA/mine/zsyg.png" alt="" />
-    <!-- <img class="leftImgs" src="@/assets/imgs/OA/mine/syyg.png" alt="" />
-    <img class="leftImgs" src="@/assets/imgs/OA/mine/sxyg.png" alt="" /> -->
 
     <div class="headImgs">
       <ElAvatar :src="avatar" alt="" class="userIcon" />

+ 1 - 2
client/src/views/OaSystem/oaLayout/weather.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="weatherBox">
+  <div class="weatherBox" v-if="cityName">
     <div class="tqBox">
       <img :src="getAssetsFile(iconPath)" alt="" />
       <div>
@@ -18,7 +18,6 @@
 </template>
 <script setup lang="ts">
 import axios from 'axios'
-import moment from 'moment'
 
 const cityName = ref<string>()
 const weather = ref<string>()

+ 2 - 8
client/src/views/OaSystem/personnelManagement/CompletionRate/index.vue

@@ -211,16 +211,10 @@ const handleView = (row) => {
   // 还需判断是跳转周报还是日报
   if (row.reportType == 'weekly') {
     push(
-      `/oaSystem/DeptCenter/weeklyStatistic?deptId=${row.deptId}&date=${moment(
-        selectDate.value
-      ).format('YYYY-MM')}`
+      `/weeklyStatistic2?deptId=${row.deptId}&date=${moment(selectDate.value).format('YYYY-MM')}`
     )
   } else {
-    push(
-      `/oaSystem/DeptCenter/dailyStatistic?deptId=${row.deptId}&date=${moment(
-        selectDate.value
-      ).format('YYYY-MM')}`
-    )
+    push(`/dailyStatistic2?deptId=${row.deptId}&date=${moment(selectDate.value).format('YYYY-MM')}`)
   }
 }
 

+ 6 - 1
client/src/views/OaSystem/projectCenter/projectBook/deptProject.vue

@@ -99,7 +99,12 @@
           <el-table-column label="序号" width="60">
             <template #default="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="xmmc" label="项目名称" />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="xmmc"
+            label="项目名称"
+            :min-width="250"
+          />
           <el-table-column prop="xmbh" label="项目编号" width="180" />
           <el-table-column prop="xzqmc" label="行政区" width="100">
             <template #default="scope">

+ 6 - 1
client/src/views/OaSystem/projectCenter/projectBook/myProject.vue

@@ -107,7 +107,12 @@
           <el-table-column label="序号" width="60">
             <template #default="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
-          <el-table-column :show-overflow-tooltip="true" prop="xmmc" label="项目名称" />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="xmmc"
+            label="项目名称"
+            :min-width="250"
+          />
           <el-table-column prop="xmbh" label="项目编号" width="180" />
           <el-table-column prop="xzqmc" label="行政区" width="100">
             <template #default="scope">

+ 6 - 1
client/src/views/OaSystem/projectCenter/projectBook/projectBook.vue

@@ -85,7 +85,12 @@
             <template #default="scope">{{ scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column :show-overflow-tooltip="true" prop="xmbh" width="180" label="项目编号" />
-          <el-table-column :show-overflow-tooltip="true" prop="xmmc" label="项目名称" />
+          <el-table-column
+            :show-overflow-tooltip="true"
+            prop="xmmc"
+            label="项目名称"
+            :min-width="250"
+          />
           <el-table-column prop="lxsj" label="立项时间" width="140" />
           <el-table-column prop="zrbm" label="责任部门" :show-overflow-tooltip="true" width="200" />
           <el-table-column prop="xmjl" label="项目经理" width="120" />

+ 1 - 1
client/src/views/OaSystem/projectCenter/projectDetail/components/xmxx/index.vue

@@ -193,7 +193,7 @@
             <h4><i class="icon"></i>产值信息</h4>
             <table>
               <tr>
-                <td class="th">是否签合同:</td>
+                <td class="th">是否需要签合同:</td>
                 <td>{{ projectDetail['isSign'] === 0 ? '否' : '是' }}</td>
                 <td class="th">本项目成本(元):</td>
                 <td>{{ projectDetail['xmcbys'] ?? 0 }}</td>

+ 2 - 0
client_h5/.env.dev

@@ -4,3 +4,5 @@ VITE_BASE_URL='http://10.10.10.7:18080'
 
 # File上传路径
 VITE_FILE_BASE_URI='/admin-api/infra/file'
+
+VITE_AUTHORIZATION='2c68e8c6fb7f43e59fc2fea5634f7a60'