新增雾霾天气功能，优化经验看板布局

client/.env.dev

@@ -5,8 +5,8 @@ VITE_DEV=false
 
 # 请求路径
 # VITE_BASE_URL='http://10.10.9.113:48080'
-VITE_BASE_URL='http://10.10.10.7:18080'
-# VITE_BASE_URL='https://oa.zjugis.com:28080'
+# VITE_BASE_URL='http://10.10.10.7:18080'
+VITE_BASE_URL='https://oa.zjugis.com:28080'
 
 # 上传路径
 VITE_UPLOAD_URL='/infra/file/upload'

client/src/views/OaSystem/financialManagement/businessBoard/index.vue

@@ -12,115 +12,117 @@
         />
       </div>
     </div>
-    <el-row class="up-box" justify="space-between">
-      <el-col :span="15">
-        <div class="title">板块经营情况</div>
-        <el-table class="detail-table" :data="segmentData" style="width: 100%" max-height="400">
-          <el-table-column prop="segment" label="板块" />
-          <el-table-column prop="signAmount" label="本年签约" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.signAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="returnAmount" label="本年回款" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.returnAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="newAmount" label="本年开拓" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.newAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="receivableAmount" label="应收款" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.receivableAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="contractBalance" label="合同余额" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.contractBalance) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-      <el-col :span="8">
-        <div class="title">分包情况</div>
-        <el-table class="detail-table" :data="segmentData" style="width: 100%" max-height="400">
-          <el-table-column prop="segment" label="板块" />
-          <el-table-column prop="subAmount" label="总分包额" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.subAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="subPayed" label="已支付额" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.subPayed) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="subToPay" label="未支付额" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.subToPay) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
-    <el-row class="down-box" justify="space-between">
-      <el-col :span="15">
-        <div class="title">部门经营情况</div>
-        <el-table class="detail-table" :data="deptData" style="width: 100%" max-height="320">
-          <el-table-column prop="deptName" label="部门" />
-          <el-table-column prop="signAmount" label="本年签约" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.signAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="returnAmount" label="本年回款" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.returnAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="newAmount" label="本年开拓" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.newAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="receivableAmount" label="应收款" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.receivableAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="contractBalance" label="合同余额" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.contractBalance) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="memberCount" label="部门人数" />
-        </el-table>
-      </el-col>
-      <el-col :span="8">
-        <div class="title">人员经营情况</div>
-        <el-table class="detail-table" :data="personData" style="width: 100%" max-height="400">
-          <el-table-column prop="nickname" label="人员" />
-          <el-table-column prop="signAmount" label="本年签约" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.signAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="returnAmount" label="本年回款" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.returnAmount) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="newAmount" label="本年开拓" sortable>
-            <template #default="scope">
-              <span>{{ unitConversion(scope.row.newAmount) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
+    <div class="oa_sys_content">
+      <el-row class="up-box" justify="space-between">
+        <el-col :span="15" class="content_box">
+          <div class="title">板块经营情况</div>
+          <el-table class="detail-table" :data="segmentData" style="width: 100%">
+            <el-table-column prop="segment" label="板块" />
+            <el-table-column prop="signAmount" label="本年签约" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.signAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="returnAmount" label="本年回款" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.returnAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="newAmount" label="本年开拓" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.newAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="receivableAmount" label="应收款" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.receivableAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="contractBalance" label="合同余额" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.contractBalance) }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="8" class="content_box">
+          <div class="title">分包情况</div>
+          <el-table class="detail-table" :data="segmentData" style="width: 100%">
+            <el-table-column prop="segment" label="板块" />
+            <el-table-column prop="subAmount" label="总分包额" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.subAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="subPayed" label="已支付额" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.subPayed) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="subToPay" label="未支付额" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.subToPay) }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+      <el-row class="down-box" justify="space-between">
+        <el-col :span="15" class="content_box">
+          <div class="title">部门经营情况</div>
+          <el-table class="detail-table" :data="deptData" style="width: 100%">
+            <el-table-column prop="deptName" label="部门" />
+            <el-table-column prop="signAmount" label="本年签约" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.signAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="returnAmount" label="本年回款" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.returnAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="newAmount" label="本年开拓" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.newAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="receivableAmount" label="应收款" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.receivableAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="contractBalance" label="合同余额" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.contractBalance) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="memberCount" label="部门人数" />
+          </el-table>
+        </el-col>
+        <el-col :span="8" class="content_box">
+          <div class="title">人员经营情况</div>
+          <el-table class="detail-table" :data="personData" style="width: 100%">
+            <el-table-column prop="nickname" label="人员" />
+            <el-table-column prop="signAmount" label="本年签约" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.signAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="returnAmount" label="本年回款" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.returnAmount) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="newAmount" label="本年开拓" sortable>
+              <template #default="scope">
+                <span>{{ unitConversion(scope.row.newAmount) }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 <script lang="ts" setup>
@@ -194,8 +196,27 @@ const filterDept = (dataSource, showDeptList) => {
     font-size: 20px;
     color: #121518;
   }
+  .oa_sys_content {
+    height: calc(100% - 40px);
+    display: flex;
+    flex-direction: column;
+  }
+  .up-box {
+    max-height: 400px;
+  }
   .down-box {
     margin-top: 30px;
+    flex: 1;
+    overflow: hidden;
+  }
+  .content_box {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  .detail-table {
+    flex: 1;
+    overflow-y: auto;
   }
   :deep(.el-table__header) {
     .el-table__cell {

client/src/views/OaSystem/oaLayout/weather.vue

@@ -58,6 +58,8 @@ const getCurrentWeatherInfo = async (city: string): Promise<void> => {
     iconPath.value = 'clear_day.png'
   } else if (weatherTxt.indexOf('雾') !== -1) {
     iconPath.value = 'fog.png'
+  } else if (weatherTxt.indexOf('霾') !== -1) {
+    iconPath.value = 'haze.png'
   }
 }
 const getLocationByIp = async (): Promise<void> => {