viviandjava před 5 měsíci
rodič
revize
91cebb6391

binární
src/assets/images/overflowWarnNone.png


+ 2 - 2
src/components/UePlayer.vue

@@ -16,9 +16,9 @@ onMounted(() => {
     useUrlParams: true,
     initialSettings: {
       // ss: "ws://192.168.0.136:85",
-      ss: "ws://192.168.0.120:85",
+      // ss: "ws://192.168.0.120:85",
       // ss: "ws://192.168.0.121:85",
-      // ss: "ws://10.8.48.235:85",
+      ss: "ws://10.8.48.235:85",
       AutoConnect: true,
       AutoPlayVideo: true,
       StartVideoMuted: false,

+ 9 - 9
src/views/Device.vue

@@ -358,9 +358,9 @@ onUnmounted(() => {
           <p>维护内容:</p>
           <p>{{ maintainRecord.warnContent }}</p>
         </card01>
-        <card01 style="height: 40%" title="设备维护情况">
-          <stripe-table :columns="deviceStatusColumns" :data="deviceStatusData"></stripe-table>
-        </card01>
+<!--        <card01 style="height: 40%" title="设备维护情况">-->
+<!--          <stripe-table :columns="deviceStatusColumns" :data="deviceStatusData"></stripe-table>-->
+<!--        </card01>-->
       </template>
       <template v-if="deviceType === 'waterQuality'">
         <card01 :title="device.deviceName" style="height: 65%">
@@ -384,9 +384,9 @@ onUnmounted(() => {
           <p>维护内容:</p>
           <p>{{ maintainRecord.warnContent }}</p>
         </card01>
-        <card01 style="height: 40%" title="设备维护情况">
-          <stripe-table :columns="deviceStatusColumns" :data="deviceStatusData"></stripe-table>
-        </card01>
+<!--        <card01 style="height: 40%" title="设备维护情况">-->
+<!--          <stripe-table :columns="deviceStatusColumns" :data="deviceStatusData"></stripe-table>-->
+<!--        </card01>-->
       </template>
       <template v-if="deviceType=== 'video'">
         <card01 style="height: 40%" title="视频监控">
@@ -410,9 +410,9 @@ onUnmounted(() => {
         </card01>
       </template>
       <template v-if="deviceType=== 'waterQuality'">
-        <card01 style="height: 33%" title="设备维护情况">
-          <stripe-table :columns="deviceStatusColumns" :data="deviceStatusData"></stripe-table>
-        </card01>
+<!--        <card01 style="height: 33%" title="设备维护情况">-->
+<!--          <stripe-table :columns="deviceStatusColumns" :data="deviceStatusData"></stripe-table>-->
+<!--        </card01>-->
         <card01 style="height: 33%" title="配件运维信息">
           <stripe-table :columns="accessoriesColumns" :data="accessoriesData"></stripe-table>
         </card01>

+ 6 - 5
src/views/IntellOper.vue

@@ -40,10 +40,11 @@ const deviceColumns = [
 const deviceData = reactive([])
 
 const alarmType = ref({
-  '1': '巡检维护',
-  '2': '故障',
-  '3': '仪器校准',
-  '4': '提醒'
+  '1': '数据中断',
+  '2': '超出上限',
+  '3': '超出下限',
+  '4': '缺数',
+  '5': '临近保质期',
 })
 
 const alarmColumns = [
@@ -219,7 +220,7 @@ function getEquipmentList() {
       equipmentStatusData.total = res.data.records.length
       var num=0
       res.data.records.forEach(d => {
-        if (d.status != null) {
+        if (d.status != 1) {
           num++
         }
       })

+ 0 - 1
src/views/Situational.vue

@@ -486,7 +486,6 @@ onMounted(() => {
       <card01 style="height: 31%">
         <template v-slot:header>
           <span class="title">水质分析</span>
-          <span style="font-size: 0.8rem;">&nbsp;&nbsp;江南大运河沿线</span>
         </template>
 <!--        <template v-slot:sec_header>-->
 <!--          <span style="font-size: 12px;display: inline-block;float:right;margin-right: 50px;cursor: pointer;"-->

+ 6 - 5
src/views/StationHouse.vue

@@ -24,7 +24,7 @@ const route = useRoute()
 const videoSrc = ref(new URL('@/assets/images/video.png', import.meta.url).href)
 const simulateSrc = ref(new URL('@/assets/images/simulate.png', import.meta.url).href)
 const tempWarnSrc = ref(new URL('@/assets/images/tempWarn.png', import.meta.url).href)
-const overflowWarnSrc = ref(new URL('@/assets/images/overflowWarn.png', import.meta.url).href)
+const overflowWarnSrc = ref(new URL('@/assets/images/overflowWarnNone.png', import.meta.url).href)
 const fireWarnSrc = ref(new URL('@/assets/images/fireWarn.png', import.meta.url).href)
 const wetWarnSrc = ref(new URL('@/assets/images/wetWarn.png', import.meta.url).href)
 
@@ -113,10 +113,11 @@ function getLatestWaterQuality() {
 }
 
 const alarmType = ref({
-  '1': '巡检维护',
-  '2': '故障',
-  '3': '仪器校准',
-  '4': '提醒'
+  '1': '数据中断',
+  '2': '超出上限',
+  '3': '超出下限',
+  '4': '缺数',
+  '5': '临近保质期',
 })
 
 const alarmColumns = [