From 8ef71cf24e7fd9ffaef4ffa45c0c9a35f96779ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Wed, 3 Aug 2022 12:25:27 +0800 Subject: [PATCH] =?UTF-8?q?rpm=20vm=20=E7=AD=89=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/model/auth.js | 16 +- src/api/model/rpm.js | 34 + src/api/model/system.js | 2 +- src/components/ehsSelect/epselect.vue | 386 +++++++++ src/components/ehsSelect/userselect.vue | 390 +++++++++ src/components/scOpl/scFire.vue | 20 +- src/config/route.js | 20 +- src/config/table.js | 2 +- src/ehs.js | 8 + src/layout/components/userselect.vue | 327 -------- src/main.js | 2 + src/utils/request.js | 14 +- src/views/am/access_form.vue | 77 +- src/views/am/area.vue | 78 +- src/views/am/area_form.vue | 27 +- src/views/ecm/algos_form.vue | 2 +- src/views/ecm/notify_setting.vue | 13 +- src/views/ecm/notify_settings_form.vue | 25 +- src/views/hrm/certificate.vue | 93 +-- src/views/hrm/certificates.vue | 16 +- src/views/hrm/employee.vue | 624 +++++++------- src/views/hrm/ep_form.vue | 15 +- src/views/login/components/passwordForm.vue | 2 +- src/views/login/resetPassword.vue | 252 +++--- src/views/ops/menu.vue | 4 +- src/views/rpm/rcertificate.vue | 29 +- src/views/rpm/remployee.vue | 5 +- src/views/rpm/remployee_form.vue | 20 +- src/views/rpm/rfile.vue | 112 +++ src/views/rpm/rparty.vue | 24 +- src/views/rpm/rpj_show.vue | 4 - src/views/sys/dept.vue | 521 ++++++------ src/views/sys/dict.vue | 42 +- src/views/sys/post.vue | 12 +- src/views/sys/role.vue | 14 +- src/views/sys/user.vue | 758 +++++++++--------- src/views/vm/visit_detial.vue | 4 - src/views/vm/visit_form.vue | 37 +- src/views/vm/vistoradd.vue | 85 +- src/views/wf/allwork.vue | 2 +- src/views/wf/ccwork.vue | 42 +- src/views/wf/dutywork.vue | 54 +- src/views/wf/ownerwork.vue | 60 +- .../wf/{visitdetail.vue => ticketdetail.vue} | 6 +- src/views/wf/worked.vue | 41 +- 45 files changed, 2541 insertions(+), 1780 deletions(-) create mode 100644 src/components/ehsSelect/epselect.vue create mode 100644 src/components/ehsSelect/userselect.vue create mode 100644 src/ehs.js delete mode 100644 src/layout/components/userselect.vue rename src/views/wf/{visitdetail.vue => ticketdetail.vue} (98%) diff --git a/src/api/model/auth.js b/src/api/model/auth.js index ff0d94b2..4bd884c7 100644 --- a/src/api/model/auth.js +++ b/src/api/model/auth.js @@ -15,5 +15,19 @@ export default { get: async function(data={}){ return await http.get(this.url, data); } - } + }, + sms_code: { + url: `${config.API_URL}/auth/sms_code/`, + name: "获取验证码", + req: async function(data={}){ + return await http.post(this.url, data); + } + }, + reset_password: { + url: `${config.API_URL}/auth/reset_password/`, + name: "重置密码", + req: async function(data={}){ + return await http.post(this.url, data); + } + }, } diff --git a/src/api/model/rpm.js b/src/api/model/rpm.js index 10f1ac89..15b46174 100644 --- a/src/api/model/rpm.js +++ b/src/api/model/rpm.js @@ -172,6 +172,40 @@ export default { } } }, + /*相关方文件 */ + rfile: { + list: { + name: "获取", + req: async function (data) { + return await http.get( + `${config.API_URL}/rpm/rfile/`, + data + ); + } + }, + read:{ + name: "详情", + req: async function (id) { + return await http.get( + `${config.API_URL}/rpm/rfile/${id}/`); + } + }, + update: { + name: "更新", + req: async function (id, data) { + return await http.put( + `${config.API_URL}/rpm/rfile/${id}/`, + data); + } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/rfile/${id}/`); + } + } + }, /*相关方入场项目文件 */ rpjfile: { list: { diff --git a/src/api/model/system.js b/src/api/model/system.js index 155fa53c..4ba6ea12 100644 --- a/src/api/model/system.js +++ b/src/api/model/system.js @@ -142,7 +142,7 @@ export default { }, role: { list: { - url: `${config.API_URL}/system/role`, + url: `${config.API_URL}/system/role/`, name: "获取角色列表", req: async function(data){ return await http.get(this.url, data); diff --git a/src/components/ehsSelect/epselect.vue b/src/components/ehsSelect/epselect.vue new file mode 100644 index 00000000..a0ca6e51 --- /dev/null +++ b/src/components/ehsSelect/epselect.vue @@ -0,0 +1,386 @@ + + + diff --git a/src/components/ehsSelect/userselect.vue b/src/components/ehsSelect/userselect.vue new file mode 100644 index 00000000..1d324a8a --- /dev/null +++ b/src/components/ehsSelect/userselect.vue @@ -0,0 +1,390 @@ + + + diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue index b4b7fbb1..457539d2 100644 --- a/src/components/scOpl/scFire.vue +++ b/src/components/scOpl/scFire.vue @@ -187,7 +187,7 @@ { - this.apiworkerObj = res; + getworkerList() { + this.$API.opm.worker.list.req({opl: this.oplId, page: 0}).then((res) => { + this.workerData = res; }); }, //气体检测记录列表 - getgasList(id) { - this.$API.opm.gas.list.req({opl: id, page: 0}).then((res) => { - this.apigasObj = res; + getgasList() { + this.$API.opm.gas.list.req({opl: this.oplId, page: 0}).then((res) => { + this.gasData = res; }); }, }, diff --git a/src/config/route.js b/src/config/route.js index 0595d029..b7fcc813 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -232,15 +232,15 @@ const routes = [ "component": "wf/ccwork" }, { - "name": "visitdetail", - "path": "/wf/visitdetail", + "name": "ticketdetail", + "path": "/wf/ticketdetail", "meta": { "title": "工单详情", "icon": "el-icon-menu", "hidden": true, "perms": ["allwork"] }, - "component": "wf/visitdetail" + "component": "wf/ticketdetail" }, @@ -413,7 +413,7 @@ const routes = [ "name": "remployee", "path": "/rpm/remployee", "meta": { - "title": "相关方人员", + "title": "我的人员", "icon": "el-icon-user", "perms": ["remployee"] }, @@ -423,7 +423,7 @@ const routes = [ "name": "rcertificate", "path": "/rpm/rcertificate", "meta": { - "title": "人员证书", + "title": "我的证书", "icon": "el-icon-postcard", "perms": ["rcertificate"] }, @@ -433,7 +433,7 @@ const routes = [ "name": "rfile", "path": "/rpm/rfile", "meta": { - "title": "资料库", + "title": "我的资料", "icon": "el-icon-shopping-bag", "perms": ["rfile"] }, @@ -487,9 +487,9 @@ const routes = [ "name": "visitor", "path": "/vm/visitor", "meta": { - "title": "来访人员", + "title": "我的访客", "icon": "el-icon-user", - "perms": ["visitor"] + "perms": ["visit"] }, "component": "vm/visitor" },{ @@ -507,7 +507,7 @@ const routes = [ "name": "vistoradd", "path": "/vm/vistoradd", "meta": { - "title": "来访项目相关信息", + "title": "项目信息", "icon": "el-icon-menu", "hidden": true, "perms": ["visit"] @@ -594,7 +594,7 @@ const routes = [ "name": "employee", "path": "/hrm/employee", "meta": { - "title": "企业员工", + "title": "人员信息", "icon": "el-icon-user", "perms": ["employee"] }, diff --git a/src/config/table.js b/src/config/table.js index ec317b2f..44d9cf18 100644 --- a/src/config/table.js +++ b/src/config/table.js @@ -5,7 +5,7 @@ import tool from '@/utils/tool' export default { successCode: 200, //请求完成代码 pageSize: 20, //表格每一页条数 - pageSizes: [10, 20, 30, 40, 50], //表格可设置的一页条数 + pageSizes: [1, 10, 20, 30, 40, 50], //表格可设置的一页条数 paginationLayout: "total, sizes, prev, pager, next, jumper", //表格分页布局，可设置"total, sizes, prev, pager, next, jumper" parseData: function (res) { //数据分析 return { diff --git a/src/ehs.js b/src/ehs.js new file mode 100644 index 00000000..c9fc647b --- /dev/null +++ b/src/ehs.js @@ -0,0 +1,8 @@ +import ehsUserSelect from './components/ehsSelect/userselect' +import ehsEpSelect from './components/ehsSelect/epselect' +export default { + install(app) { + app.component('ehsUserSelect', ehsUserSelect); + app.component('ehsEpSelect', ehsEpSelect); + } +} diff --git a/src/layout/components/userselect.vue b/src/layout/components/userselect.vue deleted file mode 100644 index 2e5ed8bf..00000000 --- a/src/layout/components/userselect.vue +++ /dev/null @@ -1,327 +0,0 @@ - - diff --git a/src/main.js b/src/main.js index 0753801e..a9fb342c 100644 --- a/src/main.js +++ b/src/main.js @@ -2,6 +2,7 @@ import ElementPlus from 'element-plus' import 'element-plus/dist/index.css' import 'element-plus/theme-chalk/display.css' import scui from './scui' +import ehsui from './ehs' import i18n from './locales' import router from './router' import store from './store' @@ -16,6 +17,7 @@ app.use(router); app.use(ElementPlus); app.use(i18n); app.use(scui); +app.use(ehsui); //挂载app app.mount('#app'); diff --git a/src/utils/request.js b/src/utils/request.js index 05d02078..db680ac3 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -41,14 +41,14 @@ axios.interceptors.response.use( message: "账户密码错误或已禁用" }); }else{ - ElMessageBox.confirm('当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。', '无权限访问', { - type: 'error', - closeOnClickModal: false, - center: true, - confirmButtonText: '重新登录' - }).then(() => { + // ElMessageBox.confirm('当前用户已被登出或无权限访问当前资源，请尝试重新登录后再操作。', '无权限访问', { + // type: 'error', + // closeOnClickModal: false, + // center: true, + // confirmButtonText: '重新登录' + // }).then(() => { router.replace({path: '/login'}); - }).catch(() => {}) + // }).catch(() => {}) } } else { diff --git a/src/views/am/access_form.vue b/src/views/am/access_form.vue index 7de8cb80..44d458d2 100644 --- a/src/views/am/access_form.vue +++ b/src/views/am/access_form.vue @@ -39,7 +39,6 @@ - + - + - - - + + + + - + - + + + + + - + { this.$message.success("账号分配成功"); this.adminvisible = false; + this.$refs.table.refresh() }) .catch((err) => { diff --git a/src/views/rpm/rpj_show.vue b/src/views/rpm/rpj_show.vue index fe56daa7..680f1307 100644 --- a/src/views/rpm/rpj_show.vue +++ b/src/views/rpm/rpj_show.vue @@ -92,13 +92,9 @@ diff --git a/src/views/sys/dict.vue b/src/views/sys/dict.vue index 3babf787..f49ea7e9 100644 --- a/src/views/sys/dict.vue +++ b/src/views/sys/dict.vue @@ -39,18 +39,20 @@ - - - - - + + + + +