From 21db24f828f6647c9a9e93f1d6fdfaf686d42c1f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 14 Jul 2021 21:13:00 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-publicSecurity
---
src/views/realTimePolice/real.vue | 67 ++
src/views/examination/examination.vue | 951 +++++++++++++++++++++++++++++++++++++++++++
vue.config.js | 3
src/router/views/index.js | 111 ++--
src/views/policeTracking/policeTracking.vue | 20
src/api/system/examination.js | 120 +++++
6 files changed, 1,195 insertions(+), 77 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 6247a27..d4b84f9 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,19 +1,19 @@
import Layout from '@/page/index/'
export default [{
- path: '/wel',
- component: Layout,
- redirect: '/wel/index',
- children: [{
- path: 'index',
- name: '首页',
- meta: {
- i18n: 'dashboard'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/wel/home')
- }]
- },
+ path: '/wel',
+ component: Layout,
+ redirect: '/wel/index',
+ children: [{
+ path: 'index',
+ name: '首页',
+ meta: {
+ i18n: 'dashboard'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/wel/home')
+ }]
+},
// {
// path: '/wel',
@@ -49,7 +49,7 @@
i18n: 'distribution'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/distribution/index')
+ import ( /* webpackChunkName: "views" */ '@/views/distribution/index')
}]
},
{
@@ -63,7 +63,7 @@
i18n: 'test'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/test')
+ import ( /* webpackChunkName: "views" */ '@/views/util/test')
}]
}, {
path: '/dict-horizontal',
@@ -76,7 +76,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
}]
}, {
path: '/dict-vertical',
@@ -89,7 +89,7 @@
i18n: 'dict'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
}]
}, {
path: '/info',
@@ -102,7 +102,7 @@
i18n: 'info'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
}]
},
{
@@ -116,7 +116,7 @@
i18n: 'real'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/Video/video')
+ import ( /* webpackChunkName: "views" */ '@/views/Video/video')
}, {
path: 'history/:historyId',
name: '设备历史',
@@ -124,7 +124,7 @@
i18n: 'real'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
+ import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
}]
},
{
@@ -138,7 +138,7 @@
i18n: 'data'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
}, {
path: 'map',
name: '地图模式',
@@ -146,7 +146,7 @@
i18n: 'map'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/map')
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/map')
}, {
path: 'card',
name: '卡片模式',
@@ -154,7 +154,7 @@
i18n: 'card'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/card')
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/card')
}]
},
@@ -169,7 +169,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
}, {
path: 'handle/:taskId/:processInstanceId/:businessId',
name: '处理请假流程',
@@ -177,7 +177,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
}, {
path: 'detail/:processInstanceId/:businessId',
name: '请假流程详情',
@@ -185,7 +185,7 @@
i18n: 'work'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
}]
},
{
@@ -194,12 +194,25 @@
redirect: '/realTimePolice/index',
children: [{
path: 'index',
- name: '警情派发',
+ name: '任务下发',
meta: {
i18n: 'real'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
+ import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
+ }]
+ }, {
+ path: '/examination',
+ component: Layout,
+ redirect: '/examination/index',
+ children: [{
+ path: 'index',
+ name: '资格审查',
+ meta: {
+ i18n: 'index'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/examination/examination')
}]
},
{
@@ -213,7 +226,7 @@
i18n: 'home'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/home/home')
+ import ( /* webpackChunkName: "views" */ '@/views/home/home')
}]
},
{
@@ -227,7 +240,7 @@
i18n: 'attendance'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
+ import ( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
}]
},
{
@@ -242,7 +255,7 @@
i18n: 'clientManagement'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
+ import ( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
}]
},
{
@@ -256,7 +269,7 @@
i18n: 'suser'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/cs')
+ import ( /* webpackChunkName: "views" */ '@/views/system/cs')
}]
}, {
path: '/policeTracking',
@@ -264,12 +277,12 @@
redirect: '/policeTracking/track',
children: [{
path: 'track',
- name: '警情追踪',
+ name: '任务追踪',
meta: {
i18n: 'track'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
+ import ( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
}]
}, {
path: '/healthcode',
@@ -282,7 +295,7 @@
i18n: 'healthcode'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
+ import ( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
}]
}, {
path: '/animalHeat',
@@ -295,7 +308,7 @@
i18n: 'animalHeat'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
+ import ( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
}]
}, {
path: '/article',
@@ -308,7 +321,7 @@
i18n: 'article'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/article/article')
+ import ( /* webpackChunkName: "views" */ '@/views/article/article')
}]
}, {
path: '/feedbackReport',
@@ -316,12 +329,12 @@
redirect: '/feedbackReport/index',
children: [{
path: 'index',
- name: '取证上报',
+ name: '事件上报',
meta: {
i18n: 'feedbackReport'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/feedbackReport/feedbackReport')
+ import ( /* webpackChunkName: "views" */ '@/views/feedbackReport/feedbackReport')
}]
},
{
@@ -349,7 +362,7 @@
i18n: 'alarm'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/alarm/alarm')
+ import ( /* webpackChunkName: "views" */ '@/views/alarm/alarm')
}]
}, {
path: '/parcel',
@@ -362,7 +375,7 @@
i18n: 'parcel'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
+ import ( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
}]
}, {
path: '/parcelKind',
@@ -375,7 +388,7 @@
i18n: 'parcelKind'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
+ import ( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
}]
}, {
path: '/dataL',
@@ -388,7 +401,7 @@
i18n: 'dataL'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/dataL/dataL')
+ import ( /* webpackChunkName: "views" */ '@/views/dataL/dataL')
}]
}, { //路由占位
path: '/dataL',
@@ -401,7 +414,7 @@
i18n: 'dataL'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/dataL/hFive')
+ import ( /* webpackChunkName: "views" */ '@/views/dataL/hFive')
}]
},
{
@@ -415,7 +428,7 @@
i18n: 'policeInformationDistribution'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/policeInformationDistribution/patrolManagement')
+ import ( /* webpackChunkName: "views" */ '@/views/policeInformationDistribution/patrolManagement')
}]
}, {
path: '/security',
@@ -428,7 +441,7 @@
i18n: 'policeInformationDistribution'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/security/security')
+ import ( /* webpackChunkName: "views" */ '@/views/security/security')
}]
}, {
path: '/report',
@@ -441,7 +454,7 @@
i18n: 'report'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/report/reportConfiguration')
+ import ( /* webpackChunkName: "views" */ '@/views/report/reportConfiguration')
}]
}, {
path: '/report',
@@ -454,7 +467,7 @@
i18n: 'report'
},
component: () =>
- import( /* webpackChunkName: "views" */ '@/views/report/announcementReport')
+ import ( /* webpackChunkName: "views" */ '@/views/report/announcementReport')
}]
},
{
@@ -471,7 +484,5 @@
import( /* webpackChunkName: "views" */ '@/components/real-popup/kongbai')
}]
}
-
-
]
diff --git a/src/views/examination/examination.vue b/src/views/examination/examination.vue
new file mode 100644
index 0000000..a7d9a4b
--- /dev/null
+++ b/src/views/examination/examination.vue
@@ -0,0 +1,951 @@
+<template>
+ <el-row>
+ <basic-container>
+ <avue-crud :option="option"
+ :search.sync="search"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ :permission="permissionList"
+ @row-del="rowDel"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ :before-open="beforeOpen"
+ :page.sync="page"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ v-if="permission.examination_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ </template>
+ <template slot-scope="{row}"
+ slot="tenantName">
+ <el-tag>{{row.tenantName}}</el-tag>
+ </template>
+ <template slot-scope="{row}"
+ slot="roleName">
+ <el-tag>{{row.roleName}}</el-tag>
+ </template>
+ <template slot-scope="{row}"
+ slot="deptName">
+ <el-tag>{{row.deptName}}</el-tag>
+ </template>
+ <template slot-scope="{row}"
+ 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
+ >{{
+ row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
+ }}
+ </el-tag>
+ </template>
+
+
+ </avue-crud>
+ <el-dialog title="用户角色配置"
+ append-to-body
+ :visible.sync="roleBox"
+ width="345px">
+
+ <el-tree :data="roleGrantList"
+ show-checkbox
+ check-strictly
+ default-expand-all
+ node-key="id"
+ ref="treeRole"
+ :default-checked-keys="roleTreeObj"
+ :props="props">
+ </el-tree>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <el-button type="primary"
+ @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="用户数据导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
+ <el-dialog title="用户平台配置"
+ append-to-body
+ :visible.sync="platformBox">
+ <avue-crud :option="platformOption"
+ :table-loading="platformLoading"
+ :data="platformData"
+ ref="platformCrud"
+ v-model="platformForm"
+ :before-open="platformBeforeOpen"
+ :page.sync="platformPage"
+ :permission="platformPermissionList"
+ @row-update="platformRowUpdate"
+ @search-change="platformSearchChange"
+ @search-reset="platformSearchReset"
+ @selection-change="platformSelectionChange"
+ @current-change="platformCurrentChange"
+ @size-change="platformSizeChange"
+ @refresh-change="platformRefreshChange"
+ @on-load="platformOnLoad">
+ <template slot-scope="{row}"
+ slot="tenantName">
+ <el-tag>{{row.tenantName}}</el-tag>
+ </template>
+ <template slot-scope="{row}"
+ slot="userTypeName">
+ <el-tag>{{row.userTypeName}}</el-tag>
+ </template>
+ </avue-crud>
+ </el-dialog>
+ </basic-container>
+ </el-row>
+</template>
+
+<script>
+ import {
+ getList,
+ getUser,
+ getUserPlatform,
+ remove,
+ update,
+ updatePlatform,
+ add,
+ grant,
+ resetPassword
+ } from "@/api/system/examination";
+ import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
+ import {getRoleTree} from "@/api/system/role";
+ import {getPostList} from "@/api/system/post";
+ import {mapGetters} from "vuex";
+ import website from '@/config/website';
+ import {getToken} from '@/util/auth';
+
+ export default {
+ data() {
+ const validatePass = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请输入密码'));
+ } else {
+ callback();
+ }
+ };
+ const validatePass2 = (rule, value, callback) => {
+ if (value === '') {
+ callback(new Error('请再次输入密码'));
+ } else if (value !== this.form.password) {
+ callback(new Error('两次输入密码不一致!'));
+ } else {
+ callback();
+ }
+ };
+ return {
+ form: {},
+ search: {},
+ roleBox: false,
+ excelBox: false,
+ platformBox: false,
+ initFlag: true,
+ selectionList: [],
+ query: {},
+ loading: true,
+ platformLoading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ platformPage: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
+ },
+ init: {
+ roleTree: [],
+ deptTree: [],
+ },
+ props: {
+ label: "title",
+ value: "key"
+ },
+ roleGrantList: [],
+ roleTreeObj: [],
+ treeDeptId: '',
+ treeData: [],
+ option: {
+ height: 'auto',
+ calcHeight: 54,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ //dialogType: 'drawer',
+ dialogClickModal: false,
+ column: [
+ {
+ label: "登录账号",
+ prop: "account",
+ search: true,
+ display: false
+ },
+ // {
+ // label: "所属客户",
+ // prop: "tenantName",
+ // slot: true,
+ // display: false,
+ // width:200
+ // },
+ {
+ label: "姓名",
+ prop: "realName",
+ search: true,
+ display: false
+ },
+ {
+ label: "性别",
+ prop: "sexName",
+ display: false
+ },
+ {
+ label: "联系方式",
+ prop: "phone",
+ display: false
+ },
+ {
+ label: "所属角色",
+ prop: "roleName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "工作单位",
+ prop: "deptName",
+ slot: true,
+ display: false,
+ width:260
+ },
+
+ {
+ label: "审查状态",
+ prop: "examination_type",
+ slot: true,
+ search: true,
+ display: false,
+ type: "select",
+ dicData: [
+ {
+ label: "正常",
+ value: "0",
+ },
+ {
+ label: "异常",
+ value: "1",
+ }]
+ }, {
+ label: "审查明细",
+ prop: "examination_mx",
+ display: false
+ },
+ {
+ label: "工作状态",
+ prop: "work_status",
+ slot: true,
+ hide: true,
+ display: false
+ },
+ ],
+ group: [
+ {
+ label: '基础信息',
+ 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: "account",
+ rules: [{
+ required: true,
+ message: "请输入登录账号",
+ trigger: "blur"
+ }],
+ },
+ {
+ label: "用户平台",
+ type: "select",
+ dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ prop: "userType",
+ rules: [{
+ required: true,
+ message: "请选择用户平台",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '密码',
+ prop: 'password',
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [{required: true, validator: validatePass, trigger: 'blur'}]
+ },
+ {
+ label: '确认密码',
+ prop: 'password2',
+ hide: true,
+ editDisplay: false,
+ viewDisplay: false,
+ rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
+ },
+ ]
+ },
+ {
+ label: '详细信息',
+ prop: 'detailInfo',
+ icon: 'el-icon-s-order',
+ column: [
+ {
+ label: "用户昵称",
+ prop: "name",
+ hide: true,
+ rules: [{
+ required: true,
+ message: "请输入用户昵称",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ rules: [{
+ required: true,
+ message: "请输入用户姓名",
+ trigger: "blur"
+ }, {
+ min: 2,
+ max: 5,
+ message: '姓名长度在2到5个字符'
+ }]
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [
+ {
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ hide: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
+ hide: true
+ },
+ {
+ label: "账号状态",
+ prop: "statusName",
+ hide: true,
+ display: false
+ }
+ ]
+ },
+ {
+ label: '职责信息',
+ prop: 'dutyInfo',
+ icon: 'el-icon-s-custom',
+ column: [
+ {
+ label: "用户编号",
+ prop: "code",
+ },
+ {
+ label: "所属角色",
+ prop: "roleId",
+ multiple: true,
+ type: "tree",
+ dicData: [],
+ props: {
+ label: "title"
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择所属角色",
+ trigger: "click"
+ }]
+ },
+ {
+ label: "所属部门",
+ prop: "deptId",
+ type: "cascader",
+ //multiple: true,
+ dicData: [],
+ props: {
+ label: "title"
+ },
+ checkStrictly: true,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择所属部门",
+ trigger: "click"
+ }]
+ },
+ {
+ label: "所属岗位",
+ prop: "postId",
+ type: "tree",
+ multiple: true,
+ dicData: [],
+ props: {
+ label: "postName",
+ value: "id"
+ },
+
+ },
+ ]
+ },
+ ]
+ },
+ data: [],
+ platformQuery: {},
+ platformSelectionList: [],
+ platformData: [],
+ platformForm: {},
+ platformOption: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ dialogClickModal: false,
+ menuWidth: 120,
+ editBtnText: '配置',
+ column: [
+ {
+ label: "登录账号",
+ prop: "account",
+ search: true,
+ display: false
+ },
+ {
+ label: "所属租户",
+ prop: "tenantName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ search: true,
+ display: false
+ },
+ {
+ label: "用户平台",
+ prop: "userTypeName",
+ slot: true,
+ display: false
+ },
+ {
+ label: "用户平台",
+ type: "select",
+ dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ search: true,
+ hide: true,
+ display: false,
+ prop: "userType",
+ rules: [{
+ required: true,
+ message: "请选择用户平台",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "用户拓展",
+ prop: "userExt",
+ type: "textarea",
+ minRows: 8,
+ span: 24,
+ overHidden: true,
+ row: true,
+ hide: true,
+ },
+ ],
+ },
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: '模板上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '模板上传中，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data'
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: "/api/blade-user/import-user"
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [
+ {
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ }
+ ]
+ }
+ };
+ },
+ watch: {
+ 'form.tenantId'() {
+ if (this.form.tenantId !== '' && this.initFlag) {
+ this.initData(this.form.tenantId);
+ }
+ },
+ 'excelForm.isCovered'() {
+ if (this.excelForm.isCovered !== '') {
+ const column = this.findObject(this.excelOption.column, "excelFile");
+ column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ }
+ }
+ },
+ computed: {
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ 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() {
+ return {
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: this.vaildData(this.permission.examination_edit, false)
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ mounted() {
+ // 非租户模式默认加载管理组数据
+ if (!website.tenantMode) {
+ this.initData(website.tenantId);
+ }
+ },
+ methods: {
+ nodeClick(data) {
+ this.treeDeptId = data.id;
+ this.page.currentPage = 1;
+ this.onLoad(this.page);
+ },
+ initData(tenantId) {
+ getRoleTree(tenantId).then(res => {
+ const column = this.findObject(this.option.group, "roleId");
+ column.dicData = res.data.data;
+ });
+ getDeptTree(tenantId).then(res => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ });
+ getPostList(tenantId).then(res => {
+ const column = this.findObject(this.option.group, "postId");
+ column.dicData = res.data.data;
+ });
+ },
+ submitRole() {
+ const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+ grant(this.ids, roleList).then(() => {
+ this.roleBox = false;
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.onLoad(this.page);
+ });
+ },
+ rowSave(row, done, loading) {
+ row.deptId = row.deptId.join(",");
+ row.roleId = row.roleId.join(",");
+ row.postId = row.postId.join(",");
+ add(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ rowUpdate(row, index, done, loading) {
+ row.deptId = row.deptId.join(",");
+ row.roleId = row.roleId.join(",");
+ row.postId = row.postId.join(",");
+ update(row).then(() => {
+ this.initFlag = false;
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.treeDeptId = '';
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleReset() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.$confirm("确定将选择账号密码重置为123456?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return resetPassword(this.ids);
+ })
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ this.$refs.crud.toggleSelection();
+ });
+ },
+ handleGrant() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据");
+ return;
+ }
+ this.roleTreeObj = [];
+ if (this.selectionList.length === 1) {
+ this.roleTreeObj = this.selectionList[0].roleId.split(",");
+ }
+ getRoleTree().then(res => {
+ this.roleGrantList = res.data.data;
+ this.roleBox = true;
+ });
+ },
+ handlePlatform() {
+ this.platformBox = true;
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ this.excelBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleExport() {
+ this.$confirm("是否导出用户数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
+ });
+ },
+ handleTemplate() {
+ window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
+ },
+ beforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getUser(this.form.id).then(res => {
+ this.form = res.data.data;
+ if (this.form.hasOwnProperty("deptId")) {
+ this.form.deptId = this.form.deptId.split(",");
+ }
+ if (this.form.hasOwnProperty("roleId")) {
+ this.form.roleId = this.form.roleId.split(",");
+ }
+ if (this.form.hasOwnProperty("postId")) {
+ this.form.postId = this.form.postId.split(",");
+ }
+ });
+ }
+ this.initFlag = true;
+ done();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ platformRowUpdate(row, index, done, loading) {
+ updatePlatform(row.id, row.userType, row.userExt).then(() => {
+ this.platformOnLoad(this.platformPage);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
+ });
+ },
+ platformBeforeOpen(done, type) {
+ if (["edit", "view"].includes(type)) {
+ getUserPlatform(this.platformForm.id).then(res => {
+ this.platformForm = res.data.data;
+ });
+ }
+ done();
+ },
+ platformSearchReset() {
+ this.platformQuery = {};
+ this.platformOnLoad(this.platformPage);
+ },
+ platformSearchChange(params, done) {
+ this.platformQuery = params;
+ this.platformPage.currentPage = 1;
+ this.platformOnLoad(this.platformPage, params);
+ done();
+ },
+ platformSelectionChange(list) {
+ this.platformSelectionList = list;
+ },
+ platformSelectionClear() {
+ this.platformSelectionList = [];
+ this.$refs.platformCrud.toggleSelection();
+ },
+ platformCurrentChange(currentPage) {
+ this.platformPage.currentPage = currentPage;
+ },
+ platformSizeChange(pageSize) {
+ this.platformPage.pageSize = pageSize;
+ },
+ platformRefreshChange() {
+ this.platformOnLoad(this.platformPage, this.platformQuery);
+ },
+ platformOnLoad(page, params = {}) {
+ this.platformLoading = true;
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
+ const data = res.data.data;
+ this.platformPage.total = data.total;
+ this.platformData = data.records;
+ this.platformLoading = false;
+ this.selectionClear();
+ });
+ }
+ }
+ };
+</script>
+
+<style>
+ .box {
+ height: 800px;
+ }
+
+ .el-scrollbar {
+ height: 100%;
+ }
+
+ .box .el-scrollbar__wrap {
+ overflow: scroll;
+ }
+</style>
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;
diff --git a/vue.config.js b/vue.config.js
index 6ab5d84..396ace9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,9 +37,10 @@
'/api': {
//本地服务接口地址
target: 'http://s16s652780.51mypc.cn/api/',
+ //target: 'http://172.20.10.2:82/',
//target: 'https://web.byisf.com/api/',
//远程演示服务地址,可用于直接启动项目
- // target: 'https://saber.bladex.vip/api',
+ //target: 'https://saber.bladex.vip/api',
ws: true,
pathRewrite: {
'^/api': '/'
--
Gitblit v1.9.3