diff --git a/.env.production b/.env.production index c5666f98..8e2c55e5 100644 --- a/.env.production +++ b/.env.production @@ -2,7 +2,7 @@ NODE_ENV = production # 标题 -VUE_APP_TITLE = SCUI +VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # 接口地址 VUE_APP_API_BASEURL = http://1.203.161.103:2800/api diff --git a/src/api/model/rpm.js b/src/api/model/rpm.js index 46b17b65..6e00bbd4 100644 --- a/src/api/model/rpm.js +++ b/src/api/model/rpm.js @@ -2,10 +2,11 @@ import config from "@/config" import http from "@/utils/request" export default { + /*相关方 */ rparty: { list: { name: "获取", - req: async function(data){ + req: async function (data) { return await http.get( `${config.API_URL}/rpm/rparty/`, data @@ -14,19 +15,230 @@ export default { }, update: { name: "更新", - req: async function(id, data){ + req: async function (id, data) { return await http.put( `${config.API_URL}/rpm/rparty/${id}/`, data); } }, - create: { + create: { name: "创建", - req: async function(data){ + req: async function (data) { return await http.post( `${config.API_URL}/rpm/rparty/`, data); } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/rparty/${id}/`); + } + } + , + admin: { + name: "创建账号", + req: async function (id, data) { + return await http.post( + `${config.API_URL}/rpm/rparty/${id}/assign/`, + data); + } + } + , + + }, + /*相关方人员 */ + remployee: { + list: { + name: "获取", + req: async function (data) { + return await http.get( + `${config.API_URL}/rpm/remployee/`, + data + ); + } + }, + update: { + name: "更新", + req: async function (id, data) { + return await http.put( + `${config.API_URL}/rpm/remployee/${id}/`, + data); + } + }, + create: { + name: "创建", + req: async function (data) { + return await http.post( + `${config.API_URL}/rpm/remployee/`, + data); + } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/remployee/${id}/`); + } + } + + + }, + /*相关方人员证书 */ + rcertificate: { + list: { + name: "获取", + req: async function (data) { + return await http.get( + `${config.API_URL}/rpm/rcertificate/`, + data + ); + } + }, + update: { + name: "更新", + req: async function (id, data) { + return await http.put( + `${config.API_URL}/rpm/rcertificate/${id}/`, + data); + } + }, + create: { + name: "创建", + req: async function (data) { + return await http.post( + `${config.API_URL}/rpm/rcertificate/`, + data); + } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/rcertificate/${id}/`); + } + } + + + }, + /*相关方入场项目 */ + rpj: { + list: { + name: "获取", + req: async function (data) { + return await http.get( + `${config.API_URL}/rpm/rpj/`, + data + ); + } + }, + read:{ + name: "详情", + req: async function (id) { + return await http.get( + `${config.API_URL}/rpm/rpj/${id}/`); + } + }, + update: { + name: "更新", + req: async function (id, data) { + return await http.put( + `${config.API_URL}/rpm/rpj/${id}/`, + data); + } + }, + create: { + name: "创建", + req: async function (data) { + return await http.post( + `${config.API_URL}/rpm/rpj/`, + data); + } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/rpj/${id}/`); + } } }, + /*相关方入场项目文件 */ + rpjfile: { + list: { + name: "获取", + req: async function (data) { + return await http.get( + `${config.API_URL}/rpm/rpj_file/`, + data + ); + } + }, + read:{ + name: "详情", + req: async function (id) { + return await http.get( + `${config.API_URL}/rpm/rpj_file/${id}/`); + } + }, + update: { + name: "更新", + req: async function (id, data) { + return await http.put( + `${config.API_URL}/rpm/rpj_file/${id}/`, + data); + } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/rpj_file/${id}/`); + } + } + }, + /*相关方入场人员 */ + member: { + list: { + name: "获取", + req: async function (data) { + return await http.get( + `${config.API_URL}/rpm/rpj_member/`, + data + ); + } + }, + read:{ + name: "详情", + req: async function (id) { + return await http.get( + `${config.API_URL}/rpm/rpj_member/${id}/`); + } + }, + create: { + name: "创建", + req: async function (data) { + return await http.post( + `${config.API_URL}/rpm/rpj_member/`, + data); + } + }, + update: { + name: "更新", + req: async function (id, data) { + return await http.put( + `${config.API_URL}/rpm/rpj_member/${id}/`, + data); + } + }, + delete: { + name: "删除", + req: async function (id) { + return await http.delete( + `${config.API_URL}/rpm/rpj_member/${id}/`); + } + } + }, + } \ No newline at end of file diff --git a/src/api/model/vm.js b/src/api/model/vm.js new file mode 100644 index 00000000..b7b2580e --- /dev/null +++ b/src/api/model/vm.js @@ -0,0 +1,23 @@ +import config from "@/config" +import http from "@/utils/request" + +export default { + /*访客 */ + visitor: { + + create: { + name: "注册", + req: async function (data) { + return await http.post( + `${config.API_URL}/vm/visitor/register/`, + data); + } + }, + + + }, + + + + +} \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js index ea37f441..d3813ad3 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,12 +1,12 @@ const DEFAULT_CONFIG = { //标题 APP_NAME: process.env.VUE_APP_TITLE, - + APP_NAMES: "国检集团", //首页地址 DASHBOARD_URL: "/dashboard", //版本号 - APP_VER: "1.6.3", + APP_VER: "1.0", //内核版本号 CORE_VER: "1.6.3", diff --git a/src/config/route.js b/src/config/route.js index eb566406..5fdf616e 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -195,6 +195,78 @@ const routes = [ }, "component": "opm/space" }, + , + { + "name": "clear", + "path": "/opm/clear", + "meta": { + "title": "清库作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/clear" + } , + { + "name": "high", + "path": "/opm/high", + "meta": { + "title": "高处作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/high" + }, + { + "name": "hoisting", + "path": "/opm/hoisting", + "meta": { + "title": "吊装作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/hoisting" + }, + { + "name": "preheat", + "path": "/opm/preheat", + "meta": { + "title": "预热器清堵作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/preheat" + }, + { + "name": "cooler", + "path": "/opm/cooler", + "meta": { + "title": "篦冷机清大块作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/cooler" + }, + , + { + "name": "soil", + "path": "/opm/soil", + "meta": { + "title": "动土作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/soil" + }, + { + "name": "usecl", + "path": "/opm/usecl", + "meta": { + "title": "临时用电作业许可证", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "opm/usecl" + } ] }, { @@ -224,6 +296,15 @@ const routes = [ }, "component": "rpm/remployee" }, + { + "name": "rcertificate", + "path": "/rpm/rcertificate", + "meta": { + "title": "人员证书", + "icon": "el-icon-menu", + }, + "component": "rpm/rcertificate" + }, { "name": "rfile", "path": "/rpm/rfile", @@ -242,6 +323,17 @@ const routes = [ }, "component": "rpm/rpj" }, + { + "name": "rpjadd", + "path": "/rpm/rpjadd", + "meta": { + "title": "入厂项目相关信息", + "icon": "el-icon-menu", + "hidden": true + }, + "component": "rpm/rpjadd" + }, + ] }, { @@ -262,6 +354,15 @@ const routes = [ }, "component": "vm/visit" }, + { + "name": "visitor", + "path": "/vm/visitor", + "meta": { + "title": "来访人员", + "icon": "el-icon-menu", + }, + "component": "vm/visitor" + }, ] }, { diff --git a/src/locales/lang/zh-cn.js b/src/locales/lang/zh-cn.js index 87c01502..b7c88310 100644 --- a/src/locales/lang/zh-cn.js +++ b/src/locales/lang/zh-cn.js @@ -23,6 +23,7 @@ export default { smsSent: '已发送短信至手机号码', noAccount: '还没有账号?', createAccount: '创建新账号', + fangke:'访客注册', wechatLoginTitle: '二维码登录', wechatLoginMsg: '请使用微信扫一扫登录 | 模拟3秒后自动扫描', wechatLoginResult: '已扫描 | 请在设备中点击授权登录' diff --git a/src/views/hrm/certificate.vue b/src/views/hrm/certificate.vue index bc50edf5..4540d476 100644 --- a/src/views/hrm/certificate.vue +++ b/src/views/hrm/certificate.vue @@ -17,12 +17,12 @@ v-model="search.keyword" placeholder="姓名/手机号" clearable - @click="upsearch" + > @@ -30,13 +30,13 @@ - + @@ -179,13 +179,18 @@ export default { 30: "安全管理人员证书", }, dialogcart: false, - apiObj: this.$API.hrm.certificate.list, + apiObj:[], query: {}, selection: [], search: { keyword: null, }, }; + }, + mounted() { + + + this.getcertificatelist(); }, methods: { handleForm(type, row) { @@ -200,6 +205,14 @@ export default { } }, + //证书列表 + getcertificatelist() { + this.$API.hrm.certificate.list + .req({ employee:this.$route.query.id, page: 0 }) + .then((res) => { + this.apiObj = res; + }); + }, //人员证书创建 submitcert() { this.form.employee = this.$route.query.id; diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index 27333695..15286374 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -31,11 +31,8 @@ > - - + - +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file + return res; + }) + .catch((err) => { + return err; + }); + }, + + //本地更新数据 + handleSaveSuccess(data, mode) { + if (mode == "add") { + this.$refs.table.refresh(); + } else if (mode == "edit") { + this.$refs.table.refresh(); + } + }, + resetQuery() { + this.query = {}; + }, + }, +}; + \ No newline at end of file diff --git a/src/views/rpm/rparty_form.vue b/src/views/rpm/rparty_form.vue index a5521748..8ec58e46 100644 --- a/src/views/rpm/rparty_form.vue +++ b/src/views/rpm/rparty_form.vue @@ -61,14 +61,19 @@ - - - + + + @@ -99,6 +104,7 @@ \ No newline at end of file diff --git a/src/views/rpm/rpj_form.vue b/src/views/rpm/rpj_form.vue new file mode 100644 index 00000000..c452fc58 --- /dev/null +++ b/src/views/rpm/rpj_form.vue @@ -0,0 +1,216 @@ + + + + + diff --git a/src/views/rpm/rpjadd.vue b/src/views/rpm/rpjadd.vue new file mode 100644 index 00000000..b8eb2d63 --- /dev/null +++ b/src/views/rpm/rpjadd.vue @@ -0,0 +1,570 @@ + + + \ No newline at end of file diff --git a/src/views/vm/visitor.vue b/src/views/vm/visitor.vue new file mode 100644 index 00000000..e69de29b