1
0
LAPTOP-U5GOA5HA\zz 1 жил өмнө
parent
commit
bffbfa6a30

+ 4 - 4
app/src/components/HiddenDangerTotal.vue

@@ -25,15 +25,15 @@ export default {
       <linear-text :text="number" fontSize="22px" style="display: inline-block; margin-bottom: 15px; margin-left: 16px; width: 100%; text-align: left;"></linear-text>
       <linear-text
         :text="label"
-        fontSize="12px"
-        style="font-family: 'YouSheBiaoTiHei'; display: inline-block; "
+        fontSize="14px"
+        style=" display: inline-block; "
       ></linear-text>
      </div>
     </div>
     <linear-text
       :text="unit"
-      fontSize="12px"
-      style="font-family: 'YouSheBiaoTiHei';display: inline-block; margin-top: 10px; "
+      fontSize="14px"
+      style="display: inline-block; margin-top: 10px; "
     ></linear-text>
   </div>
 </template>

+ 4 - 4
app/src/mixin/unit.js

@@ -122,12 +122,12 @@ const punishmentMixin = {
 					label: "一般风险",
 				},
 				{
-					value: "低风险",
-					label: "低风险",
+					value: "低风险(蓝色)",
+					label: "低风险(蓝色)",
 				},
 				{
-					value: "低风险(色)",
-					label: "低风险(色)",
+					value: "低风险(绿色)",
+					label: "低风险(绿色)",
 				},
 			],
 			//起火原因

+ 1 - 1
app/src/views/Home/components/BasicInfoModalContent.vue

@@ -317,7 +317,7 @@ export default {
         </div>
         <!-- 风险等级 -->
         <div>
-          <el-select v-model="params.fxdj" placeholder="风险等级">
+          <el-select v-model="params.fxdjYs" placeholder="风险等级">
             <el-option
               :value="item.value"
               :label="item.lable"

+ 10 - 6
app/src/views/Home/components/FireIndex/Chart.vue

@@ -31,9 +31,11 @@ export default {
     }
   },
   mounted() {
-    this.chart = echarts.init(this.$refs.chart)
-    // 初始化表格
-    this.init()
+    if (this.$refs.chart) {
+      this.chart = echarts.init(this.$refs.chart)
+      // 初始化表格
+      this.init()
+    }
   },
   watch: {
     items: {
@@ -47,18 +49,20 @@ export default {
     },
     label: {
       handler() {
-        this.chart.setOption({
+        this.$nextTick(() => {
+        this.chart?.setOption({
           xAxis: {
             data: this.label
           }
         });
+      })
       },
       deep: true
     }
   },
   methods: {
     init() {
-      this.chart.setOption({
+      this.chart?.setOption({
           tooltip: {
             trigger: "axis",
             formatter: "{b} : {c}",
@@ -152,7 +156,7 @@ export default {
       // 重载数据
       if (this.chart) {
         const max = this.items.map(item => parseInt(item.value || 0)).sort((a,b) => b - a)
-        this.chart.setOption({
+        this.chart?.setOption({
           yAxis: {
             min: 0,
             max: function (value) {

+ 1 - 1
app/src/views/Home/components/RiskWarning.vue

@@ -53,7 +53,7 @@
           }}</span>
         </span>
       </li>
-      <li @click="showStice('低风险')">
+      <li @click="showStice('低风险(蓝色)')">
         <span
           style="
             display: inline-block;

+ 1 - 1
app/src/views/Home/index.vue

@@ -211,7 +211,7 @@ export default {
     showFxyj(val){
       this.defaultModel = {
         qy: this.qy,
-        fxdj: val
+        fxdjYs: val
       }
       this.showModal("basicInfoModal");
     },