Merge branch 'dev' into feat/layout-style

src/views/dustMonitoring/index.vue

@@ -71,7 +71,8 @@
             <div class="left" v-if="detailObj.compartHealthList.length > 0">
               <div class="part">
                 <div
-                  class="point warn"
+                  class="point"
+                  :class="item.healthStatus == 1 ? 'health' : 'warn'"
                   v-for="item in detailObj.compartHealthList[0]"
                   :key="item"
                   @click="handleStatusDotClick()"
@@ -79,7 +80,8 @@
               </div>
               <div class="part">
                 <div
-                  class="point warn"
+                  class="point"
+                  :class="item.healthStatus == 1 ? 'health' : 'warn'"
                   v-for="item in detailObj.compartHealthList[1]"
                   :key="item"
                 ></div>
@@ -473,7 +475,7 @@ const getDustDetail = () => {
         indicatorTwoInstance,
         "indicatorTwo",
         getGaugeOption({
-          value: dustInfo[1].value,
+          value: parseInt(dustInfo[1].value / 100),
           chartName: "粉尘浓度",
           min: 5,
           max: 50,
@@ -691,7 +693,7 @@ $borderColor: #bbbdc391;
       }
       .point {
         width: 20px;
-        margin: 1% 3%;
+        margin: 10px;
         border-radius: 50%;
         display: inline-block;
         cursor: pointer;