lxh 2 månader sedan
förälder
incheckning
68ec5dc08a

+ 1 - 1
src/views/vent/dust/dustHome/components/dustGlzb.vue

@@ -6,7 +6,7 @@
                 }}</div>
         </div>
         <div class="safety-content">
-            <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.15" :copy-num="3" class="seamless-warp">
+            <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.1"  class="seamless-warp">
                 <div class="safety-content-box" v-for="(ite, ind) in dustZbList" :key="ind">
                     <span>{{ ite.label || '--' }}</span>
                     <span>{{ ite.temperature || '--' }}</span>

+ 1 - 1
src/views/vent/dust/dustHome/components/dustTimeNow.vue

@@ -6,7 +6,7 @@
       }}</div>
     </div>
     <div class="safety-content">
-      <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.15" :copy-num="3" class="seamless-warp">
+      <vue3-seamless-scroll hover-stop="true" :list="dustZbList" :hover="true" :step="0.1"  class="seamless-warp">
         <div class="safety-content-box" v-for="(ite, ind) in dustZbList" :key="ind">
           <span>{{ ite.label || '--' }}</span>
           <!-- <span>{{ ite.temperature }}</span>

+ 2 - 2
src/views/vent/dust/dustHome/components/dustWork.vue

@@ -11,12 +11,12 @@
       </div>
     </div>
     <div class="card-workJc" :style="{ height: heightB }">
-      <vue3-seamless-scroll hover-stop="true" :list="cardList" :hover="true" :step="0.15" :copy-num="3"
+      <vue3-seamless-scroll hover-stop="true" :list="cardList" :hover="true" :step="0.1" 
         class="seamless-warp">
         <div class="card-box" v-for="(ite, ind) in cardList" :key="ind">
           <div class="card-l-label">风险</div>
           <div class="card-l-val">{{  ite.warningLevel == 1 ? '低': ite.warningLevel == 2 ? '中' :  ite.warningLevel == 3 ? '较大' :  ite.warningLevel == 4 ? '重大' : '--' }}</div>
-          <div class="card-r-label">{{ ite.name }}</div>
+          <div class="card-r-label">{{ ite.label }}</div>
 
           <div class="card-r-des">
             <span>粉尘浓度:</span>

+ 3 - 2
src/views/vent/dust/dustHome/index.vue

@@ -183,7 +183,7 @@ function changeSelect(data) {
 
 //获取工作面风险监测图表数据
 async function getDustWarningCntByTypeList() {
-  let res = await getDustWarningCntByType({ areaType: 2 })
+  let res = await getDustWarningCntByType({})
   if (res.length != 0) {
     echartDataWork.value = res
   }
@@ -235,7 +235,8 @@ async function getRealSensorDataByTypeList() {
           windSpeed: el.windSpeed,
           waterPressure: el.waterPressure,
           dust:el.dust,
-          pwList:el.pwList.length
+          pwList:el.pwList.length,
+          warningLevel:el.warningLevel
         });
       }
     });

+ 1 - 1
src/views/vent/fire/fireHome/components/outFireJc.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="outFireJc">
-    <vue3-seamless-scroll hover-stop="true" :list="outFireList" :hover="true" :step="0.1" :copy-num="3" class="seamless-warp">
+    <vue3-seamless-scroll hover-stop="true" :list="outFireList" :hover="true" :step="0.1"  class="seamless-warp">
       <div class="outFire-box" v-for="(item, index) in outFireList" :key="index">
         <div class="outFire-title">{{ item.title }}</div>
         <div class="outFire-label">{{ item.label }}</div>

+ 1 - 1
src/views/vent/fire/fireHome/components/safetyJc.vue

@@ -8,7 +8,7 @@
         }}</div>
     </div>
     <div class="safety-content">
-      <vue3-seamless-scroll hover-stop="true" :list="safetyList" :hover="true" :step="0.15" :copy-num="3" class="seamless-warp">
+      <vue3-seamless-scroll hover-stop="true" :list="safetyList" :hover="true" :step="0.1"  class="seamless-warp">
         <div
           :class="safetyHeadList.length == 4 ? 'safety-content-box' : safetyHeadList.length == 3 ? 'safety-content-box0' : 'safety-content-box1'"
           v-for="(ite, ind) in safetyList" :key="ind">

+ 1 - 1
src/views/vent/fire/fireHome/components/workJc.vue

@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="card-workJc" :style="{ height: heightB }">
-      <vue3-seamless-scroll hover-stop="true" :list="cardList" :hover="true" :step="0.15" :copy-num="3"
+      <vue3-seamless-scroll hover-stop="true" :list="cardList" :hover="true" :step="0.1" 
         class="seamless-warp">
         <div class="card-box" v-for="(ite, ind) in cardList" :key="ind">
           <div class="card-l-label">{{ ite.title }}</div>