From e9de4a0bdf5043ba5069e67307a049b96191f68f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Jul 2021 20:48:28 +0800
Subject: [PATCH] 问题修复
---
src/views/realTimePolice/real.vue | 67 ++++++++--
src/views/examination/examination.vue | 114 +++++++++++-------
src/router/views/index.js | 6
src/views/policeTracking/policeTracking.vue | 20 +-
src/api/system/examination.js | 120 ++++++++++++++++++++
5 files changed, 252 insertions(+), 75 deletions(-)
diff --git a/src/api/system/examination.js b/src/api/system/examination.js
new file mode 100644
index 0000000..a15c4fb
--- /dev/null
+++ b/src/api/system/examination.js
@@ -0,0 +1,120 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params, deptId) => {
+ return request({
+ url: '/api/blade-user/pages',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ deptId,
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/blade-user/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/blade-user/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/blade-user/update',
+ method: 'post',
+ data: row
+ })
+}
+
+export const updatePlatform = (userId, userType, userExt) => {
+ return request({
+ url: '/api/blade-user/update-platform',
+ method: 'post',
+ params: {
+ userId,
+ userType,
+ userExt,
+ }
+ })
+}
+
+export const getUser = (id) => {
+ return request({
+ url: '/api/blade-user/detail',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
+}
+
+export const getUserPlatform = (id) => {
+ return request({
+ url: '/api/blade-user/platform-detail',
+ method: 'get',
+ params: {
+ id,
+ }
+ })
+}
+
+export const getUserInfo = () => {
+ return request({
+ url: '/api/blade-user/info',
+ method: 'get',
+ })
+}
+
+export const resetPassword = (userIds) => {
+ return request({
+ url: '/api/blade-user/reset-password',
+ method: 'post',
+ params: {
+ userIds,
+ }
+ })
+}
+
+export const updatePassword = (oldPassword, newPassword, newPassword1) => {
+ return request({
+ url: '/api/blade-user/update-password',
+ method: 'post',
+ params: {
+ oldPassword,
+ newPassword,
+ newPassword1,
+ }
+ })
+}
+
+export const updateInfo = (row) => {
+ return request({
+ url: '/api/blade-user/update-info',
+ method: 'post',
+ data: row
+ })
+}
+
+export const grant = (userIds, roleIds) => {
+ return request({
+ url: '/api/blade-user/grant',
+ method: 'post',
+ params: {
+ userIds,
+ roleIds,
+ }
+ })
+}
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 7ede80e..303cb70 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -194,7 +194,7 @@
redirect: '/realTimePolice/index',
children: [{
path: 'index',
- name: '警情派发',
+ name: '任务下发',
meta: {
i18n: 'real'
},
@@ -277,7 +277,7 @@
redirect: '/policeTracking/track',
children: [{
path: 'track',
- name: '警情追踪',
+ name: '任务追踪',
meta: {
i18n: 'track'
},
@@ -329,7 +329,7 @@
redirect: '/feedbackReport/index',
children: [{
path: 'index',
- name: '取证上报',
+ name: '事件上报',
meta: {
i18n: 'feedbackReport'
},
diff --git a/src/views/examination/examination.vue b/src/views/examination/examination.vue
index 88d2eb7..a7d9a4b 100644
--- a/src/views/examination/examination.vue
+++ b/src/views/examination/examination.vue
@@ -25,7 +25,7 @@
size="small"
plain
icon="el-icon-delete"
- v-if="permission.user_delete"
+ v-if="permission.examination_delete"
@click="handleDelete">删 除
</el-button>
</template>
@@ -45,6 +45,13 @@
slot="userTypeName">
<el-tag>{{row.userTypeName}}</el-tag>
</template>
+ <template slot-scope="{ row }" slot="examination_type">
+ <el-tag
+ >{{
+ row.examination_type == "0" ? "正常" : row.examination_type == "1" ? "异常" : "异常"
+ }}
+ </el-tag>
+ </template>
<template slot-scope="{ row }" slot="online_status">
<el-tag
>{{
@@ -52,6 +59,8 @@
}}
</el-tag>
</template>
+
+
</avue-crud>
<el-dialog title="用户角色配置"
append-to-body
@@ -130,7 +139,7 @@
add,
grant,
resetPassword
- } from "@/api/system/user";
+ } from "@/api/system/examination";
import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
import {getRoleTree} from "@/api/system/role";
import {getPostList} from "@/api/system/post";
@@ -208,25 +217,28 @@
search: true,
display: false
},
+ // {
+ // label: "所属客户",
+ // prop: "tenantName",
+ // slot: true,
+ // display: false,
+ // width:200
+ // },
{
- label: "所属客户",
- prop: "tenantName",
- slot: true,
- display: false,
- width:200
- },
- {
- label: "用户姓名",
+ label: "姓名",
prop: "realName",
search: true,
display: false
},
{
- label: "用户照片",
- prop: "avatar",
- display: false,
- type: 'upload',
- listType: 'picture-img',
+ label: "性别",
+ prop: "sexName",
+ display: false
+ },
+ {
+ label: "联系方式",
+ prop: "phone",
+ display: false
},
{
label: "所属角色",
@@ -235,7 +247,7 @@
display: false
},
{
- label: "所属部门",
+ label: "工作单位",
prop: "deptName",
slot: true,
display: false,
@@ -244,13 +256,23 @@
{
label: "审查状态",
- prop: "userTypeNames",
+ prop: "examination_type",
slot: true,
- display: false
+ search: true,
+ display: false,
+ type: "select",
+ dicData: [
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ }]
}, {
- label: "审查描述",
- prop: "online_statusss",
- slot: true,
+ label: "审查明细",
+ prop: "examination_mx",
display: false
},
{
@@ -267,26 +289,26 @@
prop: 'baseInfo',
icon: 'el-icon-user-solid',
column: [
- {
- label: "所属客户",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- hide: !website.tenantMode,
- addDisplay: website.tenantMode,
- editDisplay: website.tenantMode,
- viewDisplay: website.tenantMode,
- rules: [{
- required: true,
- message: "请输入所属租户",
- trigger: "click"
- }],
- span: 24,
- },
+ // {
+ // label: "所属客户",
+ // prop: "tenantId",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/tenant/select",
+ // props: {
+ // label: "tenantName",
+ // value: "tenantId"
+ // },
+ // hide: !website.tenantMode,
+ // addDisplay: website.tenantMode,
+ // editDisplay: website.tenantMode,
+ // viewDisplay: website.tenantMode,
+ // rules: [{
+ // required: true,
+ // message: "请输入所属租户",
+ // trigger: "click"
+ // }],
+ // span: 24,
+ // },
{
label: "登录账号",
prop: "account",
@@ -608,10 +630,10 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.user_add, false),
- viewBtn: this.vaildData(this.permission.user_view, false),
- delBtn: this.vaildData(this.permission.user_delete, false),
- editBtn: this.vaildData(this.permission.user_edit, false)
+ addBtn: this.vaildData(this.permission.examination_add, true),
+ viewBtn: this.vaildData(this.permission.examination_view, false),
+ delBtn: this.vaildData(this.permission.examination_delete, true),
+ editBtn: this.vaildData(this.permission.examination_edit, true)
};
},
platformPermissionList() {
@@ -619,7 +641,7 @@
addBtn: false,
viewBtn: false,
delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false)
+ editBtn: this.vaildData(this.permission.examination_edit, false)
};
},
ids() {
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index a151fb8..66b3cd2 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -49,7 +49,7 @@
</el-form-item>
</el-col>
<el-col span="12">
- <el-form-item label="报警时间">
+ <el-form-item label="下发时间">
<el-input
disabled="true"
v-model="form.alarmTime"
@@ -87,15 +87,15 @@
<el-col span="12">
<avue-form :option="securityArritem" v-model="form"></avue-form>
</el-col>
- <el-col span="12">
- <el-form-item label="派发人">
- <el-input
- disabled="true"
- v-model="form.alarmPeople"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-col>
+<!-- <el-col span="12">-->
+<!-- <el-form-item label="派发人">-->
+<!-- <el-input-->
+<!-- disabled="true"-->
+<!-- v-model="form.alarmPeople"-->
+<!-- autocomplete="off"-->
+<!-- ></el-input>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
</el-row>
</el-form>
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 0694e52..d7dc876 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -183,6 +183,19 @@
//cascaderItem: ["city", "district"],
dicUrl:
"/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
+ control:(val,form)=>{
+ if (val){
+ debugger
+ }
+ return {
+ text2:{
+ display:true
+ },
+ text3:{
+ label:'内容3'
+ }
+ }
+ },
},
{
label: "下发时间",
@@ -353,13 +366,13 @@
},
],
},
- {
- label: "派发人",
- prop: "alarmPeople",
- width: 90,
- addDisplay: false,
- editDisplay: false,
- },
+ // {
+ // label: "派发人",
+ // prop: "alarmPeople",
+ // width: 90,
+ // addDisplay: false,
+ // editDisplay: false,
+ // },
{
label: "处警员",
prop: "securityArr",
@@ -375,6 +388,18 @@
addDisplay: true,
editDisplay: true,
viewDisplay: true,
+ },
+ {
+ label: "巡逻路线",
+ prop: "xllx",
+ hide: true,
+ display:true,
+ type: "tree",
+ filter:false,
+ dicUrl: "/api/routeIn/routein/tree",
+ props: {
+ label: "title"
+ },
}
],
},
@@ -433,13 +458,23 @@
},
immediate: true,
},
- //随意一个
- // 'form.deviceName'() {
- // if (this.initFlag) {
- // this.initData();
- // }
- // }
-
+ 'form.alarmType':{
+ handler(val){
+ var xllx =this.findObject(this.option.column,'xllx')
+ if(val==="巡逻任务"){
+ xllx.display=true
+ xllx.rules=[{
+ required: true,
+ message: "请选择巡逻路线",
+ trigger: "blur"
+ }]
+ }else{
+ xllx.display=false
+ xllx.rules=[]
+ }
+ },
+ immediate: true
+ },
},
computed: {
...mapGetters(["permission", "flowRoutes"]),
@@ -479,7 +514,7 @@
if (row.securityArr == "" || row.securityArr == null) {
row.jtype = "0";
row.alarmPeople = "";
- }else {
+ } else {
row.jtype = "1";
//已派发保安
row.alarmPeople = userId;
@@ -516,7 +551,7 @@
if (row.securityArr == "" || row.securityArr == null) {
row.jtype = "0";
row.alarmPeople = "";
- }else {
+ } else {
row.jtype = "1";
//已派发保安
row.alarmPeople = userId;
--
Gitblit v1.9.3