guoxiaohuan 5 years ago
parent
commit
0e3b019b35

+ 2 - 2
src/api/doBusiness/business.js

@@ -1,8 +1,8 @@
 import httputils from '@/api/httputils'
 import store from '@/store'
-export function queryHours({postParams}) {
+export function queryHours({ postParams }) {
     return httputils.postJson(`/duoduo-service/transfer/chiller/command/business/hours/query?projectId=${store.state.projectId}`, postParams)
 }
-export function updateHours({postParams}) {
+export function updateHours({ postParams }) {
     return httputils.postJson(`/duoduo-service/transfer/chiller/business/hours/save?projectId=${store.state.projectId}`, postParams)
 }

+ 0 - 8
src/api/evaluate/evaluate.js

@@ -12,14 +12,6 @@ export function energyDayQuery(date, { getParams }) {
 export function querychiller({ postParams }) {
     return httputils.postJson(`/duoduo-service/transfer/chiller/day/rpt/query?projectId=${store.state.projectId}`, postParams)
 }
-// 室内温度位置详情-室内温度页面中间的空间列表
-export function querySpace({ postParams }) {
-    return httputils.postJson(`/duoduo-service/object-service/object/space/query`, postParams)
-}
-// 查询空间温度-室内温度页面最下面的图
-export function queryHisdataQueryPeriodData({ postParams }) {
-    return httputils.postJson(`/duoduo-service/object-service/object/data/hisdataQueryPeriodData`, postParams)
-}
 export function queryTdbDay(date, { getParams }) {
     return httputils.getJson(`/duoduo-service/transfer/chiller/command/tdbDayQuery?projectId=${store.state.projectId}&date=${date}`, getParams)
 }

+ 52 - 52
src/components/zoomImage.vue

@@ -1,64 +1,64 @@
 <template>
-  <div class="zoom-image">
-    <img :src="url" @click="imagePreview(url)" />
-    <div id="tbody"></div>
-  </div>
+    <div class='zoom-image'>
+        <img :src='url' @click='imagePreview(url)' />
+        <div id='tbody'></div>
+    </div>
 </template>
 <script>
 export default {
-  data() {
-    return {};
-  },
-  props: ["url"],
-  methods: {
-    imagePreview(src) {
-      let body = document.querySelector("#tbody");
-      let mask = document.createElement("div");
-      let img = document.createElement("img");
-      img.src = src + "&width=1000";
-      mask.classList.add("mask");
-      this.setStyle(mask, img);
-      this.setEventListener(body, mask);
-      img.onload = function() {
-        mask.appendChild(img);
-        body.appendChild(mask);
-      };
+    data() {
+        return {}
     },
-    setStyle(mask, img) {
-      mask.style.position = "fixed";
-      mask.style.top = 0;
-      mask.style.left = 0;
-      mask.style.right = 0;
-      mask.style.bottom = 0;
-      mask.style.background = "rgba(0,0,0,0.8)";
-      mask.style.zIndex = "99";
-      img.style.position = "absolute";
-      img.style.top = "50%";
-      img.style.left = "50%";
-      img.style.width = "100%";
-      img.style.transform = "translate(-50%, -50%)";
-    },
-    setEventListener(body, mask) {
-      mask.addEventListener("click", function() {
-        body.removeChild(mask);
-      });
+    props: ['url'],
+    methods: {
+        imagePreview(src) {
+            let body = document.querySelector('#tbody')
+            let mask = document.createElement('div')
+            let img = document.createElement('img')
+            img.src = src + '&width=1000'
+            mask.classList.add('mask')
+            this.setStyle(mask, img)
+            this.setEventListener(body, mask)
+            img.onload = function() {
+                mask.appendChild(img)
+                body.appendChild(mask)
+            }
+        },
+        setStyle(mask, img) {
+            mask.style.position = 'fixed'
+            mask.style.top = 0
+            mask.style.left = 0
+            mask.style.right = 0
+            mask.style.bottom = 0
+            mask.style.background = 'rgba(0,0,0,0.8)'
+            mask.style.zIndex = '99'
+            img.style.position = 'absolute'
+            img.style.top = '50%'
+            img.style.left = '50%'
+            img.style.width = '100%'
+            img.style.transform = 'translate(-50%, -50%)'
+        },
+        setEventListener(body, mask) {
+            mask.addEventListener('click', function() {
+                body.removeChild(mask)
+            })
+        }
     }
-  }
-};
+}
 </script>
 <style lang="scss" scoped>
 .zoom-image {
-  width: 102px;
-  height: 102px;
-  padding: 5px;
-  border-radius: 4px;
-  border: 1px solid rgba(195, 199, 203, 1);
-  display: inline-block;
+    width: 102px;
+    height: 102px;
+    padding: 5px;
+    border-radius: 4px;
+    border: 1px solid rgba(195, 199, 203, 1);
+    display: inline-block;
 
-  img {
-    width: 100%;
-    height: 100%;
-    border-radius: 1px;
-  }
+    img {
+        width: 100%;
+        height: 100%;
+        border-radius: 1px;
+    }
 }
 </style>

+ 7 - 4
src/main.js

@@ -6,6 +6,9 @@ import store from '@/store'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import './assets/css/global.css'
+import moment from 'moment'
+Vue.prototype.$moment = moment
+moment.locale('zh-cn')
 
 Vue.use(ElementUI)
 
@@ -16,8 +19,8 @@ store.commit('setProId', sessionStorage.getItem('projectId') || 'Pj4419000005')
 
 /* eslint-disable no-new */
 new Vue({
-  el: '#app',
-  router,
-  store,
-  render: h => h(App)
+    el: '#app',
+    router,
+    store,
+    render: h => h(App)
 })

+ 7 - 0
src/utils/moment.js

@@ -0,0 +1,7 @@
+import moment from 'moment'
+moment.locale('zh-cn')
+
+
+export {
+
+}

+ 2 - 3
src/views/appeal/appealDetail.vue

@@ -62,12 +62,11 @@
     </div>
 </template>
 <script>
-var moment = require('moment')
-import 'moment/locale/zh-cn'
+import moment from 'moment'
 import Head from '../main/index'
 import AuditTable from '../audit/auditTable'
 import UploadImg from '../../components/uploadImg'
-import { queryWorkflow, querySimpleInfo, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
+import { querySimpleInfo, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
 import { updateWorkflow } from '@/api/audit/audit.js'
 export default {
     data() {

+ 2 - 3
src/views/appeal/appealDetails.vue

@@ -38,12 +38,11 @@
     </div>
 </template>
 <script>
-var moment = require('moment')
-import 'moment/locale/zh-cn'
+import moment from 'moment'
 import Head from '../main/index'
 import AuditTable from '../audit/auditTable'
 import UploadImg from '../../components/uploadImg'
-import { queryWorkflow, querySimpleInfo, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
+import { querySimpleInfo, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
 import { updateWorkflow } from '@/api/audit/audit.js'
 export default {
     data() {

+ 5 - 8
src/views/appeal/index.vue

@@ -130,13 +130,11 @@
 </template>
 <script>
 import Head from '../main/index'
-import { queryWorkflow, queryChillerExecuteInfo, querySimpleInfo } from '@/api/appeal/appeal.js'
+import { queryWorkflow, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
 import EvSnapshotsDialog from '../evaluate/evSnapshotsDialog'
 import { updateWorkflow } from '@/api/audit/audit.js'
 import { shutDown } from '@/utils/query.js'
-
-var moment = require('moment')
-import 'moment/locale/zh-cn'
+import moment from 'moment'
 
 export default {
     data() {
@@ -283,7 +281,7 @@ export default {
                 }
             }
             queryChillerExecuteInfo(params).then(res => {
-                console.log(res)
+                // console.log(res)
                 let obj = Object.assign(item, res.data[0])
                 this.menu(obj, type)
             })
@@ -304,8 +302,7 @@ export default {
                 }
             }
             queryChillerExecuteInfo(params).then(res => {
-                console.log(res)
-
+                // console.log(res)
                 let arr1 = [],
                     arr2 = [],
                     arr3 = []
@@ -315,7 +312,7 @@ export default {
                         this.newArr.forEach(item2 => {
                             if (item.recommend.appealId == item2.id) {
                                 let obj = Object.assign(item, item2)
-                                console.log(obj)
+                                // console.log(obj)
                                 this.appealsArr.push(obj)
                                 this.appealsDate = this.appealsArr[0].recommend.date
                             }

+ 1 - 3
src/views/audit/index.vue

@@ -111,9 +111,7 @@ import uploadImg from '../../components/uploadImg'
 import { queryWorkflow, queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
 import { updateWorkflow } from '@/api/audit/audit.js'
 import { querySimpleInfo } from '@/api/appeal/appeal.js'
-
-var moment = require('moment')
-import 'moment/locale/zh-cn'
+import moment from 'moment'
 
 export default {
     data() {

+ 98 - 111
src/views/doBusiness/monthTemp.vue

@@ -1,126 +1,113 @@
 <template>
-  <div class="date-temp">
-    <span class="arrow-left" @click="pickerChangeLeft"></span>
-    <span class="arrow-line arrow-line1" @click="pickerChangeLeft"></span>
-    <el-date-picker
-      v-model="pickerVal1"
-      @change="changeVal"
-      type="month"
-      format="yyyy.MM"
-      value-format="yyyyMMddhhmmss"
-    ></el-date-picker>
-    <span class="arrow-line" @click="pickerChangeRight"></span>
-    <span class="arrow-right" @click="pickerChangeRight"></span>
-  </div>
+    <div class='date-temp'>
+        <span class='arrow-left' @click='pickerChangeLeft'></span>
+        <span class='arrow-line arrow-line1' @click='pickerChangeLeft'></span>
+        <el-date-picker v-model='pickerVal1' @change='changeVal' type='month' format='yyyy.MM' value-format='yyyyMMddhhmmss'></el-date-picker>
+        <span class='arrow-line' @click='pickerChangeRight'></span>
+        <span class='arrow-right' @click='pickerChangeRight'></span>
+    </div>
 </template>
 <script>
-var moment = require("moment");
-import "moment/locale/zh-cn";
+import moment from 'moment'
+
 export default {
-  data() {
-    return {
-      pickerVal1: new Date()
-    };
-  },
-  methods: {
-    formatter(date) {
-      return moment.unix(date / 1000).format("YYYYMMDD");
+    data() {
+        return {
+            pickerVal1: new Date()
+        }
     },
-    pickerChangeLeft() {
-      if (this.pickerVal1) {
-        let dateTime = new Date(this.pickerVal1);
-        let newData = this.formatter(
-          new Date(dateTime.setMonth(dateTime.getMonth() - 1))
-        );
-        this.pickerVal1 =
-          newData.slice(0, 4) +
-          "." +
-          newData.slice(4, 6) +
-          "." +
-          newData.slice(6, 8);
-      }
-      this.$emit("pickerVal", this.pickerVal1);
+    methods: {
+        formatter(date) {
+            return moment.unix(date / 1000).format('YYYYMMDD')
+        },
+        pickerChangeLeft() {
+            if (this.pickerVal1) {
+                let dateTime = new Date(this.pickerVal1)
+                let newData = this.formatter(new Date(dateTime.setMonth(dateTime.getMonth() - 1)))
+                this.pickerVal1 = newData.slice(0, 4) + '.' + newData.slice(4, 6) + '.' + newData.slice(6, 8)
+            }
+            this.$emit('pickerVal', this.pickerVal1)
+        },
+        changeVal(val) {
+            console.log(val)
+            this.$emit('pickerVal', val)
+        },
+        pickerChangeRight() {
+            if (this.pickerVal1) {
+                console.log(this.pickerVal1)
+                // let dateTime = new Date(this.pickerVal1);
+                // let newData = this.formatter(
+                //   new Date(dateTime.setMonth(dateTime.getMonth() + 1))
+                // );
+                // this.pickerVal1 =
+                //   newData.slice(0, 4) +
+                //   "." +
+                //   newData.slice(4, 6) +
+                //   "." +
+                //   newData.slice(6, 8);
+            }
+            this.$emit('pickerVal', this.pickerVal1)
+        }
     },
-    changeVal(val) {
-      console.log(val)
-      this.$emit("pickerVal", val);
-    },
-    pickerChangeRight() {
-      if (this.pickerVal1) {
-        console.log(this.pickerVal1);
-        // let dateTime = new Date(this.pickerVal1);
-        // let newData = this.formatter(
-        //   new Date(dateTime.setMonth(dateTime.getMonth() + 1))
-        // );
-        // this.pickerVal1 =
-        //   newData.slice(0, 4) +
-        //   "." +
-        //   newData.slice(4, 6) +
-        //   "." +
-        //   newData.slice(6, 8);
-      }
-      this.$emit("pickerVal", this.pickerVal1);
-    }
-  },
-  mounted() {}
-};
+    mounted() {}
+}
 </script>
 <style lang="scss">
 .date-temp {
-  background: rgba(255, 255, 255, 1);
-  border-radius: 4px;
-  border: 1px solid rgba(195, 198, 203, 1);
-  display: flex;
-  align-items: center;
-  .arrow-left {
-    width: 0;
-    height: 0;
-    border-top: 5px solid transparent;
-    border-bottom: 5px solid transparent;
-    border-right: 5px solid #9ca2a9;
-    margin-right: 5px;
-    margin-left: 7px;
-    cursor: pointer;
-  }
-  .arrow-right {
-    width: 0;
-    height: 0;
-    border-top: 5px solid transparent;
-    border-bottom: 5px solid transparent;
-    border-left: 5px solid #9ca2a9;
-    margin-right: 7px;
-    margin-left: 5px;
-    cursor: pointer;
-  }
-  .arrow-line {
-    display: inline-block;
-    width: 2px;
-    height: 16px;
-    background: rgba(228, 229, 231, 1);
-  }
-  .arrow-line1 {
-    margin-right: 3.5px;
-  }
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(195, 198, 203, 1);
+    display: flex;
+    align-items: center;
+    .arrow-left {
+        width: 0;
+        height: 0;
+        border-top: 5px solid transparent;
+        border-bottom: 5px solid transparent;
+        border-right: 5px solid #9ca2a9;
+        margin-right: 5px;
+        margin-left: 7px;
+        cursor: pointer;
+    }
+    .arrow-right {
+        width: 0;
+        height: 0;
+        border-top: 5px solid transparent;
+        border-bottom: 5px solid transparent;
+        border-left: 5px solid #9ca2a9;
+        margin-right: 7px;
+        margin-left: 5px;
+        cursor: pointer;
+    }
+    .arrow-line {
+        display: inline-block;
+        width: 2px;
+        height: 16px;
+        background: rgba(228, 229, 231, 1);
+    }
+    .arrow-line1 {
+        margin-right: 3.5px;
+    }
 }
 </style>
 <style lang="scss">
 .date-temp {
-  text-align: center;
-  .el-input__inner {
-    width: 93px !important;
-    margin: 7px 6px;
-    height: 22px;
-    line-height: 22px;
-    border: none;
-  }
-  .el-input__icon {
-    display: none;
-  }
-  .el-input--prefix .el-input__inner {
-    padding-left: 5px;
-  }
-  .el-input--suffix .el-input__inner {
-    padding-right: 5px;
-  }
+    text-align: center;
+    .el-input__inner {
+        width: 93px !important;
+        margin: 7px 6px;
+        height: 22px;
+        line-height: 22px;
+        border: none;
+    }
+    .el-input__icon {
+        display: none;
+    }
+    .el-input--prefix .el-input__inner {
+        padding-left: 5px;
+    }
+    .el-input--suffix .el-input__inner {
+        padding-right: 5px;
+    }
 }
 </style>

+ 118 - 139
src/views/evaluate/dateTemp.vue

@@ -1,157 +1,136 @@
 <template>
-  <div class="date-temp">
-    <span class="arrow-left" @click="pickerChangeLeft"></span>
-    <span class="arrow-line arrow-line1" @click="pickerChangeLeft"></span>
-    <el-date-picker
-      v-model="pickerVal"
-      type="date"
-      format="yyyy.MM.dd"
-      value-format="yyyy.MM.dd"
-      @change="changeDate"
-      :picker-options="pickerOptions0"
-    ></el-date-picker>
-    <span class="arrow-line" @click="pickerChangeRight"></span>
-    <span class="arrow-right" @click="pickerChangeRight"></span>
-  </div>
+    <div class='date-temp'>
+        <span class='arrow-left' @click='pickerChangeLeft'></span>
+        <span class='arrow-line arrow-line1' @click='pickerChangeLeft'></span>
+        <el-date-picker
+            v-model='pickerVal'
+            type='date'
+            format='yyyy.MM.dd'
+            value-format='yyyy.MM.dd'
+            @change='changeDate'
+            :picker-options='pickerOptions0'
+        ></el-date-picker>
+        <span class='arrow-line' @click='pickerChangeRight'></span>
+        <span class='arrow-right' @click='pickerChangeRight'></span>
+    </div>
 </template>
 <script>
-var moment = require("moment");
-import "moment/locale/zh-cn";
+import moment from 'moment'
+
 export default {
-  data() {
-    return {
-      pickerVal: new Date(),
-      pickerOptions0: {
-        disabledDate(time) {
-          return time.getTime() > new Date(new Date().setDate(new Date().getDate()-1));
+    data() {
+        return {
+            pickerVal: new Date(),
+            pickerOptions0: {
+                disabledDate(time) {
+                    return time.getTime() > new Date(new Date().setDate(new Date().getDate() - 1))
+                }
+            }
         }
-      }
-    };
-  },
-  props: ["date"],
-  methods: {
-    formatter(date) {
-      return moment.unix(date / 1000).format("YYYYMMDD");
     },
-    formatterStr2(str) {
-      if (str) {
-        return str.substring(0, 2) + "" + str.substring(3, 5);
-      }
-    },
-    pickerChangeLeft() {
-      if (this.pickerVal) {
-        let dateTime = new Date(this.pickerVal);
-           let newData = this.formatter(
-            new Date(dateTime.setDate(dateTime.getDate() - 1))
-          );
-          this.pickerVal =
-            newData.slice(0, 4) +
-            "." +
-            newData.slice(4, 6) +
-            "." +
-            newData.slice(6, 8);  
-        
-      }
-      this.$emit("pickerVal", this.pickerVal);
-    },
-    pickerChangeRight() {
-      if (this.pickerVal) {
-        let dateTime = new Date(this.pickerVal);
-        let time1 =  new Date(dateTime.setDate(dateTime.getDate() + 1))
-        if(time1 < new Date(new Date().setDate(new Date().getDate()-1))){
-          let newData = this.formatter(
-           time1
-          );
-          this.pickerVal =
-            newData.slice(0, 4) +
-            "." +
-            newData.slice(4, 6) +
-            "." +
-            newData.slice(6, 8);
-            this.$emit("pickerVal", this.pickerVal);
+    props: ['date'],
+    methods: {
+        formatter(date) {
+            return moment.unix(date / 1000).format('YYYYMMDD')
+        },
+        formatterStr2(str) {
+            if (str) {
+                return str.substring(0, 2) + '' + str.substring(3, 5)
+            }
+        },
+        pickerChangeLeft() {
+            if (this.pickerVal) {
+                let dateTime = new Date(this.pickerVal)
+                let newData = this.formatter(new Date(dateTime.setDate(dateTime.getDate() - 1)))
+                this.pickerVal = newData.slice(0, 4) + '.' + newData.slice(4, 6) + '.' + newData.slice(6, 8)
+            }
+            this.$emit('pickerVal', this.pickerVal)
+        },
+        pickerChangeRight() {
+            if (this.pickerVal) {
+                let dateTime = new Date(this.pickerVal)
+                let time1 = new Date(dateTime.setDate(dateTime.getDate() + 1))
+                if (time1 < new Date(new Date().setDate(new Date().getDate() - 1))) {
+                    let newData = this.formatter(time1)
+                    this.pickerVal = newData.slice(0, 4) + '.' + newData.slice(4, 6) + '.' + newData.slice(6, 8)
+                    this.$emit('pickerVal', this.pickerVal)
+                }
+            }
+        },
+        changeDate(val) {
+            this.$emit('pickerVal', val)
+        },
+        formatterStr(str) {
+            if (str) {
+                return str.substring(0, 4) + '.' + str.substring(4, 6) + '.' + str.substring(6, 8)
+            }
         }
-      }
     },
-    changeDate(val) {
-      this.$emit("pickerVal", val);
-    },
-    formatterStr(str) {
-      if (str) {
-        return (
-          str.substring(0, 4) +
-          "." +
-          str.substring(4, 6) +
-          "." +
-          str.substring(6, 8)
-        );
-      }
-    }
-  },
-  mounted() {
-    if (this.date) {
-      this.pickerVal = this.formatterStr(this.date);
-      // new Date().getFullYear() + this.formatterStr2(this.date)
-      this.$emit("pickerVal", this.pickerVal);
+    mounted() {
+        if (this.date) {
+            this.pickerVal = this.formatterStr(this.date)
+            // new Date().getFullYear() + this.formatterStr2(this.date)
+            this.$emit('pickerVal', this.pickerVal)
+        }
     }
-  }
-};
+}
 </script>
 <style lang="scss">
 .date-temp {
-  background: rgba(255, 255, 255, 1);
-  border-radius: 4px;
-  border: 1px solid rgba(195, 198, 203, 1);
-  display: flex;
-  align-items: center;
-  .arrow-left {
-    width: 0;
-    height: 0;
-    border-top: 5px solid transparent;
-    border-bottom: 5px solid transparent;
-    border-right: 5px solid #9ca2a9;
-    margin-right: 5px;
-    margin-left: 7px;
-    cursor: pointer;
-  }
-  .arrow-right {
-    width: 0;
-    height: 0;
-    border-top: 5px solid transparent;
-    border-bottom: 5px solid transparent;
-    border-left: 5px solid #9ca2a9;
-    margin-right: 7px;
-    margin-left: 5px;
-    cursor: pointer;
-  }
-  .arrow-line {
-    display: inline-block;
-    width: 2px;
-    height: 16px;
-    background: rgba(228, 229, 231, 1);
-  }
-  .arrow-line1 {
-    margin-right: 3.5px;
-  }
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(195, 198, 203, 1);
+    display: flex;
+    align-items: center;
+    .arrow-left {
+        width: 0;
+        height: 0;
+        border-top: 5px solid transparent;
+        border-bottom: 5px solid transparent;
+        border-right: 5px solid #9ca2a9;
+        margin-right: 5px;
+        margin-left: 7px;
+        cursor: pointer;
+    }
+    .arrow-right {
+        width: 0;
+        height: 0;
+        border-top: 5px solid transparent;
+        border-bottom: 5px solid transparent;
+        border-left: 5px solid #9ca2a9;
+        margin-right: 7px;
+        margin-left: 5px;
+        cursor: pointer;
+    }
+    .arrow-line {
+        display: inline-block;
+        width: 2px;
+        height: 16px;
+        background: rgba(228, 229, 231, 1);
+    }
+    .arrow-line1 {
+        margin-right: 3.5px;
+    }
 }
 </style>
 <style lang="scss">
 .date-temp {
-  text-align: center;
-  .el-input__inner {
-    width: 93px !important;
-    margin: 7px 6px;
-    height: 22px;
-    line-height: 22px;
-    border: none;
-  }
-  .el-input__icon {
-    display: none;
-  }
-  .el-input--prefix .el-input__inner {
-    padding-left: 5px;
-  }
-  .el-input--suffix .el-input__inner {
-    padding-right: 5px;
-  }
+    text-align: center;
+    .el-input__inner {
+        width: 93px !important;
+        margin: 7px 6px;
+        height: 22px;
+        line-height: 22px;
+        border: none;
+    }
+    .el-input__icon {
+        display: none;
+    }
+    .el-input--prefix .el-input__inner {
+        padding-left: 5px;
+    }
+    .el-input--suffix .el-input__inner {
+        padding-right: 5px;
+    }
 }
 </style>

+ 34 - 34
src/views/evaluate/evEnergyTable.vue

@@ -1,43 +1,43 @@
 <template>
-  <div class="evEnergyTable">
-    <el-table :data="samples" style="width: 100%;" height="350">
-      <el-table-column prop label="序号" align="left" type="index" width="150"></el-table-column>
-      <el-table-column prop="date" label="日期" align="left">
-        <template slot-scope="{row}">{{formatter(row.date)}}</template>
-      </el-table-column>
-      <el-table-column prop="outsiteTemp" label="室外平均温度(℃)" align="right">
-        <template slot-scope="{row}">{{row.outsiteTemp.toFixed(1)}}</template>
-      </el-table-column>
-      <el-table-column prop="indoorTemp" label="室内平均温度(℃)" align="right">
-        <template slot-scope="{row}">{{row.indoorTemp.toFixed(1)}}</template>
-      </el-table-column>
-      <el-table-column prop="energy" label="冷站能耗(kWh)" align="right">
-        <template slot-scope="{row}">{{row.energy.toFixed(0)}}</template>
-      </el-table-column>
-      <el-table-column prop="e" label align="right"></el-table-column>
-    </el-table>
-  </div>
+    <div class='evEnergyTable'>
+        <el-table :data='samples' style='width: 100%;' height='350'>
+            <el-table-column prop label='序号' align='left' type='index' width='150'></el-table-column>
+            <el-table-column prop='date' label='日期' align='left'>
+                <template slot-scope='{row}'>{{formatter(row.date)}}</template>
+            </el-table-column>
+            <el-table-column prop='outsiteTemp' label='室外平均温度(℃)' align='right'>
+                <template slot-scope='{row}'>{{row.outsiteTemp.toFixed(1)}}</template>
+            </el-table-column>
+            <el-table-column prop='indoorTemp' label='室内平均温度(℃)' align='right'>
+                <template slot-scope='{row}'>{{row.indoorTemp.toFixed(1)}}</template>
+            </el-table-column>
+            <el-table-column prop='energy' label='冷站能耗(kWh)' align='right'>
+                <template slot-scope='{row}'>{{row.energy.toFixed(0)}}</template>
+            </el-table-column>
+            <el-table-column prop='e' label align='right'></el-table-column>
+        </el-table>
+    </div>
 </template>
 <script>
-var moment = require("moment");
-import "moment/locale/zh-cn";
+import moment from 'moment'
+
 export default {
-  props: ["samples"],
-  data() {
-    return {};
-  },
-  methods: {
-    formatter(date) {
-      return moment.unix(date / 1000).format("YYYY.MM.DD");
-    }
-  },
-  mounted() {}
-};
+    props: ['samples'],
+    data() {
+        return {}
+    },
+    methods: {
+        formatter(date) {
+            return moment.unix(date / 1000).format('YYYY.MM.DD')
+        }
+    },
+    mounted() {}
+}
 </script>
 <style lang="scss">
 .evEnergyTable {
-  .el-table thead {
-    background: rgba(248, 249, 250, 1);
-  }
+    .el-table thead {
+        background: rgba(248, 249, 250, 1);
+    }
 }
 </style>

+ 1 - 1
src/views/evaluate/evSnapshotsDialog.vue

@@ -128,7 +128,7 @@
 <script>
 import echarts from 'echarts'
 import { shutDown } from '@/utils/query.js'
-import { queryQuickData, getCommand } from '@/api/strategy/strategy.js'
+import { queryQuickData } from '@/api/strategy/strategy.js'
 export default {
     props: ['appealsDate', 'time'],
     data() {

+ 1 - 2
src/views/evaluate/evTwoLevelMenu.vue

@@ -71,9 +71,8 @@ import EvCard from './evCard' //执行率
 import EvRateTitle from './evRateTitle'
 import EvHistory from './evHistory'
 import DateTemp from './dateTemp'
-import { runDataQury, energyDayQuery, querychiller, querySpace, queryHisdataQueryPeriodData, queryTdbDay } from '@/api/evaluate/evaluate.js'
+import { energyDayQuery, querychiller, queryTdbDay } from '@/api/evaluate/evaluate.js'
 import { queryChillerExecuteInfo } from '@/api/appeal/appeal.js'
-import bus from '@/utils/bus.js'
 
 export default {
     data() {

+ 3 - 4
src/views/evaluate/index.vue

@@ -95,10 +95,9 @@ import EvEnergySavingRate from './evEnergySavingRate'
 import EvImplementationRate from './evImplementationRate'
 import EvSatisfactionRate from './evSatisfactionRate'
 import EvIndoorTemperature from './evIndoorTemperature'
-import { runDataQury, energyDayQuery } from '@/api/evaluate/evaluate.js'
-var moment = require('moment')
-import 'moment/locale/zh-cn'
-import { toTimestamp, timestamp2String } from '@/utils/helper.js'
+import { runDataQury } from '@/api/evaluate/evaluate.js'
+import moment from 'moment'
+import { timestamp2String } from '@/utils/helper.js'
 import { mapGetters } from 'vuex'
 export default {
     data() {

+ 352 - 361
src/views/main/index.vue

@@ -1,399 +1,390 @@
 <template>
-  <div class="mainContainer">
-    <div class="mainContainerBox">
-      <header>
-        <div class="head-left">
-          <ul>
-            <li>
-              <div @click="navBlock" class="head-bth">
-                <span v-for="(item,index) in 3" :key="index"></span>
-              </div>
-            </li>
-            <li class="line">
-              <span></span>
-            </li>
-            <li>
-              <img class="head-icon" src="@/assets/lzzk.png" alt />
-            </li>
-            <li>
-              <span class="head-text">冷站智控</span>
-            </li>
-            <li>
-              <span class="head-circular"></span>
-            </li>
-            <li>
-              <span class="head-text">{{headText}}</span>
-            </li>
-            <!-- <li>
+    <div class='mainContainer'>
+        <div class='mainContainerBox'>
+            <header>
+                <div class='head-left'>
+                    <ul>
+                        <li>
+                            <div @click='navBlock' class='head-bth'>
+                                <span v-for='(item,index) in 3' :key='index'></span>
+                            </div>
+                        </li>
+                        <li class='line'>
+                            <span></span>
+                        </li>
+                        <li>
+                            <img class='head-icon' src='@/assets/lzzk.png' alt />
+                        </li>
+                        <li>
+                            <span class='head-text'>冷站智控</span>
+                        </li>
+                        <li>
+                            <span class='head-circular'></span>
+                        </li>
+                        <li>
+                            <span class='head-text'>{{headText}}</span>
+                        </li>
+                        <!-- <li>
               <div class="triangle_border_down"></div>
-            </li> -->
-          </ul>
+                        </li>-->
+                    </ul>
+                </div>
+                <div class='head-right'>
+                    <ul>
+                        <li>
+                            <span class='head-text'>{{dateNow||'--'}}</span>
+                        </li>
+                        <li>
+                            <span class='line'></span>
+                        </li>
+                        <li>
+                            <span class='head-text MicrYaHei'>天气:{{weather}}</span>
+                        </li>
+                        <li>
+                            <span class='head-text MicrYaHei'>{{temperatureOut}}℃</span>
+                        </li>
+                        <li>
+                            <span class='line'></span>
+                        </li>
+                        <li>
+                            <span class>{{$store.state.userInfo.username}}</span>
+                        </li>
+                        <li>
+                            <div class='triangle_border_down'></div>
+                        </li>
+                    </ul>
+                </div>
+            </header>
+            <nav>
+                <div class='nav-left'>
+                    <el-select class='nav-select' v-model='value' @change='changeProjectId'>
+                        <el-option v-for='item in options' :key='item.value' :label='item.label' :value='item.value'></el-option>
+                    </el-select>
+                </div>
+            </nav>
         </div>
-        <div class="head-right">
-          <ul>
-            <li>
-              <span class="head-text">{{dateNow||'--'}}</span>
-            </li>
-            <li>
-              <span class="line"></span>
-            </li>
-            <li>
-              <span class="head-text MicrYaHei">天气:{{weather}}</span>
-            </li>
-            <li>
-              <span class="head-text MicrYaHei">{{temperatureOut}}℃</span>
-            </li>
-            <li>
-              <span class="line"></span>
-            </li>
-            <li>
-              <span class>{{$store.state.userInfo.username}}</span>
-            </li>
-            <li>
-              <div class="triangle_border_down"></div>
-            </li>
-          </ul>
-        </div>
-      </header>
-      <nav>
-        <div class="nav-left">
-          <el-select class="nav-select" v-model="value" @change="changeProjectId">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
+        <div class='mainContainerTop'></div>
+        <div id='nav' class='nav'>
+            <div class='nav-box'>
+                <div @click='navNone' class='nav-bth'>
+                    <span v-for='(item,index) in 3' :key='index'></span>
+                </div>
+                <div class='nav-top'>冷站智控</div>
+            </div>
+            <p v-for='(item,index) in menuList' :key='index' class='nav-title'>
+                <router-link :to='item.path'>{{item.name}}</router-link>
+            </p>
         </div>
-      </nav>
+        <div class='mask' @click='navNone' v-if='menuShow'></div>
     </div>
-    <div class="mainContainerTop"></div>
-    <div id="nav" class="nav">
-      <div class="nav-box">
-        <div @click="navNone" class="nav-bth">
-          <span v-for="(item,index) in 3" :key="index"></span>
-        </div>
-        <div class="nav-top">冷站智控</div>
-      </div>
-      <p v-for="(item,index) in menuList" :key="index" class="nav-title">
-        <router-link :to="item.path">{{item.name}}</router-link>
-      </p>
-    </div>
-    <div class="mask" @click="navNone" v-if="menuShow"></div>
-  </div>
 </template>
 <script>
-import store from "../../store";
-var moment = require("moment");
-import "moment/locale/zh-cn";
-import { queryWeather } from "@/api/main/main.js";
+import store from '../../store'
+import moment from 'moment'
+import { queryWeather } from '@/api/main/main.js'
 export default {
-  data() {
-    return {
-      menuShow: false,
-      menuList: [
-        {
-          name: "当日运行策略",
-          path: "/strategy"
-        },
-        {
-          name: "运行评价",
-          path: "/evaluate"
+    data() {
+        return {
+            menuShow: false,
+            menuList: [
+                {
+                    name: '当日运行策略',
+                    path: '/strategy'
+                },
+                {
+                    name: '运行评价',
+                    path: '/evaluate'
+                },
+                {
+                    name: '未执行申诉',
+                    path: '/appeal'
+                },
+                {
+                    name: '申诉审核',
+                    path: '/audit'
+                },
+                {
+                    name: '营业时间调整',
+                    path: '/doBusiness'
+                }
+            ],
+            options: [],
+            dateNow: new Date(),
+            weather: '',
+            temperatureIn: '', // 室内
+            temperatureOut: '', // 室外
+            value: sessionStorage.getItem('projectId') || store.state.projectId
+        }
+    },
+    props: ['headText'],
+    computed: {},
+    methods: {
+        changeProjectId(val) {
+            console.log(val)
+            sessionStorage.setItem('projectId', val)
+            location.reload()
         },
-        {
-          name: "未执行申诉",
-          path: "/appeal"
+        navNone() {
+            this.menuShow = false
+            document.getElementById('nav').className = 'nav'
         },
-        {
-          name: "申诉审核",
-          path: "/audit"
+        navBlock() {
+            this.menuShow = true
+            document.getElementById('nav').className = 'nav nav-hover'
         },
-        {
-          name: "营业时间调整",
-          path: "/doBusiness"
+        // 查询当日天气
+        query() {
+            queryWeather({}).then(res => {
+                if (res.result == 'success') {
+                    this.weather = res.weather || '--'
+                    this.temperatureIn = res.temperatureIn || '--'
+                    this.temperatureOut = res.temperatureOut || '--'
+                }
+            })
         }
-      ],
-      options: [
-      ],
-      dateNow: new Date(),
-      weather: "",
-      temperatureIn: "", // 室内
-      temperatureOut: "", // 室外
-      value: sessionStorage.getItem('projectId') || store.state.projectId
-    };
-  },
-  props: ["headText"],
-  computed:{
- 
-  },
-  methods: {
-    changeProjectId(val){
-      console.log(val)
-      sessionStorage.setItem('projectId',val)
-      location.reload()
-    },
-    navNone() {
-      this.menuShow = false
-      document.getElementById("nav").className = "nav";
-    },
-    navBlock() {
-      this.menuShow = true
-      document.getElementById("nav").className = "nav nav-hover";
     },
-    // 查询当日天气
-    query() {
-      queryWeather({}).then(res => {
-        if (res.result == "success") {
-          this.weather = res.weather || "--";
-          this.temperatureIn = res.temperatureIn || "--";
-          this.temperatureOut = res.temperatureOut || "--";
-        }
-      });
+    mounted() {
+        let projects = this.$store.state.projects.projects
+        projects.forEach(el => {
+            this.options.push({
+                label: el.localName,
+                value: el.id
+            })
+        })
+        setInterval(() => {
+            this.dateNow = moment()
+                .locale('zh-cn')
+                .format('YYYY.MM.DD HH:mm')
+        }, 1000)
+        this.query()
     }
-  },
-  mounted() {
-    let projects = this.$store.state.projects.projects
-    projects.forEach(el=>{
-      this.options.push({
-        label:el.localName,
-        value:el.id
-      })
-    })
-    setInterval(() => {
-      this.dateNow = moment()
-        .locale("zh-cn")
-        .format("YYYY.MM.DD HH:mm");
-    }, 1000);
-    this.query();
-  }
-};
+}
 </script>
 <style lang="scss" scoped>
 .mainContainer {
-  .mainContainerBox {
-    width: 100%;
-    height: 96px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 1;
-    header {
-      max-height: 48px;
-      padding: 12px 16px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      background: rgba(255, 255, 255, 1);
-      box-shadow: 0px 3px 14px 0px rgba(31, 35, 41, 0.1);
-      .head-left {
-        display: flex;
-        align-items: center;
-        ul {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin: 0;
-          padding: 0;
-          li {
-            margin: 0 4px;
-            .head-bth {
-              width: 16px;
-              height: 16px;
-              span {
+    .mainContainerBox {
+        width: 100%;
+        height: 96px;
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 1;
+        header {
+            max-height: 48px;
+            padding: 12px 16px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            background: rgba(255, 255, 255, 1);
+            box-shadow: 0px 3px 14px 0px rgba(31, 35, 41, 0.1);
+            .head-left {
+                display: flex;
+                align-items: center;
+                ul {
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    margin: 0;
+                    padding: 0;
+                    li {
+                        margin: 0 4px;
+                        .head-bth {
+                            width: 16px;
+                            height: 16px;
+                            span {
+                                display: block;
+                                width: 18px;
+                                height: 2px;
+                                background: rgba(0, 145, 255, 1);
+                                border-radius: 1px;
+                                margin: 0 auto;
+                            }
+                            span:nth-of-type(2) {
+                                margin: 5px auto;
+                            }
+                        }
+                        .line {
+                            display: inline-block;
+                            width: 1px;
+                            height: 16px;
+                            margin: 4px 12px 0 12px;
+                            background: rgba(216, 216, 216, 1);
+                        }
+                        .head-icon {
+                            width: 20px;
+                            height: 20px;
+                            margin-top: 3px;
+                        }
+                        .head-text {
+                            height: 26px;
+                            font-size: 14px;
+                            color: rgba(31, 36, 41, 1);
+                            line-height: 26px;
+                        }
+                        .head-circular {
+                            display: inline-block;
+                            width: 4px;
+                            height: 4px;
+                            background: rgba(195, 198, 203, 1);
+                            border-radius: 90px;
+                            margin-bottom: 3px;
+                        }
+                        .triangle_border_down {
+                            width: 0;
+                            height: 0;
+                            border-width: 8px 6px 0;
+                            border-style: solid;
+                            border-color: #9ca2a9 transparent transparent;
+                        }
+                    }
+                }
+            }
+            .head-right {
+                display: flex;
+                align-items: center;
+                ul {
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    margin: 0;
+                    padding: 0;
+                    li {
+                        margin: 0 4px;
+                        .head-bth {
+                            display: inline-block;
+                            width: 24px;
+                            height: 24px;
+                            background: rgba(0, 145, 255, 1);
+                        }
+                        .line {
+                            display: inline-block;
+                            width: 1px;
+                            height: 16px;
+                            margin: 4px 8px 0 8px;
+                            background: rgba(216, 216, 216, 1);
+                        }
+                        .head-text {
+                            height: 18px;
+                            font-size: 14px;
+                            color: #646c73;
+                            line-height: 19px;
+                        }
+                        .head-circular {
+                            display: inline-block;
+                            width: 4px;
+                            height: 4px;
+                            background: rgba(195, 198, 203, 1);
+                            border-radius: 90px;
+                            margin-bottom: 3px;
+                        }
+                        .triangle_border_down {
+                            width: 0;
+                            height: 0;
+                            border-width: 8px 6px 0;
+                            border-style: solid;
+                            border-color: #9ca2a9 transparent transparent;
+                        }
+                    }
+                }
+            }
+        }
+        nav {
+            height: 48px;
+            background: rgba(247, 249, 250, 1);
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+        }
+    }
+    .mainContainerTop {
+        width: 100%;
+        height: 96px;
+    }
+    .nav {
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 0px;
+        background: #004275;
+        overflow: hidden;
+        height: 1005px;
+        transition: all 0.3s;
+        -webkit-transition: all 0.3s;
+        -moz-transition: all 0.3s;
+        -ms-transition: all 0.3s;
+        -o-transition: all 0.3s;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        z-index: 99;
+        .nav-bth {
+            width: 16px;
+            height: 16px;
+            margin: 24px;
+            span {
                 display: block;
                 width: 18px;
                 height: 2px;
-                background: rgba(0, 145, 255, 1);
+                background: #fff;
                 border-radius: 1px;
                 margin: 0 auto;
-              }
-              span:nth-of-type(2) {
-                margin: 5px auto;
-              }
             }
-            .line {
-              display: inline-block;
-              width: 1px;
-              height: 16px;
-              margin: 4px 12px 0 12px;
-              background: rgba(216, 216, 216, 1);
-            }
-            .head-icon {
-              width: 20px;
-              height: 20px;
-              margin-top: 3px;
-            }
-            .head-text {
-              height: 26px;
-              font-size: 14px;
-              color: rgba(31, 36, 41, 1);
-              line-height: 26px;
-            }
-            .head-circular {
-              display: inline-block;
-              width: 4px;
-              height: 4px;
-              background: rgba(195, 198, 203, 1);
-              border-radius: 90px;
-              margin-bottom: 3px;
-            }
-            .triangle_border_down {
-              width: 0;
-              height: 0;
-              border-width: 8px 6px 0;
-              border-style: solid;
-              border-color: #9ca2a9 transparent transparent;
+            span:nth-of-type(2) {
+                margin: 5px auto;
             }
-          }
         }
-      }
-      .head-right {
-        display: flex;
-        align-items: center;
-        ul {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin: 0;
-          padding: 0;
-          li {
-            margin: 0 4px;
-            .head-bth {
-              display: inline-block;
-              width: 24px;
-              height: 24px;
-              background: rgba(0, 145, 255, 1);
+        .nav-box {
+            display: flex;
+            align-items: center;
+            padding-right: 24px;
+            .nav-top {
+                color: #fff;
             }
-            .line {
-              display: inline-block;
-              width: 1px;
-              height: 16px;
-              margin: 4px 8px 0 8px;
-              background: rgba(216, 216, 216, 1);
-            }
-            .head-text {
-              height: 18px;
-              font-size: 14px;
-              color: #646c73;
-              line-height: 19px;
-            }
-            .head-circular {
-              display: inline-block;
-              width: 4px;
-              height: 4px;
-              background: rgba(195, 198, 203, 1);
-              border-radius: 90px;
-              margin-bottom: 3px;
-            }
-            .triangle_border_down {
-              width: 0;
-              height: 0;
-              border-width: 8px 6px 0;
-              border-style: solid;
-              border-color: #9ca2a9 transparent transparent;
+        }
+
+        .nav-title {
+            padding: 0 24px;
+            a {
+                color: #fff;
+                opacity: 0.9;
+                font-size: 16px;
+                line-height: 24px;
             }
-          }
         }
-      }
-    }
-    nav {
-      height: 48px;
-      background: rgba(247, 249, 250, 1);
-      display: flex;
-      justify-content: flex-start;
-      align-items: center;
-    }
-  }
-  .mainContainerTop {
-    width: 100%;
-    height: 96px;
-  }
-  .nav {
-    position: fixed;
-    left: 0;
-    top: 0;
-    width: 0px;
-    background: #004275;
-    overflow: hidden;
-    height: 1005px;
-    transition: all 0.3s;
-    -webkit-transition: all 0.3s;
-    -moz-transition: all 0.3s;
-    -ms-transition: all 0.3s;
-    -o-transition: all 0.3s;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    z-index: 99;
-    .nav-bth {
-      width: 16px;
-      height: 16px;
-      margin: 24px;
-      span {
-        display: block;
-        width: 18px;
-        height: 2px;
-        background: #fff;
-        border-radius: 1px;
-        margin: 0 auto;
-      }
-      span:nth-of-type(2) {
-        margin: 5px auto;
-      }
+        .nav-title:hover {
+            opacity: 0.5;
+        }
     }
-    .nav-box {
-      display: flex;
-      align-items: center;
-      padding-right: 24px;
-      .nav-top {
-        color: #fff;
-      }
+    .mask {
+        position: fixed;
+        top: 0;
+        left: 200px;
+        right: 0;
+        bottom: 0;
+        z-index: 99;
     }
-
-    .nav-title {
-      padding: 0 24px;
-      a {
-        color: #fff;
-        opacity: 0.9;
-        font-size: 16px;
-        line-height: 24px;
-      }
+    .nav-hover {
+        width: 200px;
     }
-    .nav-title:hover {
-      opacity: 0.5;
-    }
-  }
-  .mask {
-    position: fixed;
-    top: 0;
-    left: 200px;
-    right: 0;
-    bottom: 0;
-    z-index: 99;
-  }
-  .nav-hover {
-    width: 200px;
-  }
 }
 </style>
 <style lang="scss">
 .nav-left {
-  .nav-select {
-    width: 144px;
-    height: 28px;
-    border-radius: 14px;
-    margin-left: 16px;
-    .el-input--suffix .el-input__inner {
-      padding: 0 9px;
-      width: 144px;
-      height: 28px;
-      border-radius: 14px;
-      margin-left: 16px;
-    }
-    .el-input__icon {
-      line-height: 28px;
-      display: none;
+    .nav-select {
+        width: 144px;
+        height: 28px;
+        border-radius: 14px;
+        margin-left: 16px;
+        .el-input--suffix .el-input__inner {
+            padding: 0 9px;
+            width: 144px;
+            height: 28px;
+            border-radius: 14px;
+            margin-left: 16px;
+        }
+        .el-input__icon {
+            line-height: 28px;
+            display: none;
+        }
     }
-  }
 }
 </style>