From d709b41bf11b6a32366be5718c71845ace973b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Tue, 23 Aug 2022 17:15:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=96=87=E4=BB=B6=E8=BF=BD?= =?UTF-8?q?=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 17 ----------------- .env.production | 9 --------- .gitignore | 2 ++ src/api/model/system.js | 2 +- src/components/scTable/index.vue | 4 +++- src/views/am/em1.vue | 4 ++-- src/views/am/monitor.vue | 2 +- src/views/hrm/ep_form.vue | 21 ++++++++++++++++----- src/views/rpm/rpj_form.vue | 1 + src/views/rpm/rpjadd.vue | 3 ++- src/views/sys/dept.vue | 1 + src/views/sys/post.vue | 21 +++++++++++++++++---- src/views/sys/role.vue | 1 + 13 files changed, 47 insertions(+), 41 deletions(-) delete mode 100644 .env.development delete mode 100644 .env.production diff --git a/.env.development b/.env.development deleted file mode 100644 index 4f914a5e..00000000 --- a/.env.development +++ /dev/null @@ -1,17 +0,0 @@ -# 本地环境 -NODE_ENV = development - -# 标题 -VUE_APP_TITLE = '曲阳金隅安全智能管控平台' - -# 接口地址 -#VUE_APP_API_BASEURL = http://1.203.161.103:2800/api -#VUE_APP_WS_API = 'ws://localhost:8000' -VUE_APP_API_BASEURL = http://127.0.0.1:8000/api -#VUE_APP_BASEURL = http://127.0.0.1:8000 - -# 本地端口 -VUE_APP_PORT = 2800 - -# 是否开启代理 -VUE_APP_PROXY = true diff --git a/.env.production b/.env.production deleted file mode 100644 index e94de36f..00000000 --- a/.env.production +++ /dev/null @@ -1,9 +0,0 @@ -# 生产环境 -NODE_ENV = production - -# 标题 -VUE_APP_TITLE = '曲阳金隅安全智能管控平台' - -# 接口地址 -VUE_APP_API_BASEURL = http://10.99.5.79:20309/api -VUE_APP_BASEURL = http://10.99.5.79:20309 diff --git a/.gitignore b/.gitignore index 2bdd9d90..7306023d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ node_modules # local env files .env.local .env.*.local +.env.production +.env.development # Log files npm-debug.log* diff --git a/src/api/model/system.js b/src/api/model/system.js index a83e1b4d..1a11d4b1 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -165,7 +165,7 @@ export default { } }, delete: { - name: "删除菜单权限", + name: "删除角色", req: async function(id){ return await http.delete(`${config.API_URL}/system/role/${id}/`); } diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index e640a97c..77ef9fc5 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -306,7 +306,9 @@ export default { this.total = response.total || 0; this.summary = response.summary || {}; this.loading = false; - this.$refs.scTable.setScrollTop(0); + if(!this.hidePagination){ + this.$refs.scTable.setScrollTop(0); + } this.$emit("dataChange", res, this.tableData); } catch (error) { this.loading = false; diff --git a/src/views/am/em1.vue b/src/views/am/em1.vue index fa75f404..02466edb 100644 --- a/src/views/am/em1.vue +++ b/src/views/am/em1.vue @@ -55,7 +55,7 @@ > @@ -162,7 +162,7 @@ export default { }, async syncData() { this.syncLoading = true; - var res = await this.$API.third.tdevice.vchannelSync.req({}); + var res = await this.$API.third.tdevice.dchannelSync.req({}); this.syncLoading = false; }, }, diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue index 9d06bd2b..741e1541 100644 --- a/src/views/am/monitor.vue +++ b/src/views/am/monitor.vue @@ -56,7 +56,7 @@ > diff --git a/src/views/hrm/ep_form.vue b/src/views/hrm/ep_form.vue index 7de751ef..9a3ef75d 100644 --- a/src/views/hrm/ep_form.vue +++ b/src/views/hrm/ep_form.vue @@ -17,6 +17,11 @@ label-width="120px" > + + + {{epTypes[form.type]}} + + @@ -50,7 +55,7 @@ - + + @@ -111,6 +117,7 @@ + @@ -154,9 +161,9 @@ loading: false, mode: "add", titleMap: { - add: '新增员工', - edit: '员工信息编辑', - show: '员工信息查看' + add: '新增人员', + edit: '人员信息编辑', + show: '人员信息查看' }, job_states: [ {id: 10, name: "在职"}, @@ -165,7 +172,11 @@ visible: false, isSaveing: false, form: defaultForm, - + epTypes: { + 'employee': "企业员工", + "remployee": "相关方", + "visitor": "访客" + }, //验证规则 rules: { phone: [ diff --git a/src/views/rpm/rpj_form.vue b/src/views/rpm/rpj_form.vue index e6b8ad1d..44bb666d 100644 --- a/src/views/rpm/rpj_form.vue +++ b/src/views/rpm/rpj_form.vue @@ -76,6 +76,7 @@ label: 'label', // value: 'value', // emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值 + checkStrictly: true }" clearable style="width: 100%;"> diff --git a/src/views/rpm/rpjadd.vue b/src/views/rpm/rpjadd.vue index 27cc6bf1..75595f02 100644 --- a/src/views/rpm/rpjadd.vue +++ b/src/views/rpm/rpjadd.vue @@ -80,7 +80,8 @@ label: 'label', // value: 'value', // emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值 - }" + checkStrictly: true + }" clearable style="width: 100%" > diff --git a/src/views/sys/dept.vue b/src/views/sys/dept.vue index b7beebb7..11d7a52b 100644 --- a/src/views/sys/dept.vue +++ b/src/views/sys/dept.vue @@ -76,6 +76,7 @@ type="danger" size="small" v-auth="'dept.delete'" + v-if="!scope.row.children" >删除 diff --git a/src/views/sys/post.vue b/src/views/sys/post.vue index b9f51530..a9f842d1 100644 --- a/src/views/sys/post.vue +++ b/src/views/sys/post.vue @@ -1,6 +1,6 @@ @@ -183,6 +191,11 @@ export default { this.$refs.saveDialog.open("edit").setData(row); }); }, + table_del(row) { + this.$API.system.post.delete.req(row.id).then(res=>{ + this.$refs.table.refresh() + }) + }, //批量删除 async batch_del() { var confirmRes = await this.$confirm( diff --git a/src/views/sys/role.vue b/src/views/sys/role.vue index fe65c3f5..215197d7 100644 --- a/src/views/sys/role.vue +++ b/src/views/sys/role.vue @@ -136,6 +136,7 @@ //添加角色 roleAdd(){ this.limitedVisible = true; + this.type = "add"; this.$nextTick(()=>{ this.$refs.menu.setCheckedKeys([]) })