Merge branch 'dev'

epmet-oper-web/src/views/main-sidebar.vue

@@ -2,7 +2,7 @@
   <aside :class="['aui-sidebar', `aui-sidebar--${$store.state.sidebarLayoutSkin}`]">
     <div class="aui-sidebar__inner">
       <el-menu :default-active="$store.state.sidebarMenuActiveName"
-               :collapse="false"
+               :collapse="$store.state.sidebarFold"
                :unique-opened="true"
                :collapseTransition="false"
                class="aui-sidebar__menu">

epmet-oper-web/src/views/modules/customer/customize/ConfigItem.vue

@@ -1,7 +1,7 @@
 <!-- 配置详情 -->
 <template>
   <div style=" position: relative;">
-    <div v-if="userType==='opea'"
+    <div v-if="userType==='oper'"
          class="div_btn">
       <span style="margin-right:20px">{{customerName}}</span>
       <el-button type="default"
@@ -133,7 +133,7 @@
           </el-table-column>
         </el-table>
 
-        <el-table v-if="userType==='opea'"
+        <el-table v-if="userType==='oper'"
                   :data="resiNoList"
                   border
                   v-loading="noLoading"
@@ -300,7 +300,7 @@
           </el-table-column>
         </el-table>
 
-        <el-table v-if="userType==='opea'"
+        <el-table v-if="userType==='oper'"
                   :data="workNoList"
                   border
                   v-loading="noLoading"
@@ -429,7 +429,7 @@ export default {
       return localStorage.getItem('userType')
     },
     tableHeight1 () {
-      if (this.userType === 'opea') {
+      if (this.userType === 'oper') {
         return (this.clientHeight - 220) / 2 + 50
       } else {
         return (this.clientHeight - 220)