dedsudiyu 2 týždňov pred
rodič
commit
4ca6455fac

+ 4 - 4
.env.development

@@ -24,7 +24,7 @@ VUE_APP_VERSION_DIFFERENCE_FIELD = 'kuangYeDaXue_nanHu'
 # ####################外网接口配置####################
 
 # 现场
-VUE_APP_BASE_API = '172.16.0.65/api'
+# VUE_APP_BASE_API = '172.16.0.65/api'
 
 # 小飞
 # VUE_APP_BASE_API = '192.168.1.17:8080'
@@ -36,7 +36,7 @@ VUE_APP_BASE_API = '172.16.0.65/api'
 # VUE_APP_BASE_API = '192.168.1.9:8080'
 
 # 1.8外网地址
-# VUE_APP_BASE_API = '192.168.1.8/api'
+VUE_APP_BASE_API = '192.168.1.8/api'
 
 # 43外网地址
 # VUE_APP_BASE_API = 'lab.zjznai.com/labapp'
@@ -47,7 +47,7 @@ VUE_APP_BASE_API = '172.16.0.65/api'
 # ####################内网接口配置####################
 
 # 现场
-VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
+# VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 
 # 小飞
 # VUE_APP_BASE_LOCAL_API = '192.168.1.17:8080'
@@ -62,7 +62,7 @@ VUE_APP_BASE_LOCAL_API = '172.16.0.65/api'
 # VUE_APP_BASE_LOCAL_API = '192.168.1.39:8080'
 
 # 1.8内网地址
-# VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
+VUE_APP_BASE_LOCAL_API = '192.168.1.8/api'
 
 # 43内网地址
 # VUE_APP_BASE_LOCAL_API = '192.168.1.43/api'

+ 9 - 0
keyword/keyword.md

@@ -0,0 +1,9 @@
+# 帮我写一个组件 文件已经创建好了
+- 文件位置在src\views\pureWaterSystem\pageComponent\pureWaterPage.vue
+1. 组件内容要求
+- 严格按照我提供的原型制作
+- 组件页面实际尺寸为 width:1280px; height:570px;
+- 该组件内所用所有数据都来自父类传参 组件内接参字段为 propsData
+- 组件内图表内容使用eCharts  eCharts组件已经全量引入项目 直接使用即可
+
+## 开始生成 ##

+ 16 - 9
src/views/emergencyManagement/index.vue

@@ -12,13 +12,15 @@
         <img class="position-img position-img-4" src="@/assets/ZDimages/img_bg_zc@1x.png">
         <img class="position-img position-img-5" src="@/assets/ZDimages/img_bg_zc@1x.png">
         <img class="position-img position-img-6" src="@/assets/ZDimages/img_bg_xz@1x.png">
-        <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_cdo@1x.png">
+        <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_zc@1x.png">
+        <img class="position-img position-img-8" src="@/assets/ZDimages/img_bg_cdo@1x.png">
         <p class="null-p"></p>
         <p class="button-p" @click="goPage(1)">安全总览</p>
         <p class="button-p" @click="goPage(2)">资源设备</p>
         <p class="button-p" @click="goPage(3)">三维模型</p>
         <p class="button-p" @click="goPage(4)">视频监控</p>
         <p class="button-check-p">应急管控</p>
+        <p class="button-p" @click="goPage(6)">纯水系统</p>
         <p class="null-p"></p>
       </div>
       <mapComponent ref="mapComponent"></mapComponent>
@@ -151,43 +153,48 @@
         width:911px;
         position: absolute;
         left:50%;
-        margin:0 -456px;
+        margin:0 -445px;
         height:60px;
         display: flex;
         .position-img-1{
           position:absolute;
           top:0;
-          left:0;
+          left:-74px;
         }
         .position-img-2{
           position:absolute;
           top:0;
-          left:83px;
+          left:9px;
         }
         .position-img-3{
           position:absolute;
           top:0;
-          left:228px;
+          left:154px;
         }
         .position-img-4{
           position:absolute;
           top:0;
-          left:374px;
+          left:300px;
         }
         .position-img-5{
           position:absolute;
           top:0;
-          left:520px;
+          left:446px;
         }
         .position-img-6{
           position:absolute;
           top:0;
-          left:666px;
+          left:592px;
         }
         .position-img-7{
           position:absolute;
           top:0;
-          left:814px;
+          left:740px;
+        }
+        .position-img-8{
+          position:absolute;
+          top:0;
+          left:888px;
         }
         .null-p{
           flex:1;

+ 4 - 0
src/views/home.vue

@@ -24,6 +24,8 @@
     <videoSurveillance v-if="pageType === 4"></videoSurveillance>
     <!--应急管控-->
     <emergencyManagement v-if="pageType === 5"></emergencyManagement>
+    <!--纯水系统-->
+    <pureWaterSystem v-if="pageType === 6"></pureWaterSystem>
     <planAlarm ref="planAlarm"></planAlarm>
   </div>
 </template>
@@ -33,6 +35,7 @@
   import resourceDevice from "./resourceDevice/index.vue";
   import newSafetyOverview from "./newSafetyOverview/index.vue";
   import videoSurveillance from "./videoSurveillance/index.vue";
+  import pureWaterSystem from "./pureWaterSystem/index.vue";
   import { getToken,removeToken } from '@/utils/auth'
   import planAlarm from "@/components/planAlarm/planAlarm.vue";
   export default {
@@ -43,6 +46,7 @@
       resourceDevice,
       newSafetyOverview,
       videoSurveillance,
+      pureWaterSystem,
       planAlarm,
     },
     data () {

+ 16 - 9
src/views/newSafetyOverview/index.vue

@@ -20,13 +20,15 @@
         <img class="position-img position-img-4" src="@/assets/ZDimages/img_bg_zc@1x.png">
         <img class="position-img position-img-5" src="@/assets/ZDimages/img_bg_zc@1x.png">
         <img class="position-img position-img-6" src="@/assets/ZDimages/img_bg_zc@1x.png">
-        <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_cdo@1x.png">
+        <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_zc@1x.png">
+        <img class="position-img position-img-8" src="@/assets/ZDimages/img_bg_cdo@1x.png">
         <p class="null-p"></p>
         <p class="button-check-p">安全总览</p>
         <p class="button-p" @click="goPage(2)">资源设备</p>
         <p class="button-p" @click="goPage(3)">三维模型</p>
         <p class="button-p" @click="goPage(4)">视频监控</p>
         <p class="button-p" @click="goPage(5)">应急管控</p>
+        <p class="button-p" @click="goPage(6)">纯水系统</p>
         <p class="null-p"></p>
       </div>
       <centerNumData></centerNumData>
@@ -494,43 +496,48 @@
         width:911px;
         position: absolute;
         left:50%;
-        margin:0 -456px;
+        margin:0 -445px;
         height:60px;
         display: flex;
         .position-img-1{
           position:absolute;
           top:0;
-          left:0;
+          left:-74px;
         }
         .position-img-2{
           position:absolute;
           top:0;
-          left:83px;
+          left:9px;
         }
         .position-img-3{
           position:absolute;
           top:0;
-          left:228px;
+          left:154px;
         }
         .position-img-4{
           position:absolute;
           top:0;
-          left:374px;
+          left:300px;
         }
         .position-img-5{
           position:absolute;
           top:0;
-          left:520px;
+          left:446px;
         }
         .position-img-6{
           position:absolute;
           top:0;
-          left:666px;
+          left:592px;
         }
         .position-img-7{
           position:absolute;
           top:0;
-          left:814px;
+          left:740px;
+        }
+        .position-img-8{
+          position:absolute;
+          top:0;
+          left:888px;
         }
         .null-p{
           flex:1;

+ 191 - 0
src/views/pureWaterSystem/index.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="pureWaterSystem-index">
+    <div class="center-top-button-max-box">
+      <img class="position-img position-img-1" src="@/assets/ZDimages/img_bg_cdo@1x.png">
+      <img class="position-img position-img-2" src="@/assets/ZDimages/img_bg_zc@1x.png">
+      <img class="position-img position-img-3" src="@/assets/ZDimages/img_bg_zc@1x.png">
+      <img class="position-img position-img-4" src="@/assets/ZDimages/img_bg_zc@1x.png">
+      <img class="position-img position-img-5" src="@/assets/ZDimages/img_bg_zc@1x.png">
+      <img class="position-img position-img-6" src="@/assets/ZDimages/img_bg_zc@1x.png">
+      <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_xz@1x.png">
+      <img class="position-img position-img-8" src="@/assets/ZDimages/img_bg_cdo@1x.png">
+      <p class="null-p"></p>
+      <p class="button-p" @click="goPage(1)">安全总览</p>
+      <p class="button-p" @click="goPage(2)">资源设备</p>
+      <p class="button-p" @click="goPage(3)">三维模型</p>
+      <p class="button-p" @click="goPage(6)">视频监控</p>
+      <p class="button-p" @click="goPage(5)">应急管控</p>
+      <p class="button-check-p">纯水系统</p>
+      <p class="null-p"></p>
+    </div>
+    <div class="left-max-big-box">
+      <title-page-img-components :propsData="propsData1"></title-page-img-components>
+      <div class="max-big-box">
+        <div class="big-box">
+
+        </div>
+        <div class="big-box">
+
+        </div>
+      </div>
+    </div>
+    <div class="right-max-big-box">
+      <title-page-img-components :propsData="propsData2"></title-page-img-components>
+      <div class="max-big-box">
+        <div class="big-box">
+
+        </div>
+        <div class="big-box">
+
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import titlePageImgComponents from '@/components/titlePageImgComponents.vue'
+  export default {
+    name: 'index',
+    components: {
+      titlePageImgComponents
+    },
+    data () {
+      return {
+        //组件传参
+        propsData1:{
+          title:'理科楼 - 纯水设备数据监测',
+        },
+        propsData2:{
+          title:'食品楼 - 纯水设备数据监测',
+        },
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+
+    },
+    methods:{
+      //页面切换
+      goPage(type){
+        this.$parent.pageCheck(type);
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .pureWaterSystem-index{
+    height:1409px;
+    padding:0 60px;
+    display: flex;
+    .center-top-button-max-box{
+      width:911px;
+      position: absolute;
+      left:50%;
+      margin:0 -445px;
+      height:60px;
+      display: flex;
+      .position-img-1{
+        position:absolute;
+        top:0;
+        left:-74px;
+      }
+      .position-img-2{
+        position:absolute;
+        top:0;
+        left:9px;
+      }
+      .position-img-3{
+        position:absolute;
+        top:0;
+        left:154px;
+      }
+      .position-img-4{
+        position:absolute;
+        top:0;
+        left:300px;
+      }
+      .position-img-5{
+        position:absolute;
+        top:0;
+        left:446px;
+      }
+      .position-img-6{
+        position:absolute;
+        top:0;
+        left:592px;
+      }
+      .position-img-7{
+        position:absolute;
+        top:0;
+        left:740px;
+      }
+      .position-img-8{
+        position:absolute;
+        top:0;
+        left:888px;
+      }
+      .null-p{
+        flex:1;
+      }
+      .button-p{
+        z-index:5;
+        cursor: pointer;
+        font-family: Source Han Sans, Source Han Sans;
+        width:145px;
+        font-size:24px;
+        font-weight:700;
+        line-height:60px;
+        text-align: center;
+        background: -webkit-linear-gradient(0deg, #FFFFFF, #FFFFFF); /* Chrome, Safari */
+        background: linear-gradient(0deg, #FFFFFF, #FFFFFF); /* 标准语法 */
+        -webkit-background-clip: text; /* Chrome, Safari */
+        background-clip: text;
+        -webkit-text-fill-color: transparent; /* Chrome, Safari */
+        color: transparent; /* 其他浏览器 */
+      }
+      .button-check-p{
+        z-index:5;
+        cursor: pointer;
+        font-family: Source Han Sans, Source Han Sans;
+        width:145px;
+        font-weight:700;
+        font-size:24px;
+        line-height:24px;
+        height:24px;
+        margin-top:18px;
+        text-align: center;
+        background: -webkit-linear-gradient(0deg, #34e4ff, #FFFFFF); /* Chrome, Safari */
+        background: linear-gradient(0deg, #34e4ff, #FFFFFF); /* 标准语法 */
+        -webkit-background-clip: text; /* Chrome, Safari */
+        background-clip: text;
+        -webkit-text-fill-color: transparent; /* Chrome, Safari */
+        color: transparent; /* 其他浏览器 */
+      }
+    }
+    .left-max-big-box{
+      width:1280px;
+      margin-top:90px;
+      height:1235px;
+    }
+    .right-max-big-box{
+      width:1280px;
+      margin-top:90px;
+      margin-left:37px;
+      height:1235px;
+    }
+    .max-big-box{
+      width:1280px;
+      height:1172px;
+      background-color: red;
+      .big-box{
+        height:570px;
+        background-color: #2f54eb;
+      }
+      .big-box:nth-child(2){
+        margin-top:32px;
+      }
+    }
+  }
+</style>

+ 29 - 0
src/views/pureWaterSystem/pageComponent/pureWaterPage.vue

@@ -0,0 +1,29 @@
+<template>
+  <div class="pureWaterPage">
+
+  </div>
+</template>
+<script>
+  export default {
+    name: 'pureWaterPage',
+    data () {
+      return {
+
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+
+    },
+    methods:{
+
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .pureWaterPage{
+
+  }
+</style>

+ 16 - 9
src/views/resourceDevice/index.vue

@@ -15,13 +15,15 @@
           <img class="position-img position-img-4" src="@/assets/ZDimages/img_bg_zc@1x.png">
           <img class="position-img position-img-5" src="@/assets/ZDimages/img_bg_zc@1x.png">
           <img class="position-img position-img-6" src="@/assets/ZDimages/img_bg_zc@1x.png">
-          <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_cdo@1x.png">
+          <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_zc@1x.png">
+          <img class="position-img position-img-8" src="@/assets/ZDimages/img_bg_cdo@1x.png">
           <p class="null-p"></p>
           <p class="button-p" @click="goPage(1)">安全总览</p>
           <p class="button-check-p">资源设备</p>
           <p class="button-p" @click="goPage(3)">三维模型</p>
           <p class="button-p" @click="goPage(4)">视频监控</p>
           <p class="button-p" @click="goPage(5)">应急管控</p>
+          <p class="button-p" @click="goPage(6)">纯水系统</p>
           <p class="null-p"></p>
         </div>
         <div class="center-flex-box" style="margin-top:80px;">
@@ -129,43 +131,48 @@
           width:911px;
           position: absolute;
           left:50%;
-          margin:0 -456px;
+          margin:0 -445px;
           height:60px;
           display: flex;
           .position-img-1{
             position:absolute;
             top:0;
-            left:0;
+            left:-74px;
           }
           .position-img-2{
             position:absolute;
             top:0;
-            left:83px;
+            left:9px;
           }
           .position-img-3{
             position:absolute;
             top:0;
-            left:228px;
+            left:154px;
           }
           .position-img-4{
             position:absolute;
             top:0;
-            left:374px;
+            left:300px;
           }
           .position-img-5{
             position:absolute;
             top:0;
-            left:520px;
+            left:446px;
           }
           .position-img-6{
             position:absolute;
             top:0;
-            left:666px;
+            left:592px;
           }
           .position-img-7{
             position:absolute;
             top:0;
-            left:814px;
+            left:740px;
+          }
+          .position-img-8{
+            position:absolute;
+            top:0;
+            left:888px;
           }
           .null-p{
             flex:1;

+ 16 - 9
src/views/videoSurveillance/index.vue

@@ -14,13 +14,15 @@
       <img class="position-img position-img-4" src="@/assets/ZDimages/img_bg_zc@1x.png">
       <img class="position-img position-img-5" src="@/assets/ZDimages/img_bg_xz@1x.png">
       <img class="position-img position-img-6" src="@/assets/ZDimages/img_bg_zc@1x.png">
-      <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_cdo@1x.png">
+      <img class="position-img position-img-7" src="@/assets/ZDimages/img_bg_zc@1x.png">
+      <img class="position-img position-img-8" src="@/assets/ZDimages/img_bg_cdo@1x.png">
       <p class="null-p"></p>
       <p class="button-p" @click="goPage(1)">安全总览</p>
       <p class="button-p" @click="goPage(2)">资源设备</p>
       <p class="button-p" @click="goPage(3)">三维模型</p>
       <p class="button-check-p">视频监控</p>
       <p class="button-p" @click="goPage(5)">应急管控</p>
+      <p class="button-p" @click="goPage(6)">纯水系统</p>
       <p class="null-p"></p>
     </div>
   </div>
@@ -80,43 +82,48 @@
       width:911px;
       position: absolute;
       left:50%;
-      margin:0 -456px;
+      margin:0 -445px;
       height:60px;
       display: flex;
       .position-img-1{
         position:absolute;
         top:0;
-        left:0;
+        left:-74px;
       }
       .position-img-2{
         position:absolute;
         top:0;
-        left:83px;
+        left:9px;
       }
       .position-img-3{
         position:absolute;
         top:0;
-        left:228px;
+        left:154px;
       }
       .position-img-4{
         position:absolute;
         top:0;
-        left:374px;
+        left:300px;
       }
       .position-img-5{
         position:absolute;
         top:0;
-        left:520px;
+        left:446px;
       }
       .position-img-6{
         position:absolute;
         top:0;
-        left:666px;
+        left:592px;
       }
       .position-img-7{
         position:absolute;
         top:0;
-        left:814px;
+        left:740px;
+      }
+      .position-img-8{
+        position:absolute;
+        top:0;
+        left:888px;
       }
       .null-p{
         flex:1;