结算

energyManagement/src/views/settlementAudit/electricityAudit.vue

@@ -122,7 +122,7 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.clearingStartDate = arr[0];
+            this.mixins_query.clearingStartDate = !!arr[0] ? arr[0] : null;
              this.mixins_query.clearingEndDate = !!arr[1] ? arr[1] + 'T23:59:59' : '';
         },
         lookPage(row) {

energyManagement/src/views/settlementAudit/waterAudit.vue

@@ -122,8 +122,8 @@ export default {
             if (!arr) {
                 arr = ['', ''];
             }
-            this.mixins_query.clearingStartDate = arr[0];
-            this.mixins_query.clearingEndDate = !!arr[1] ? arr[1] + 'T23:59:59' : '';
+            this.mixins_query.clearingStartDate = !!arr[0] ? arr[0] : null;
+            this.mixins_query.clearingEndDate = !!arr[1] ? arr[1] + 'T23:59:59' : null;
         },
         lookPage(row) {
             this.showDialog = true;

operationSupport/src/components/common/Sidebar.vue

@@ -2,10 +2,10 @@
     <div class="sidebar" :style="collapse ? 'width:85px' : ''">
         <div class="logo" v-if="!collapse">
             <img src="@/assets/img/img_logo2.png" />
-            <div class="title"><span class="point"></span>运营支撑</div>
+            <div class="title"><span class="point"></span>{{ $store.getters['getThisDetai'].name }}</div>
         </div>
         <div class="logo shrink" v-else>
-            <div class="text">运营支撑</div>
+            <div class="text">{{ $store.getters['getThisDetai'].name }}</div>
         </div>
         <div class="menu-wrap no-scrollbar">
             <el-menu

operationSupport/src/main.js

@@ -91,6 +91,7 @@ Vue.prototype.routerLoad = {
         http.get('/sc-user-center/user/findUserMenu', { appId: '1002' }).then(({ status, data, msg }) => {
             if (0 === status) {
                 store.commit('setMenuList', data[0].children)
+                store.commit('setThisDetai', data[0])
             }
         });
     }

operationSupport/src/store/store.js

@@ -24,6 +24,7 @@ const store = new Vuex.Store({
     menuList: [],
     // 当前登录用户信息
     cruUserInfo: {},
+    thisDetai: {},
     //查询是否有未读消息
     messageNumber: false,
     //最近消息列表集合
@@ -44,7 +45,7 @@ const store = new Vuex.Store({
     //公司部门
     companyArray: [],
     departmentArray: [],
-    communityArray:[],
+    communityArray: [],
   },
   getters: {
     getTheme(state) {
@@ -84,6 +85,9 @@ const store = new Vuex.Store({
     getCruUserInfo(state) {
       return state.cruUserInfo;
     },
+    getThisDetai(state) {
+      return state.thisDetai
+    },
     getAreaSelect(state) {
       return state.areaSelect;
     },
@@ -102,7 +106,7 @@ const store = new Vuex.Store({
     getCommunityArray(state) {
       return state.communityArray
     }
-    
+
   },
   mutations: {
     setSearchPointInfo(state, data) {
@@ -132,6 +136,9 @@ const store = new Vuex.Store({
     setcCruUserInfo(state, data) {
       state.cruUserInfo = data;
     },
+    setThisDetai(state, data) {
+      state.thisDetai = data;
+    },
     setmessageNumber(state, data) {
       state.messageNumber = data;
     },
@@ -159,8 +166,8 @@ const store = new Vuex.Store({
     setDepartmentArray(state, data) {
       state.departmentArray = data
     },
-    setCommunityArray(state,data) {
-       state.communityArray = data
+    setCommunityArray(state, data) {
+      state.communityArray = data
     }
   },
   actions: {