diff --git a/.env.development b/.env.development index deacc5d8..4915e04d 100644 --- a/.env.development +++ b/.env.development @@ -5,9 +5,9 @@ NODE_ENV = development VUE_APP_TITLE = '曲阳金隅安全智能管控平台' # 接口地址 -VUE_APP_API_BASEURL = http://1.203.161.103:2800/api +# 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_API_BASEURL = http://127.0.0.1:8000/api # 本地端口 VUE_APP_PORT = 2800 diff --git a/src/api/model/hrm.js b/src/api/model/hrm.js index 47ef3d40..09c8c1ca 100644 --- a/src/api/model/hrm.js +++ b/src/api/model/hrm.js @@ -47,7 +47,14 @@ export default { req: async function(id){ return await http.delete(`${config.API_URL}/hrm/employee/${id}/`); } + }, + improve_info: { + name: "完善个人信息", + req: async function(data){ + return await http.post(`${config.API_URL}/hrm/employee/improve_info/`, data); + } } + }, certificate: { list: { diff --git a/src/config/route.js b/src/config/route.js index 73c34d9b..45d01d03 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -76,7 +76,7 @@ const routes = [ "path": "/ecm", "meta": { "title": "事件", - "icon": "el-icon-goods-filled", + "icon": "el-icon-alarm-clock", "type": "menu", "perms": ["ecm"] }, @@ -86,7 +86,7 @@ const routes = [ "path": "/ecm/event", "meta": { "title": "事件列表", - "icon": "el-icon-document", + "icon": "el-icon-alarm-clock", "perms": ["event"] }, "component": "ecm/event", @@ -99,7 +99,6 @@ const routes = [ "title": "事件详情", "icon": "el-icon-menu", "hidden": true, - "perms": ["eventfrom"] }, "component": "ecm/event_from" } @@ -111,7 +110,6 @@ const routes = [ "title": "处理作业", "icon": "el-icon-menu", "hidden": true, - "perms": ["eventhandlefrom"] }, "component": "ecm/event_handlefrom" }, @@ -120,7 +118,7 @@ const routes = [ "path": "/ecm/myevent", "meta": { "title": "我的事件", - "icon": "el-icon-document-remove", + "icon": "el-icon-notification", "perms": ["myevent"] }, "component": "ecm/myevent" @@ -141,7 +139,7 @@ const routes = [ "path": "/ecm/algo", "meta": { "title": "算法配置", - "icon": "el-icon-setting", + "icon": "el-icon-set-up", "perms": ["algo"] }, "component": "ecm/algo" diff --git a/src/layout/components/userbar.vue b/src/layout/components/userbar.vue index 2ff3749c..3bc85694 100644 --- a/src/layout/components/userbar.vue +++ b/src/layout/components/userbar.vue @@ -78,14 +78,14 @@
- {{ userNameF }} + {{ userNameF }}
- + - + - + - + --> - @@ -145,7 +142,7 @@ export default { //查看 table_show(row) { this.$router.push({ - name: "eventfrom", + name: "eventhandlefrom", query: { id: row.id, }, diff --git a/src/views/ecm/event_cate_form.vue b/src/views/ecm/event_cate_form.vue index ba9327e9..1e166c32 100644 --- a/src/views/ecm/event_cate_form.vue +++ b/src/views/ecm/event_cate_form.vue @@ -61,7 +61,7 @@ - + - - - - - - - - - + + + {{ item.name }} - - - - - {{ form.employee_.name }} - 未知人员 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + > + {{mark_options2[form.mark]}} + + {{form.create_time}} + {{form.area_.name}} + + {{type_options2[form.employee_.type]}} + 未知人员 + + + {{form.employee_.name}} + + +
+ + +
+ + + + + + {{mark_options2[form.mark]}} + + + {{form.handle_user_name}} + + + {{form.handle_time}} + + + {{form.handle_desc}} + + + + + - + - - - + - - - 提交 - - - - + 保存 + + + + + + + - + - + + + + - + - + - + - + + @@ -157,7 +130,6 @@ export default { loading: false, visible: false, isSaveing: false, - mode: "show", titleMap: { show: "事件信息查看", @@ -167,11 +139,20 @@ export default { { id: "remployee", name: "相关方" }, { id: "visitor", name: "访客" }, ], + type_options2: { + "employee": "企业员工", + "remployee": "相关方", + "visitor": "访客" + }, + mark_options2: { + 10: "正常", + 20: "误报" + }, mark_options: [ { id: 10, name: "正常" }, { id: 20, name: "误报" }, ], - form: [], + form: {}, remindData: [], eventID: "", }; @@ -183,23 +164,25 @@ export default { }, methods: { getEvent() { + this.loading = true this.$API.ecm.event.item.req(this.eventID).then((res) => { + this.loading = false this.form = res; - }); + }).catch(e=>{this.loading=false}); }, getRemind() { + this.$API.ecm.remind.list .req({ event: this.eventID, page: 0 }) .then((res) => { this.remindData = res; }); }, - submit(){ + onSubmit(){ this.$API.ecm.event.handle.req(this.form.id, this.form) .then((res) => { - this.$router.go(-1) this.$message.success("操作成功"); return res; diff --git a/src/views/ecm/myevent.vue b/src/views/ecm/myevent.vue index 1cdf845b..40f01b20 100644 --- a/src/views/ecm/myevent.vue +++ b/src/views/ecm/myevent.vue @@ -24,20 +24,15 @@ @resetQuery="resetQuery" > - + @@ -45,6 +40,7 @@ - + - + --> - @@ -124,6 +125,16 @@ export default { }, }); }, + table_handle(row) { + + this.$router.push({ + name: "eventhandlefrom", + query: { + id: row.event_.id, + }, + }); + + }, //搜索 upsearch() {}, //本地更新数据 diff --git a/src/views/ecm/notify_settings_form.vue b/src/views/ecm/notify_settings_form.vue index 15d45456..9bc71a3b 100644 --- a/src/views/ecm/notify_settings_form.vue +++ b/src/views/ecm/notify_settings_form.vue @@ -174,8 +174,8 @@ export default { id: null, obj_cate: null, can_handle: true, - wechat_enable: true, - sms_enable: false, + wechat_enable: false, + sms_enable: true, filter_recipient: null, filter_area_level: null, }, diff --git a/src/views/userCenter/index.vue b/src/views/userCenter/index.vue index 033f2ba4..6e5a132c 100644 --- a/src/views/userCenter/index.vue +++ b/src/views/userCenter/index.vue @@ -1,119 +1,123 @@ diff --git a/src/views/userCenter/user/account.vue b/src/views/userCenter/user/account.vue index ef7ea123..4df98842 100644 --- a/src/views/userCenter/user/account.vue +++ b/src/views/userCenter/user/account.vue @@ -6,24 +6,27 @@ label-width="120px" style="margin-top: 20px" > - - - + - +
账号信息用于登录，系统不允许修改
 - + - - - + + {{form.belong_dept_name}} + {{form.post_name}} + 超级管理员 + + @@ -44,17 +47,8 @@ export default { }, getUserlogin() { - this.$API.system.user.read.req({ page: 0 }).then((res) => { - this.form = res; - }); + this.form = this.$TOOL.data.get("USER_INFO"); }, }, }; - - diff --git a/src/views/userCenter/user/pushSettings.vue b/src/views/userCenter/user/pushSettings.vue index 0ed73234..14720455 100644 --- a/src/views/userCenter/user/pushSettings.vue +++ b/src/views/userCenter/user/pushSettings.vue @@ -19,7 +19,7 @@ - + 提交 重置 diff --git a/src/views/userCenter/user/seting.vue b/src/views/userCenter/user/seting.vue index 695c8f04..e688fde5 100644 --- a/src/views/userCenter/user/seting.vue +++ b/src/views/userCenter/user/seting.vue @@ -9,28 +9,28 @@ - + - + - + - + - + @@ -42,60 +42,36 @@ + + + + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + + + + + + + 保存 @@ -108,6 +84,7 @@ export default { data() { return { form: {}, + saveLoading: false }; }, mounted() { @@ -119,10 +96,23 @@ export default { }, getemployee() { - this.$API.hrm.employee.read.req({ page: 0 }).then((res) => { + this.$API.hrm.employee.read.req().then((res) => { this.form = res; }); }, + submitForm() { + let sform = { + "phone": this.form.phone, + "email": this.form.email + } + this.saveLoading = true + this.$API.hrm.employee.improve_info.req(sform).then(res=>{ + this.saveLoading = false + this.$message.success('保存成功') + }).catch(e=>{ + this.saveLoading = false + }) + } }, };