Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper

epmet-oper-web/.vscode/settings.json

@@ -34,4 +34,4 @@
     "source.fixAll.eslint": true
   },
   "git.enableSmartCommit": true
-}
+}

epmet-oper-web/public/index.html

@@ -36,8 +36,8 @@
   <!-- 开发环境 -->
 <!--  <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
     <script>
-      //  window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
+       window.SITE_CONFIG['apiURL'] = 'http://192.168.1.140/api'
-      window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
+      // window.SITE_CONFIG['apiURL'] = 'http://118.190.150.119:41080/api'
       // window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
     </script>
     <% } %>
@@ -69,4 +69,4 @@
   <div id="app"></div>
 </body>
 
-</html>
+</html>

epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss

@@ -396,7 +396,12 @@
         }
       }
     }
+
+    .item_1{
+      padding:10px 10px;
+    }
   }
+  
   .score_no_border {
     padding: 0 20px;
   }

epmet-oper-web/src/components/wx-index/score.vue

@@ -13,11 +13,11 @@
           <div v-if="item.configuration.title"
                class="cpt-title-t">{{item.configuration.title}}</div>
           <div v-else
-               class="cpt-title-t">积分排行1111111</div>
+               class="cpt-title-t">积分排名</div>
 
         </div>
 
-        <!-- <div class="info">
+        <div class="info">
           <div class="card">
             <div class="title">
               <img class="avatar"
@@ -61,11 +61,11 @@
               </div>
             </div>
           </div>
-        </div> -->
+        </div>
 
-        <!-- <div class="score_list">
+        <div class="score_list ">
 
-          <div class="item"
+          <div class="item item_1"
                :key="subindex"
                v-for="(subitem,subindex) in item.demoData.list">
             <div class="logo">
@@ -88,7 +88,7 @@
             <div class="name">{{ subitem.name   }}</div>
             <div class="score">{{ subitem.score  }}</div>
           </div>
-        </div> -->
+        </div>
       </div>
 
       <!-- <div class="score_rank_content">
@@ -110,7 +110,6 @@
             <div>当月积分</div>
           </div>
 
-      
           <div class="score_list score_no_border">
             <div class="item"
                  :key="subindex"
@@ -161,7 +160,7 @@
         <div v-if="item.configuration.title"
              class="title">{{item.configuration.title}}</div>
         <div v-else
-             class="title">积分排行</div>
+             class="title">积分排名2.0</div>
 
         <div class="single">
           <div class="single_bc">

epmet-oper-web/src/main.js

@@ -4,7 +4,6 @@ import Element from 'element-ui'
 import App from '@/App'
 import i18n from '@/i18n'
 import router from '@/router'
-// import store1 from '@/store'
 import '@/icons'
 import '@/element-ui/theme/index.css'
 import '@/assets/scss/aui.scss'

epmet-oper-web/src/store/index.js

@@ -1,44 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import cloneDeep from 'lodash/cloneDeep'
-import user from './modules/user'
-
-Vue.use(Vuex)
-
-export default new Vuex.Store({
-  namespaced: true,
-  state: {
-    // 导航条, 布局风格, defalut(白色) / colorful(鲜艳)
-    navbarLayoutType: 'colorful',
-    // 侧边栏, 布局皮肤, default(白色) / dark(黑色)
-    sidebarLayoutSkin: 'dark',
-    // 侧边栏, 折叠状态
-    sidebarFold: false,
-    // 侧边栏, 菜单
-    sidebarMenuList: [],
-    sidebarMenuActiveName: '',
-    // 内容, 是否需要刷新
-    contentIsNeedRefresh: false,
-    // 内容, 标签页(默认添加首页)
-    contentTabs: [
-      {
-        ...window.SITE_CONFIG['contentTabDefault'],
-        'name': 'home',
-        'title': 'home'
-      }
-    ],
-    contentTabsActiveName: 'home'
-  },
-  modules: {
-    user
-
-  },
-  mutations: {
-    // 重置vuex本地储存状态
-    resetStore (state) {
-      Object.keys(state).forEach((key) => {
-        state[key] = cloneDeep(window.SITE_CONFIG['storeState'][key])
-      })
-    }
-  }
-})

epmet-oper-web/src/store/modules/user.js

@@ -1,8 +0,0 @@
-export default {
-  state: {
-    id: 0,
-    name: '',
-    realName: '',
-    superAdmin: 0
-  }
-}

epmet-oper-web/src/utils/index.js

@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie'
-import store from '@/store'
+import store from '@/js/store'
 
 /**
  * 获取字典数据列表

epmet-oper-web/src/views/modules/workPc/customer-add-or-update.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :visible.sync="visible"
-             :title="'选择客户'"
+             :title="'选择客户--'+menuName"
              :close-on-click-modal="false"
              :close-on-press-escape="false"
              :top="diaTop">
@@ -55,6 +55,12 @@ export default {
 
     }
   },
+  props: {
+    menuName: {
+      type: String,
+      default: "",
+    },
+  },
   computed: {
 
     diaWidth () {

epmet-oper-web/src/views/modules/workPc/dataMenu.vue

@@ -73,7 +73,7 @@
                        @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
             <el-button type="text"
                        size="small"
-                       @click="showCustomerMenu(scope.row.id)">{{ '客户配置' }}</el-button>
+                       @click="showCustomerMenu(scope.row)">{{ '客户配置' }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -84,6 +84,7 @@
                      @refreshDataList="getDataList"></add-or-update>
       <!-- 客户菜单配置 -->
       <customer-add-or-update ref="customerForm"
+                              :menuName="selMenuName"
                               @refreshDataList="getDataList"></customer-add-or-update>
     </div>
   </el-card>
@@ -103,7 +104,8 @@ export default {
         deleteURL: '/gov/access/menu'
       },
       customerFormVisible: false,
-      dataForm: {"tableName":'data_menu'}
+      dataForm: { "tableName": 'data_menu' },
+      selMenuName: ''
     }
   },
   components: {
@@ -117,8 +119,10 @@ export default {
     ...mapGetters(['clientHeight', 'resolution']),
   },
   methods: {
-    showCustomerMenu (tableId) {
+    showCustomerMenu (row) {
-      this.$refs['customerForm'].init(tableId)
+
+      this.selMenuName = row.name
+      this.$refs['customerForm'].init(row.id)
     }
   }
 }

epmet-oper-web/src/views/modules/workPc/menu.vue

@@ -73,7 +73,7 @@
                        @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
             <el-button type="text"
                        size="small"
-                       @click="showCustomerMenu(scope.row.id)">{{ '客户配置' }}</el-button>
+                       @click="showCustomerMenu(scope.row)">{{ '客户配置' }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -84,6 +84,7 @@
                      @refreshDataList="getDataList"></add-or-update>
       <!-- 客户菜单配置 -->
       <customer-add-or-update ref="customerForm"
+                              :menuName="selMenuName"
                               @refreshDataList="getDataList"></customer-add-or-update>
     </div>
   </el-card>
@@ -103,7 +104,8 @@ export default {
         deleteURL: '/gov/access/menu'
       },
       customerFormVisible: false,
-      dataForm: {"tableName":'gov_menu'}
+      dataForm: { "tableName": 'gov_menu' },
+      selMenuName: ''
     }
   },
   components: {
@@ -117,8 +119,9 @@ export default {
     ...mapGetters(['clientHeight', 'resolution']),
   },
   methods: {
-    showCustomerMenu (tableId) {
+    showCustomerMenu (row) {
-      this.$refs['customerForm'].init(tableId)
+      this.selMenuName = row.name
+      this.$refs['customerForm'].init(row.id)
     }
   }
 }