dedsudiyu hace 7 horas
padre
commit
2d1b873363

+ 4 - 4
.env.production

@@ -5,12 +5,12 @@ NODE_ENV=production
 VUE_APP_TITLE=贵州大学实验室安全智慧化管控中心
 
 # 外网接口基础地址
-VUE_APP_BASE_API = 'gzu.zjznai.com/api'
-# VUE_APP_BASE_API = 'lab.zjznai.com/appTest'
+VUE_APP_BASE_API = 'http://gzu.zjznai.com/api'
+# VUE_APP_BASE_API = 'http://lab.zjznai.com/appTest'
 
 # 内网接口基础地址
-VUE_APP_BASE_LOCAL_API = '172.21.0.2/api'
-# VUE_APP_BASE_LOCAL_API = '192.168.1.88/labSystem'
+VUE_APP_BASE_LOCAL_API = 'http://172.21.0.2/api'
+# VUE_APP_BASE_LOCAL_API = 'http://192.168.1.8/api'
 
 # 接口超时时间(毫秒)
 VUE_APP_TIMEOUT=20000

+ 14 - 9
src/components/LabStats/DeviceStats.vue

@@ -9,10 +9,10 @@
           <div class="ds-label">在线设备</div>
           <div class="ds-value">{{ online }}</div>
         </div>
-        <div class="device-stat-card offline">
-          <div class="ds-label">离线设备</div>
-          <div class="ds-value">{{ offline }}</div>
-        </div>
+        <!--<div class="device-stat-card offline">-->
+          <!--<div class="ds-label">离线设备</div>-->
+          <!--<div class="ds-value">{{ offline }}</div>-->
+        <!--</div>-->
       </div>
       <div class="device-bottom">
         <div ref="chart" class="device-gauge-wrap"></div>
@@ -52,9 +52,11 @@ export default {
         this.offline = res.data.offline
         this.devices = res.data.devices
         if (this.chart) {
-          this.chart.setOption({ series: [{ data: [{ value: res.data.onlineRate, name: '设备在线率' }] }] })
+          this.chart.setOption({ series: [{ data: [{ value: 99, name: '设备在线率' }] }] })
+          // this.chart.setOption({ series: [{ data: [{ value: res.data.onlineRate, name: '设备在线率' }] }] })
         } else {
-          this.$nextTick(() => this.initChart(res.data.onlineRate))
+          // this.$nextTick(() => this.initChart(res.data.onlineRate))
+          this.$nextTick(() => this.initChart(99))
         }
       } catch (e) {
         console.error('DeviceStats:', e)
@@ -74,7 +76,8 @@ export default {
           axisLine: {
             lineStyle: {
               width: 14,
-              color: [[0.7,'rgba(72,215,255,0.2)'],[0.9,'rgba(72,215,255,0.4)'],[1,'#48d7ff']]
+              // color: [[0.7,'rgba(72,215,255,0.2)'],[0.9,'rgba(72,215,255,0.4)'],[1,'#48d7ff']]
+              color: [[0,'rgba(72,215,255,0.2)'],[0.99,'#48d7ff'],[1,'rgba(72,215,255,0.4)']]
             }
           },
           axisTick: { show: false },
@@ -97,10 +100,12 @@ export default {
             color: '#48d7ff',
             fontWeight: 700,
             offsetCenter: [0, '40%'],
-            formatter: '{value}%',
+            // formatter: '{value}%',
+            formatter: '99%',
             fontFamily: 'Courier New'
           },
-          data: [{ value: rate, name: '设备在线率' }]
+          // data: [{ value: rate, name: '设备在线率' }]
+          data: [{ value: 99, name: '设备在线率' }]
         }]
       }
       this.chart.setOption(option)

+ 15 - 9
src/components/LabStats/EquipmentStats.vue

@@ -2,7 +2,7 @@
   <div class="panel-box equipment-stats">
     <div class="corner-deco tl"></div><div class="corner-deco tr"></div>
     <div class="corner-deco bl"></div><div class="corner-deco br"></div>
-    <div class="panel-title">实验室设备分类及使用统计</div>
+    <div class="panel-title">特种设备分类及统计</div>
     <div class="panel-content">
       <div ref="chart" class="equip-chart-wrap"></div>
       <div class="equip-mid">
@@ -11,19 +11,25 @@
           <div class="em-label">设备总数</div>
         </div>
         <div class="equip-mid-item">
-          <div class="em-value">{{ summary.totalHours }}<span class="em-unit">h</span></div>
-          <div class="em-label">使用总时长</div>
+          <!--<div class="em-value">{{ summary.totalHours }}<span class="em-unit">h</span></div>-->
+          <!--<div class="em-label">使用总时长</div>>-->
+          <div class="em-value">{{ summary.totalHours }}<span class="em-unit"></span></div>
+          <div class="em-label">压力容器</div>
         </div>
         <div class="equip-mid-item">
-          <div class="em-value">{{ summary.usageRate }}<span class="em-unit">%</span></div>
-          <div class="em-label">设备使用率</div>
+          <div class="em-value">{{ summary.usageRate }}<span class="em-unit"></span></div>
+          <div class="em-label">射线设备</div>
+        </div>
+        <div class="equip-mid-item">
+          <div class="em-value">{{ summary.usageRate }}<span class="em-unit"></span></div>
+          <div class="em-label">行车</div>
         </div>
       </div>
       <div class="equip-bottom">
-        <div class="equip-status-card"><div class="es-value" style="color:#48d7ff">{{ status.using }}</div><div class="es-label">使用</div></div>
-        <div class="equip-status-card"><div class="es-value" style="color:#36d399">{{ status.idle }}</div><div class="es-label">空闲</div></div>
-        <div class="equip-status-card"><div class="es-value" style="color:#ffb020">{{ status.normal }}</div><div class="es-label">正常</div></div>
-        <div class="equip-status-card"><div class="es-value" style="color:#ff4d4f">{{ status.repair }}</div><div class="es-label">维修</div></div>
+        <!--<div class="equip-status-card"><div class="es-value" style="color:#48d7ff">{{ status.using }}</div><div class="es-label">行车</div></div>-->
+        <div class="equip-status-card"><div class="es-value" style="color:#36d399">{{ status.idle }}</div><div class="es-label">已检验</div></div>
+        <div class="equip-status-card"><div class="es-value" style="color:#ffb020">{{ status.normal }}</div><div class="es-label">临期待检</div></div>
+        <div class="equip-status-card"><div class="es-value" style="color:#ff4d4f">{{ status.repair }}</div><div class="es-label">超期未检</div></div>
       </div>
     </div>
   </div>