From 995b28bf14fc3ac5af9ecaefede7c575592dc0e7 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Mon, 8 Aug 2022 10:32:40 +0800 Subject: [PATCH 1/7] 1 --- epmet-oper-web/public/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html index faeaaa0..46ea64b 100644 --- a/epmet-oper-web/public/index.html +++ b/epmet-oper-web/public/index.html @@ -36,8 +36,8 @@ <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %> <% } %> @@ -69,4 +69,4 @@
- \ No newline at end of file + From 46ff3587b5e32d3c1639f726ef8f3766ab1ce846 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 13 Sep 2022 14:52:31 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/.vscode/settings.json | 2 +- .../src/assets/scss/modules/wx-mini/score.scss | 5 +++++ epmet-oper-web/src/components/wx-index/score.vue | 15 +++++++-------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/epmet-oper-web/.vscode/settings.json b/epmet-oper-web/.vscode/settings.json index 175b415..f14aa03 100644 --- a/epmet-oper-web/.vscode/settings.json +++ b/epmet-oper-web/.vscode/settings.json @@ -34,4 +34,4 @@ "source.fixAll.eslint": true }, "git.enableSmartCommit": true -} \ No newline at end of file +} diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss index b7947d3..bcca8bd 100644 --- a/epmet-oper-web/src/assets/scss/modules/wx-mini/score.scss +++ b/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; } diff --git a/epmet-oper-web/src/components/wx-index/score.vue b/epmet-oper-web/src/components/wx-index/score.vue index 8581e5f..d4aeef0 100644 --- a/epmet-oper-web/src/components/wx-index/score.vue +++ b/epmet-oper-web/src/components/wx-index/score.vue @@ -13,11 +13,11 @@
{{item.configuration.title}}
积分排行1111111
+ class="cpt-title-t">积分排名 - + - + @@ -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,9 @@ export default { ...mapGetters(['clientHeight', 'resolution']), }, methods: { - showCustomerMenu (tableId) { - this.$refs['customerForm'].init(tableId) + showCustomerMenu (row) { + this.selMenuName = row.name + this.$refs['customerForm'].init(row.tableId) } } } diff --git a/epmet-oper-web/src/views/modules/workPc/menu.vue b/epmet-oper-web/src/views/modules/workPc/menu.vue index 4359b09..00d916a 100644 --- a/epmet-oper-web/src/views/modules/workPc/menu.vue +++ b/epmet-oper-web/src/views/modules/workPc/menu.vue @@ -73,7 +73,7 @@ @click="deleteHandle(scope.row.id)">{{ $t('delete') }} {{ '客户配置' }} + @click="showCustomerMenu(scope.row)">{{ '客户配置' }} @@ -84,6 +84,7 @@ @refreshDataList="getDataList"> @@ -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) { - this.$refs['customerForm'].init(tableId) + showCustomerMenu (row) { + this.selMenuName = row.name + this.$refs['customerForm'].init(row.tableId) } } } From 945f491880c330547c13d1770297adcce42a609f Mon Sep 17 00:00:00 2001 From: jiangyy Date: Mon, 19 Sep 2022 19:11:48 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/views/modules/workPc/dataMenu.vue | 3 ++- epmet-oper-web/src/views/modules/workPc/menu.vue | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-oper-web/src/views/modules/workPc/dataMenu.vue b/epmet-oper-web/src/views/modules/workPc/dataMenu.vue index 5ab57a7..0a947e3 100644 --- a/epmet-oper-web/src/views/modules/workPc/dataMenu.vue +++ b/epmet-oper-web/src/views/modules/workPc/dataMenu.vue @@ -120,8 +120,9 @@ export default { }, methods: { showCustomerMenu (row) { + this.selMenuName = row.name - this.$refs['customerForm'].init(row.tableId) + this.$refs['customerForm'].init(row.id) } } } diff --git a/epmet-oper-web/src/views/modules/workPc/menu.vue b/epmet-oper-web/src/views/modules/workPc/menu.vue index 00d916a..8838629 100644 --- a/epmet-oper-web/src/views/modules/workPc/menu.vue +++ b/epmet-oper-web/src/views/modules/workPc/menu.vue @@ -121,7 +121,7 @@ export default { methods: { showCustomerMenu (row) { this.selMenuName = row.name - this.$refs['customerForm'].init(row.tableId) + this.$refs['customerForm'].init(row.id) } } } From 4d96e9f4c55c0e68039071c58f4ab484e0dc005f Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 16:23:55 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=B0=B1=E6=98=AF=E6=94=B9=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=B8=9C=E8=A5=BF=20put=20delete=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/main.js | 1 - epmet-oper-web/src/store/index.js | 44 ------------------------ epmet-oper-web/src/store/modules/user.js | 8 ----- epmet-oper-web/src/utils/index.js | 2 +- epmet-oper-web/src/utils/request.js | 18 ++++++++++ 5 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 epmet-oper-web/src/store/index.js delete mode 100644 epmet-oper-web/src/store/modules/user.js diff --git a/epmet-oper-web/src/main.js b/epmet-oper-web/src/main.js index ca2d399..402a48e 100644 --- a/epmet-oper-web/src/main.js +++ b/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' diff --git a/epmet-oper-web/src/store/index.js b/epmet-oper-web/src/store/index.js deleted file mode 100644 index 1e96dbc..0000000 --- a/epmet-oper-web/src/store/index.js +++ /dev/null @@ -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]) - }) - } - } -}) diff --git a/epmet-oper-web/src/store/modules/user.js b/epmet-oper-web/src/store/modules/user.js deleted file mode 100644 index 652b69c..0000000 --- a/epmet-oper-web/src/store/modules/user.js +++ /dev/null @@ -1,8 +0,0 @@ -export default { - state: { - id: 0, - name: '', - realName: '', - superAdmin: 0 - } -} diff --git a/epmet-oper-web/src/utils/index.js b/epmet-oper-web/src/utils/index.js index ad9c9e0..80486e0 100644 --- a/epmet-oper-web/src/utils/index.js +++ b/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' /** * 获取字典数据列表 diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js index 0466541..02f19a5 100644 --- a/epmet-oper-web/src/utils/request.js +++ b/epmet-oper-web/src/utils/request.js @@ -68,4 +68,22 @@ http.interceptors.response.use(response => { return Promise.reject(error) }) +// http.put = function (url, data, config) { +// http.post(url, data, { +// ...config, +// headers: { + +// }; +// "X-HTTP-Method-Override": "PUT", +// }, +// }); +// }; + +// http.delete = function (url, config) { +// http.post(url, config.data || {}, { +// ...config, +// headers: { +// "X-HTTP-Method-Override": "DELETE", +// }, +// }); export default http From c075e7f3e766ecb0c0f26e2c087a45f3591a0f58 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 16:47:38 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/utils/request.js | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js index 02f19a5..7fe06f7 100644 --- a/epmet-oper-web/src/utils/request.js +++ b/epmet-oper-web/src/utils/request.js @@ -68,22 +68,22 @@ http.interceptors.response.use(response => { return Promise.reject(error) }) -// http.put = function (url, data, config) { -// http.post(url, data, { -// ...config, -// headers: { +http.put = function (url, data, config) { + http.post(url, data, { + ...config, + headers: { + "X-HTTP-Method-Override": "PUT", + }, + }); +}; -// }; -// "X-HTTP-Method-Override": "PUT", -// }, -// }); -// }; +http.delete = function (url, config) { + http.post(url, config.data || {}, { + ...config, + headers: { + "X-HTTP-Method-Override": "DELETE", + }, + }); +}; -// http.delete = function (url, config) { -// http.post(url, config.data || {}, { -// ...config, -// headers: { -// "X-HTTP-Method-Override": "DELETE", -// }, -// }); export default http From c13032334199bf756d3e3a4344983ddf4e609ffd Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 23 Sep 2022 16:54:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=80=80=E5=9B=9E2=20=E5=85=8D=E5=BE=97?= =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-oper-web/src/utils/request.js | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/epmet-oper-web/src/utils/request.js b/epmet-oper-web/src/utils/request.js index 7fe06f7..0466541 100644 --- a/epmet-oper-web/src/utils/request.js +++ b/epmet-oper-web/src/utils/request.js @@ -68,22 +68,4 @@ http.interceptors.response.use(response => { return Promise.reject(error) }) -http.put = function (url, data, config) { - http.post(url, data, { - ...config, - headers: { - "X-HTTP-Method-Override": "PUT", - }, - }); -}; - -http.delete = function (url, config) { - http.post(url, config.data || {}, { - ...config, - headers: { - "X-HTTP-Method-Override": "DELETE", - }, - }); -}; - export default http