调整

public/config.js

@@ -5,10 +5,10 @@ CONFIG.TITLE = 'AI节能管理系统'
 
 // 网络请求公用地址
 
-CONFIG.requestPath = 'http://localhost:8046'
+// CONFIG.requestPath = 'http://localhost:8046'
 
 // CONFIG.requestPath = 'http://10.20.72.31:8046'
-// CONFIG.requestPath = 'http://59.110.43.122:8046'
+CONFIG.requestPath = 'http://59.110.43.122:8046'
 
 // 文件上传
 CONFIG.urlPath = 'http://10.20.72.33/'

src/pages/analysis/fault/pie4.vue

@@ -56,7 +56,7 @@ export default {
           right: 10,
           top: 20,
           bottom: 20,
-          data: ['测试1', '测试2', '测试3', '测试4']
+          data: ['测试', '测试2', '测试3', '测试4']
 
           // selected: this.list.selected
         },

src/pages/analysis/indoor/chart4.vue

+<template lang='pug'>
+#chart4(:style="{ width: '100%', height: '90%'}")
+</template>
+
+<script>
+export default {
+    mounted() {
+        this.chart4()
+    },
+    methods: {
+    chart4() {
+      let dom = document.getElementById('chart4')
+      if (!dom) return
+      let myCharts = this.$echarts.init(dom)
+      let option = {
+        // color:['#D0F0FF'],
+        title: {
+          text: '故障报警'
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            boundaryGap: false,
+            data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        series: [
+          {
+            name: '订单数量',
+            type: 'line',
+            stack: '总量',
+             smooth: true,
+            label: {
+              show: true,
+              position: 'top'
+            },
+            areaStyle: {
+              normal: {
+                color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                  {
+                    offset: 0,
+                    color: 'orange' // 0% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: '#fff' // 100% 处的颜色
+                  }
+                ])
+              }
+            },
+            lineStyle: {
+              color: '#13B0FF'
+            },
+            itemStyle: {
+              normal: {
+                color: '#13B0FF'
+              }
+            },
+            emphasis: {
+              focus: 'series'
+            },
+            data: [820, 932, 901, 934, 1290, 1330, 1320]
+          }
+        ]
+      }
+      myCharts.setOption(option)
+    }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

src/pages/analysis/indoor/index.vue

@@ -45,7 +45,7 @@ card-warp(title="室内气象分析" height='45px' showBackground)
             div
                 chart3
             div
-                pie4
+                chart4
 
 </template>
 
@@ -53,13 +53,13 @@ card-warp(title="室内气象分析" height='45px' showBackground)
 import chart from './chart'
 import chart2 from './chart2'
 import chart3 from './chart3'
-import pie4 from './pie4'
+import chart4 from './chart4'
 export default {
     components: {
         chart,
         chart2,
         chart3,
-        pie4
+        chart4
     },
     data() {
         return {

src/pages/analysis/indoor/pie4.vue

-<template lang='pug'>
-#pie4(:style="{ width: '100%', height: '90%' }")
-</template>
-
-<script>
-export default {
-  mounted() {
-    this.pie()
-  },
-  methods: {
-    pie() {
-      let dom = document.getElementById('pie4')
-      if (!dom) return
-      let myCharts = this.$echarts.init(dom)
-      let option = {
-        title: {
-          text: '故障报警'
-        },
-        tooltip: {
-          trigger: 'item'
-        },
-        legend: {
-          top: '5%',
-          left: 'center'
-        },
-        series: [
-          {
-            name: '访问来源',
-            type: 'pie',
-            radius: ['40%', '70%'],
-            avoidLabelOverlap: false,
-            itemStyle: {
-              borderRadius: 10,
-              borderColor: '#fff',
-              borderWidth: 2
-            },
-            label: {
-              show: false,
-              position: 'center'
-            },
-            emphasis: {
-              label: {
-                show: true,
-                fontSize: '20',
-                fontWeight: 'bold'
-              }
-            },
-            labelLine: {
-              show: false
-            },
-            data: [
-              { value: 1048, name: '搜索引擎' },
-              { value: 735, name: '直接访问' },
-              { value: 580, name: '邮件营销' },
-              { value: 484, name: '联盟广告' },
-              { value: 300, name: '视频广告' }
-            ]
-          }
-        ]
-      }
-      myCharts.setOption(option)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

src/pages/eq/hall/page.vue

@@ -5,23 +5,16 @@
         <div>
 
           <el-form :inline="true" :model="formData" label-width="100">
-                <el-form-item label="定时功能启止时间：">
-                  <el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.startTime">
-                  </el-date-picker>
-                  <span style="padding: 0 10px">至</span>
-                  <el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.endTime">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="定时设定按钮：">
-                  <el-switch active-color="#47B320" v-model="formData.timing" inactive-color="#ff4949">
-                  </el-switch>
-                </el-form-item>
+            <el-row :gutter="10">
+              <el-col :span="12">
                 <el-form-item label="节能模式：">
-                  <el-switch active-color="#47B320" v-model="formData.saving" inactive-color="#ff4949" ></el-switch>
+                  <div class="switch-warp">
+                    <div :class="[formData.saving == 1?'on':'']" @click="handleSwitch(1)">人工</div>
+                    <div :class="[formData.saving == 2?'on':'']" @click="handleSwitch(2)">节能</div>
+                </div>
                 </el-form-item>
               <span class="btn-group">
                 <el-form-item label="">
-                  <el-button type="primary" size="mini">温度设定</el-button>
                   <el-button type="primary" size="mini">
                     <img src="../../home/image/sun_icon.png" alt="">
                     自然通风
@@ -36,6 +29,29 @@
                   </el-button>
                 </el-form-item>
               </span>
+              </el-col>
+              <el-col :span="24">
+
+                <el-form-item label="定时功能启止时间：">
+                  <el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.startTime">
+                  </el-date-picker>
+                  <span style="padding: 0 10px">至</span>
+                  <el-date-picker size="mini" style="width: 200px" type="date" placeholder="" v-model="formData.endTime">
+                  </el-date-picker>
+                </el-form-item>
+                <!-- <el-form-item label="定时设定按钮：">
+                  <el-switch active-color="#47B320" v-model="formData.timing" inactive-color="#ff4949">
+                  </el-switch>
+                </el-form-item> -->
+                <el-form-item label="温度设定：">
+                  <el-input ></el-input>
+                </el-form-item>
+                <el-form-item label="">
+                  <el-button type="primary" size="mini">确定</el-button>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
 
           </el-form>
 
@@ -106,7 +122,9 @@ export default {
       activeTab: '01',
       tableData: tableDataOne,
       tableColums: tableColumsOne,
-      formData: {},
+      formData: {
+        saving: 1
+      },
       tabList: [
         {
           value: '01',
@@ -135,6 +153,9 @@ export default {
     },
     statusHandle() {
 
+    },
+    handleSwitch(state) {
+      this.formData.saving = state
     }
   }
 }
@@ -158,4 +179,30 @@ export default {
     }
   }
 }
+
+  .switch-warp {
+    font-size: 12px;
+    line-height: 20px;
+    overflow: hidden;
+    border-radius: 13px;
+    background: #ced1d6;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0px 1px 0px 1px rgba(255, 255, 255, 0.25),
+      0px 2px 4px 0px rgba(0, 0, 0, 0.1);
+    div {
+      width: 46px;
+      height: 20px;
+      float: left;
+      text-align: center;
+      cursor: pointer;
+    }
+    div.on {
+      background: #45b5f8;
+      color: #fff;
+      border-radius: 13px;
+      border: 1px solid rgba(23, 41, 71, 0.5);
+      box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.3),
+        0px 2px 0px 0px rgba(255, 255, 255, 0.15);
+    }
+  }
 </style>

src/pages/eq/view/index.vue

@@ -582,7 +582,7 @@ export default {
           this.queryDetail(item.id)
         } else {
           // console.log('2')
-          this.noQueryDetail(item.id)
+          this.noQueryDetail(item)
         }
         // console.log('subCode', item.subCode, typeof (item.subCode))
         // switch (item.subCode) {

src/pages/eq/view/query-detail.vue

@@ -172,16 +172,16 @@ export default {
         if (data && data.code === 0) {
           this.dataForm = data.bean
           //如果当前设备摄像头为离线状态，则不加载画面
-          if(data.bean.byx2 == 0 && this.flvPlayer){//资源点状态(0=离线，1=在线)
+          if (data.bean.byx2 == 0 && this.flvPlayer) { //资源点状态(0=离线，1=在线)
             this.flvPlayer.pause()
             this.flvPlayer.unload()
             this.flvPlayer.detachMediaElement()
             this.flvPlayer.destroy()
             this.flvPlayer = null
             return
-          }else if(data.bean.byx2 == 0 && !this.flvPlayer){
+          } else if (data.bean.byx2 == 0 && !this.flvPlayer) {
             return
-          }else if(this.flvPlayer){
+          } else if (this.flvPlayer) {
             this.flvPlayer.pause()
             this.flvPlayer.unload()
             this.flvPlayer.detachMediaElement()