Merge branch 'sdp-v1'

src/views/bigScreen/architectureBlueprintAnalysis/index.vue

@@ -4,12 +4,13 @@
  * @Autor: pan
  * @Autor: pan
  * @Date: 2024-05-28 18:59:07
  * @Date: 2024-05-28 18:59:07
  * @LastEditors: pan
  * @LastEditors: pan
- * @LastEditTime: 2024-05-29 09:37:21
+ * @LastEditTime: 2024-06-03 08:28:59
 -->
 -->
 <template>
 <template>
   <div class="w-100 h-100 p-10 architectureBlueprintAnalysis">
   <div class="w-100 h-100 p-10 architectureBlueprintAnalysis">
     <div class="filter-year m-b-10">
     <div class="filter-year m-b-10">
       <el-date-picker
       <el-date-picker
+        :editable="false"
         v-model="year"
         v-model="year"
         format="yyyy 年"
         format="yyyy 年"
         value-format="yyyy"
         value-format="yyyy"

src/views/bigScreen/digitalizeBuildAnalysis/chartOptions.mixins.js

@@ -107,9 +107,9 @@ const chartOptions = {
           {
           {
             type: 'value',
             type: 'value',
             name: '个',
             name: '个',
-            min: 0,
-            max: 100,
-            interval: 20,
+            // min: 0,
+            // max: Math.max(...this.buildingPrjNumList, ...this.prjNumList),
+            // interval: 20,
             axisLabel: {
             axisLabel: {
               formatter: '{value}',
               formatter: '{value}',
             },
             },
@@ -123,9 +123,9 @@ const chartOptions = {
           {
           {
             type: 'value',
             type: 'value',
             name: '万元',
             name: '万元',
-            min: 0,
-            max: 700,
-            interval: 100,
+            // min: 0,
+            // max: Math.max(...this.buildingPrjSumList, ...this.prjSumList),
+            // interval: Math.max(...this.buildingPrjNumList) / 10,
             axisLabel: {
             axisLabel: {
               formatter: '{value}',
               formatter: '{value}',
             },
             },

src/views/bigScreen/digitalizeBuildAnalysis/index.vue

@@ -4,12 +4,13 @@
  * @Autor: pan
  * @Autor: pan
  * @Date: 2024-05-27 14:10:12
  * @Date: 2024-05-27 14:10:12
  * @LastEditors: pan
  * @LastEditors: pan
- * @LastEditTime: 2024-05-29 09:03:37
+ * @LastEditTime: 2024-06-03 20:58:45
 -->
 -->
 <template>
 <template>
   <div class="w-100 h-100 p-10 digitalizeBuildAnalysis">
   <div class="w-100 h-100 p-10 digitalizeBuildAnalysis">
     <div class="filter-year m-b-10">
     <div class="filter-year m-b-10">
       <el-date-picker
       <el-date-picker
+        :editable="false"
         v-model="year"
         v-model="year"
         format="yyyy 年"
         format="yyyy 年"
         value-format="yyyy"
         value-format="yyyy"
@@ -233,8 +234,8 @@ export default {
             this.prjNumList.push(v.totalNum || 0)
             this.prjNumList.push(v.totalNum || 0)
           })
           })
           res[1].data.forEach((v) => {
           res[1].data.forEach((v) => {
-            this.prjSumList.push(v.amount || 0)
-            this.buildingPrjSumList.push(v.nowAmount || 0)
+            this.prjSumList.push(v.amount / 10000 || 0)
+            this.buildingPrjSumList.push(v.nowAmount / 10000 || 0)
           })
           })
         })
         })
         .catch((err) => {
         .catch((err) => {
@@ -269,7 +270,7 @@ export default {
         year: this.year,
         year: this.year,
         orgCodes: this.checkList.join(','),
         orgCodes: this.checkList.join(','),
       }
       }
-      this.$refs.chart5.chart.showLoading({
+      this.$refs.chart5?.chart.showLoading({
         text: '加载中...',
         text: '加载中...',
         color: SystemConfig.DEFAULT_PRIMARY_COLOR,
         color: SystemConfig.DEFAULT_PRIMARY_COLOR,
         textColor: '#000',
         textColor: '#000',
@@ -321,7 +322,7 @@ export default {
   border-radius: 5px;
   border-radius: 5px;
 }
 }
 .card-item {
 .card-item {
-  padding: 20px 30px;
+  padding: 20px 10px;
   box-sizing: border-box;
   box-sizing: border-box;
   position: relative;
   position: relative;
   width: 25%;
   width: 25%;
@@ -333,7 +334,7 @@ export default {
   }
   }
   .card-value {
   .card-value {
     color: #ffffff;
     color: #ffffff;
-    font-size: 28px;
+    font-size: 26px;
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     justify-content: flex-end;
     justify-content: flex-end;