背景图片丢失修改

.env.production

@@ -4,19 +4,19 @@ NODE_ENV = production
 # 标题
 # VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
 # VUE_APP_TITLE = '托克逊能源管理平台'
-VUE_APP_TITLE = '中建材光子科技有限公司'
+# VUE_APP_TITLE = '中建材光子科技有限公司'
-# VUE_APP_TITLE = '超低排放系统'
+VUE_APP_TITLE = '超低排放系统'
 
 
 # 接口地址
 # VUE_APP_API_BASEURL = http://222.222.144.147:6013/api
 # VUE_APP_BASEURL = http://222.222.144.147:6013 
 #光子
-VUE_APP_API_BASEURL = http://192.168.10.5:2250/api
+# VUE_APP_API_BASEURL = http://192.168.10.5:2250/api
-VUE_APP_BASEURL = http://192.168.10.5:2250
+# VUE_APP_BASEURL = http://192.168.10.5:2250
 #托克逊
-# VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
+VUE_APP_API_BASEURL = http://49.232.14.174:2226/api
-# VUE_APP_BASEURL = http://49.232.14.174:2226
+VUE_APP_BASEURL = http://49.232.14.174:2226
 
 # VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
 # VUE_APP_BASEURL = http://1.203.161.103:2800

public/img/enp_blue/数据边框.svg

@@ -1,6 +0,0 @@
-<svg width="137" height="42" viewBox="0 0 137 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="136" height="41" transform="translate(0.797363 0.872681)" fill="white" fill-opacity="0.1"/>
-<path d="M132.288 1.37268H136.288V5.37268" stroke="white"/>
-<path d="M136.288 37.3727L136.288 5.37268" stroke="white" stroke-opacity="0.2"/>
-<path d="M132.288 41.3727H136.288V37.3727" stroke="white"/>
-</svg>

public/img/enp_blue/环状背景.svg

@@ -1,15 +0,0 @@
-<svg width="154" height="131" viewBox="0 0 154 131" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M141.638 65.446C141.638 101.307 112.87 130.378 77.3837 130.378C41.8972 130.378 13.1297 101.307 13.1297 65.446C13.1297 29.5848 41.8972 0.513672 77.3837 0.513672C112.87 0.513672 141.638 29.5848 141.638 65.446ZM140.549 65.446C140.549 100.699 112.269 129.278 77.3837 129.278C42.4986 129.278 14.2187 100.699 14.2187 65.446C14.2187 30.1927 42.4986 1.61422 77.3837 1.61422C112.269 1.61422 140.549 30.1927 140.549 65.446Z" fill="#0091FF" fill-opacity="0.3"/>
-<path d="M23.2339 10.7148C9.37185 24.7208 0.797791 44.0713 0.797791 65.4455C0.797791 86.7994 9.35552 106.133 23.1943 120.136L26.6596 116.634C13.7077 103.528 5.69852 85.4318 5.69852 65.4455C5.69852 45.4389 13.724 27.3265 26.6992 14.2168L23.2339 10.7148Z" fill="url(#paint0_linear_36_35228)" fill-opacity="0.6"/>
-<path d="M131.564 10.7148C145.426 24.7208 154 44.0713 154 65.4455C154 86.7994 145.442 106.133 131.604 120.136L128.138 116.634C141.09 103.528 149.099 85.4318 149.099 65.4455C149.099 45.4389 141.074 27.3265 128.099 14.2168L131.564 10.7148Z" fill="url(#paint1_linear_36_35228)" fill-opacity="0.6"/>
-<defs>
-<linearGradient id="paint0_linear_36_35228" x1="13.7485" y1="10.7148" x2="13.7485" y2="120.136" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0091FF" stop-opacity="0.3"/>
-<stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
-</linearGradient>
-<linearGradient id="paint1_linear_36_35228" x1="141.049" y1="10.7148" x2="141.049" y2="120.136" gradientUnits="userSpaceOnUse">
-<stop stop-color="#0091FF" stop-opacity="0.3"/>
-<stop offset="1" stop-color="#0091FF" stop-opacity="0"/>
-</linearGradient>
-</defs>
-</svg>

src/views/bigScreen/enpComponents/cems.vue

@@ -5,9 +5,9 @@
                 <span>CEMS监测清单</span>
             </div>
         </template>
-        <div id="enpTable">
+        <div>
-            <scTable :data="tableData" style="width: 100%;" class="enpTable" size="large" :apiObj="apiObj" row-key="id"
+            <scTable :data="tableData" style="width: 100%;" size="large" :apiObj="apiObj" row-key="id" :params="params"
-                :params="params" hidePagination @row-click="rowClick">
+                hidePagination @row-click="rowClick">
                 <el-table-column type="index" width="50" />
                 <el-table-column prop="equipment_number" label="设备编号" width="180" />
                 <el-table-column prop="equipment_name" label="设备名称" />

src/views/bigScreen/enpComponents/orgwryList.vue

@@ -283,6 +283,8 @@ export default {
                         color: '#fff'
                     }
                 },
+                legend: {
+                },
                 tooltip: {
                     trigger: 'axis'
                 },
@@ -308,7 +310,7 @@ export default {
                 },
                 xAxis: { type: 'category' },
                 yAxis: {},
-                series: [{ type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }, { type: 'line' }]
+                series: [{ type: 'line' }]
             },
             eqs: {},
             eqc: {},
@@ -425,9 +427,19 @@ export default {
                 newOption.title.text = that.eqc.name;
                 newOption.series = series;
                 myChart.setOption(newOption);
-                myChart2.setOption(newOption);
+                // myChart2.setOption(newOption);
-                echarts.connect([myChart, myChart2])
+                // echarts.connect([myChart, myChart2])
-            }).then(() => { myChart.hideLoading() })
+            }).then(() => {
+                that.$API.bi.dataset.exec.req('eq_status', params).then(res2 => {
+                    let newOption2 = Object.assign({}, this.basicOption);
+                    newOption2.dataset.source = res2.data.ds0;
+                    newOption2.dataZoom.startValue = that.biquery.start_time;
+                    newOption2.title.text = that.eqc.name;
+                    myChart2.setOption(newOption2);
+                    echarts.connect([myChart, myChart2])
+                }).then(() => { myChart.hideLoading() })
+                myChart.hideLoading()
+            })
         },
     }
 }

src/views/bigScreen/index_enp_blue.vue

@@ -2,17 +2,17 @@
   <div class="dashboard">
     <header>
       <div class="headerImg">
-        <img src="img/enp_blue/header_enp.svg" style="width:100%">
+        <img src="img/enp_blue/header_enp.svg" style="width:100%;">
-        <div style="width:100%;text-align:center;line-height:6.3vh;color:#ffffff;position:absolute;top:0;left:0;">
+        <div class="sysName">
           水泥有限公司</div>
       </div>
-      <div class="login_config" style="z-index:1000">
+      <div class="login_config" style="z-index:1000;position: absolute;right: 1vw;bottom: 0;">
         <el-button :icon="config.dark ? 'el-icon-sunny' : 'el-icon-moon'" circle type="info"
           @click="configDark"></el-button>
 
       </div>
-      <div style="position: absolute;top:1.5vh;height:6vh">
+      <div style="position: absolute;top:1.3vh;height:6vh">
-        <div style="display: flex;padding-top: 1.3vh;margin-left: 1vw;">
+        <div style="display: flex;padding-top: 1vh;margin-left: 1vw;">
           <div :class="bindClass(0)" @click="menuClick(0)">
             <div class="menuItem">首页</div>
           </div>
@@ -54,8 +54,8 @@
           </div>
         </div>
       </div>
-      <div style="position: absolute;top:1.5vh;right: 8px;height: 6vh;">
+      <div style="position: absolute;top:1.3vh;right: 8px;height: 6vh;">
-        <div style="display: flex;padding-top:  1.3vh;padding-right:  1vw;justify-content: flex-end;">
+        <div style="display: flex;padding-top:  1vh;padding-right:  1vw;justify-content: flex-end;">
           <div :class="bindClass(3)">
             <div class="menuItem">
               <el-dropdown class="dropdown" trigger="click" @command="handleClick3">
@@ -135,14 +135,14 @@
           <div style="display: flex;padding: 1vh 1vw;">
             <div style="width: 50%;">
               <div class="eqItem">
-                <img class="eqImg" src="img/enp_blue/生产设备.svg">
+                <img class="eqImg" src="img/enp_blue/eq_s.svg">
                 <div class="eqText">
                   <div class="eqName">生产设备</div>
                   <div class="eqNumWrap"><span class="eqNum">34</span>台</div>
                 </div>
               </div>
               <div class="eqItem">
-                <img class="eqImg" src="img/enp_blue/监测设备.svg">
+                <img class="eqImg" src="img/enp_blue/eq_v.svg">
                 <div class="eqText">
                   <div class="eqName">监测设备</div>
                   <div class="eqNumWrap"><span class="eqNum">9</span>台</div>
@@ -151,21 +151,21 @@
             </div>
             <div style="width: 50%;">
               <div class="eqItem">
-                <img class="eqImg eqImg_s" src="img/enp_blue/治理设备.svg">
+                <img class="eqImg eqImg_s" src="img/enp_blue/eq_z.svg">
                 <div class="eqText eqText_s">
                   <div class="eqName">治理设备</div>
                   <div class="eqNumWrap"><span class="eqNum">44</span>台</div>
                 </div>
               </div>
               <div class="eqItem">
-                <img class="eqImg eqImg_s" src="img/enp_blue/监控设备.svg">
+                <img class="eqImg eqImg_s" src="img/enp_blue/eq_c.svg">
                 <div class="eqText eqText_s">
                   <div class="eqName">监控设备</div>
                   <div class="eqNumWrap"><span class="eqNum">20</span>台</div>
                 </div>
               </div>
               <div class="eqItem">
-                <img class="eqImg eqImg_s" src="img/enp_blue/环境质量检测.svg">
+                <img class="eqImg eqImg_s" src="img/enp_blue/hjzljc.svg">
                 <div class="eqText eqText_s">
                   <div class="eqName">环境质量检测</div>
                   <div class="eqNumWrap"><span class="eqNum">9</span>台</div>
@@ -450,7 +450,7 @@ export default {
     that.initDomStyle();
     that.$nextTick(() => {
       setTimeout(function () {
-        that.initFactory();
+        // that.initFactory();
       }, 1000);
     });
   },
@@ -1052,7 +1052,7 @@ header {
 
 .headerImg {
   width: 100%;
-  height: fit-content;
+  height: 6.7vh;
   line-height: 6.3vh;
   color: #ffffff;
   font-size: 1.8vw;
@@ -1060,6 +1060,16 @@ header {
   position: relative;
 }
 
+.sysName {
+  width: 100%;
+  text-align: center;
+  line-height: 6.3vh;
+  color: #ffffff;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
 .sysName {
   color: #ffffff;
   padding-left: 1vw;
@@ -1103,7 +1113,7 @@ header {
 }
 
 .menuWrap {
-  height: 3.6vh;
+  height: 4.6vh;
   margin-right: 1vw;
 }
 
@@ -1121,14 +1131,14 @@ header {
 
 .menuItem {
   color: #ffffff;
-  line-height: 3.4vh;
+  line-height: 4.4vh;
   font-size: 1.5vh;
   text-align: center;
 }
 
 .dropdown {
   color: #ffffff;
-  line-height: 3.5vh;
+  line-height: 4.5vh;
   font-size: 1.4vh;
 }
 
@@ -1372,7 +1382,7 @@ header {
   margin-top: 1vh;
   font-size: 1.4vh;
   text-align: center;
-  background-image: url('/public/img/enp_blue/小标题.png');
+  background-image: url('/public/img/enp_blue/little_title.png');
 }
 
 .status {
@@ -1403,7 +1413,7 @@ header {
   line-height: 4vh;
   text-align: center;
   margin-bottom: 1vh;
-  background-image: url('/public/img/enp_blue/序号边框.svg');
+  background-image: url('/public/img/enp_blue/index_bg.svg');
   background-size: cover;
 }