代码提交

public/unityWeb/index.html

@@ -74,10 +74,8 @@
       // happening inside the engine, and you would instead like to size up
       // the canvas DOM size and WebGL render target sizes yourself.
       // config.matchWebGLToCanvasSize = false;
-
       if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
         // Mobile device style: fill the whole browser client area with the game canvas:
-
         var meta = document.createElement('meta');
         meta.name = 'viewport';
         meta.content = 'width=device-width, height=device-height, initial-scale=1.0, user-scalable=no, shrink-to-fit=yes';
@@ -87,14 +85,12 @@
         // To lower canvas resolution on mobile devices to gain some
         // performance, uncomment the following line:
         // config.devicePixelRatio = 1;
-
         canvas.style.width = window.innerWidth + 'px';
         canvas.style.height = window.innerHeight + 'px';
 
         unityShowBanner('WebGL builds are not supported on mobile devices.');
       } else {
         // Desktop style: Render the game canvas in a window that can be maximized to fullscreen:
-
         canvas.style.width = "960px";
         canvas.style.height = "600px";
       }

src/App.vue

@@ -57,6 +57,10 @@ export default {
         }
       }else if (this.routerActive == 3) {
         that.$router.push({name:'stationBuilding'})
+      }else if (this.routerActive == 1) {
+        that.$router.push({name:'twentyKV'})
+      }else if (this.routerActive == 2) {
+        that.$router.push({name:'thirtyFiveKV'})
       }
     }
   }

src/main.js

@@ -14,11 +14,8 @@ Vue.prototype.$echarts = echarts
 
 import VideoPlayer from 'vue-video-player'
 import 'video.js/dist/video-js.css'
-Vue.use(VideoPlayer)
-// require('vue-video-player/src/custom-theme.css')
-// import 'video.js/dist/video-js.css'
 import 'vue-video-player/src/custom-theme.css'
-// import { videoPlayer } from 'vue-video-player'
+Vue.use(VideoPlayer)
 
 import moment from 'moment'
 //定义一个全局过滤器实现日期格式化

src/router.js

@@ -29,5 +29,15 @@ export default new Router({
       name: 'stationBuilding',
       component: () => import ('./views/stationBuilding.vue')
     },
+    {
+      path: '/twentyKV',
+      name: 'twentyKV',
+      component: () => import ('./views/twentyKV.vue')
+    },
+    {
+      path: '/thirtyFiveKV',
+      name: 'thirtyFiveKV',
+      component: () => import ('./views/thirtyFiveKV.vue')
+    },
   ]
 })

src/views/index.vue

@@ -190,7 +190,7 @@
           <div>
             单位
           </div>
-          <div>
+          <!-- <div>
             工区
           </div>
           <div>
@@ -219,7 +219,7 @@
           </div>
           <div>
             响水
-          </div>
+          </div> -->
          </div>
           <div id="detailedOne" style="height:90%"></div>
         </div>
@@ -309,7 +309,10 @@
           </el-table>
         </div>
       </div>
-    </div>
+     </div>
+    <!-- <div style="height:20px;width:20px;position: fixed">
+        <img src="../assets/images/btnFangDa.png"/>
+      </div> -->
      <div class="componentShow" v-if="modelOthers">
       <keep-alive>
         <component
@@ -517,12 +520,13 @@ export default {
           },
         },
         grid: {
-          top:'15%',
+          top:'18%',
           left: "5%",
           right: "3%",
-          bottom: "15%",
+          bottom: "8%",
           containLabel: true,
         },
+        
         xAxis: [
           {
             type: "category",
@@ -572,13 +576,15 @@ export default {
         series: [
           {
             type:'bar',
+            barWidth:22,
             itemStyle:{
               normal:{
                 label:{
+                  fontSize: 14,
                    formatter(params){
                   for (let i = 0; i < dataList.length; i++) {
                     if (params.dataIndex == i) {
-                      return dataList[i]
+                      return dataDw[i] + '\n' + '\n' + dataList[i]
                     }
                   }
                 },
@@ -649,8 +655,8 @@ export default {
           }
         },
          grid: {
-          left: "1%",
+          left: "4%",
-          right: "3%",
+          right: "4%",
           bottom: "10%",
           containLabel: true,
         },
@@ -1026,7 +1032,8 @@ export default {
         borderWidth: 0,
         top: 30,
         bottom: 40,
-        left: 90,
+        left: '6%',
+        right: '6%',
         textStyle: {
           color: "#fff",
         },
@@ -1443,7 +1450,8 @@ export default {
     //报警详情信息弹窗
     enlargeBtn(index){
       if (index == 0) {
-        this.alarmInformationShow = true
+        this.alarmInformationShow = true;
+        this.realTimeAlarmShow = false;
       }else if (index == 1) {
          this.$refs.iframe.contentWindow.fullscreen(1);
       }
@@ -1732,13 +1740,15 @@ export default {
       .detailedOneList{
        display: flex;
         flex-direction: row;
-        justify-content: space-evenly;
+        justify-content: flex-start;
         height: 10%;
         align-items: center;
         color:#ffffff;
         background: url("../assets/images/tableBg.png") no-repeat;
         background-size: 100% 100%;
-        width:96%;
+        width:92%;
+        z-index: 1;
+        position: relative;
      }
     }
       
@@ -1764,7 +1774,9 @@ export default {
     }
     #detailedOne{
       width: 100%;
-      height: calc(100% - 87px) !important;
+      height: calc(100% - 0px) !important;
+      z-index: 2;
+      margin-top: -3%;
     };
     #detailedFour{
       width: 100%;

src/views/thirtyFiveKV.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="thirtyFiveKV">
+      momomo
+  </div>
+</template>
+
+<script>
+export default {
+   name:"thirtyFiveKV",
+   data() {
+  	  return {
+
+	}
+}
+}
+</script>
+
+<style lang="less" scoped>
+.thirtyFiveKV{
+  width: 100%;
+  height: 100%;
+  padding: 15px 25px;
+}
+
+</style>

src/views/twentyKV.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="twentyKV">
+      momomo
+  </div>
+</template>
+
+<script>
+export default {
+   name:"twentyKV",
+   data() {
+  	  return {
+
+	}
+}
+}
+</script>
+
+<style lang="less" scoped>
+.twentyKV{
+  width: 100%;
+  height: 100%;
+  padding: 15px 25px;
+}
+
+</style>