From 7e95fcd5edc8618036841b60b15d31e828ec2ccd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 28 Nov 2022 17:12:57 +0800
Subject: [PATCH] 修改按钮位置；部分添加、编辑方法改为调用submit接口
---
src/views/system/dept.vue | 36 +++++++++++
src/views/policeman/policeman.vue | 4
src/views/security/security.vue | 4
src/views/securityManageCar/securityManageCar.vue | 18 +++---
src/api/securityManage/securityManage.js | 4
src/api/deptPosition/deptPosition.js | 62 ++++++++++++++++++++
src/views/range/range.vue | 18 +++---
src/api/range/range.js | 4
src/api/securityManageCar/securityManageCar.js | 4
src/views/securityManage/securityManage.vue | 18 +++---
src/views/policecar/policecar.vue | 4
11 files changed, 135 insertions(+), 41 deletions(-)
diff --git a/src/api/deptPosition/deptPosition.js b/src/api/deptPosition/deptPosition.js
new file mode 100644
index 0000000..8980a53
--- /dev/null
+++ b/src/api/deptPosition/deptPosition.js
@@ -0,0 +1,62 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+ return request({
+ url: '/api/deptPosition/deptPosition/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getPage = (current, size, params) => {
+ return request({
+ url: '/api/deptPosition/deptPosition/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const getDetail = (id,deptId) => {
+ return request({
+ url: '/api/deptPosition/deptPosition/details',
+ method: 'get',
+ params: {
+ id,deptId
+ }
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ url: '/api/deptPosition/deptPosition/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
+
+export const add = (row) => {
+ return request({
+ url: '/api/deptPosition/deptPosition/submit',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ url: '/api/deptPosition/deptPosition/submit',
+ method: 'post',
+ data: row
+ })
+}
+
diff --git a/src/api/range/range.js b/src/api/range/range.js
index 44d8892..7bd9ecd 100644
--- a/src/api/range/range.js
+++ b/src/api/range/range.js
@@ -34,7 +34,7 @@
export const add = (row) => {
return request({
- url: '/api/range/range/insertes',
+ url: '/api/range/range/submit',
method: 'post',
data: row
})
@@ -42,7 +42,7 @@
export const update = (row) => {
return request({
- url: '/api/range/range/updatee',
+ url: '/api/range/range/submit',
method: 'post',
data: row
})
diff --git a/src/api/securityManage/securityManage.js b/src/api/securityManage/securityManage.js
index e690341..7ce8ee2 100644
--- a/src/api/securityManage/securityManage.js
+++ b/src/api/securityManage/securityManage.js
@@ -46,7 +46,7 @@
export const add = (row) => {
return request({
- url: '/api/securityManage/securityManage/save',
+ url: '/api/securityManage/securityManage/submit',
method: 'post',
data: row
})
@@ -54,7 +54,7 @@
export const update = (row) => {
return request({
- url: '/api/securityManage/securityManage/update',
+ url: '/api/securityManage/securityManage/submit',
method: 'post',
data: row
})
diff --git a/src/api/securityManageCar/securityManageCar.js b/src/api/securityManageCar/securityManageCar.js
index b841527..60bcf81 100644
--- a/src/api/securityManageCar/securityManageCar.js
+++ b/src/api/securityManageCar/securityManageCar.js
@@ -46,7 +46,7 @@
export const add = (row) => {
return request({
- url: '/api/securityManageCar/securityManageCar/save',
+ url: '/api/securityManageCar/securityManageCar/submit',
method: 'post',
data: row
})
@@ -54,7 +54,7 @@
export const update = (row) => {
return request({
- url: '/api/securityManageCar/securityManageCar/update',
+ url: '/api/securityManageCar/securityManageCar/submit',
method: 'post',
data: row
})
diff --git a/src/views/policecar/policecar.vue b/src/views/policecar/policecar.vue
index 12f2dfd..5254ce1 100644
--- a/src/views/policecar/policecar.vue
+++ b/src/views/policecar/policecar.vue
@@ -80,7 +80,7 @@
type: "input",
},
{
- label: "所属部门",
+ label: "所属机构",
prop: "deptId",
type: "tree",
dicUrl: "api/blade-system/dept/lazy-list",
@@ -93,7 +93,7 @@
searchSpan:4,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属机构",
trigger: "blur"
}]
},
diff --git a/src/views/policeman/policeman.vue b/src/views/policeman/policeman.vue
index 1c0c2b9..d4ea542 100644
--- a/src/views/policeman/policeman.vue
+++ b/src/views/policeman/policeman.vue
@@ -74,7 +74,7 @@
prop: "serialNumber",
},
{
- label: "所属部门",
+ label: "所属机构",
prop: "deptId",
type: "tree",
dicUrl: "api/blade-system/dept/lazy-list",
@@ -87,7 +87,7 @@
searchSpan:4,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属机构",
trigger: "blur"
}]
},
diff --git a/src/views/range/range.vue b/src/views/range/range.vue
index 457b6ad..cf7988b 100644
--- a/src/views/range/range.vue
+++ b/src/views/range/range.vue
@@ -27,12 +27,10 @@
@click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="{row,index}" slot="menu">
- <el-button type="text"
- size="small"
- icon="el-icon-view"
- @click="handleDetail(row)">详情
- </el-button>
+ <template slot-scope="{type,size,row,index}" slot="menu">
+ <el-button icon="el-icon-view" :size="size" :type="type" @click="handleDetail(row)">详 情</el-button>
+ <el-button icon="el-icon-edit" v-if="permission.range_edit" :size="size" :type="type" @click="$refs.crud.rowEdit(row,index)">编 辑</el-button>
+ <el-button icon="el-icon-delete" v-if="permission.range_delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删 除</el-button>
</template>
</avue-crud>
@@ -75,7 +73,9 @@
searchMenuSpan: 6,
border: true,
index: true,
- viewBtn: true,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false,
selection: true,
excelBtn: true,
dialogClickModal: false,
@@ -142,7 +142,7 @@
}]
},
{
- label: "所属部门",
+ label: "所属机构",
prop: "deptId",
type: "tree",
dicUrl: "api/blade-system/dept/lazy-list",
@@ -155,7 +155,7 @@
searchSpan:4,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属机构",
trigger: "blur"
}]
},
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index b70e1a9..fac3b5d 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -71,7 +71,7 @@
prop: "person",
},
{
- label: "所属部门",
+ label: "所属机构",
prop: "deptId",
type: "tree",
dicUrl: "api/blade-system/dept/lazy-list",
@@ -84,7 +84,7 @@
searchSpan:4,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属机构",
trigger: "blur"
}]
},
diff --git a/src/views/securityManage/securityManage.vue b/src/views/securityManage/securityManage.vue
index 76667e2..96f1894 100644
--- a/src/views/securityManage/securityManage.vue
+++ b/src/views/securityManage/securityManage.vue
@@ -27,12 +27,10 @@
@click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="{row,index}" slot="menu">
- <el-button type="text"
- size="small"
- icon="el-icon-view"
- @click="handleDetail(row)">详情
- </el-button>
+ <template slot-scope="{type,size,row,index}" slot="menu">
+ <el-button icon="el-icon-view" :size="size" :type="type" @click="handleDetail(row)">详 情</el-button>
+ <el-button icon="el-icon-edit" v-if="permission.range_edit" :size="size" :type="type" @click="$refs.crud.rowEdit(row,index)">编 辑</el-button>
+ <el-button icon="el-icon-delete" v-if="permission.range_delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删 除</el-button>
</template>
</avue-crud>
@@ -74,7 +72,9 @@
searchMenuSpan: 6,
border: true,
index: true,
- viewBtn: true,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false,
selection: true,
dialogClickModal: false,
column: [
@@ -100,7 +100,7 @@
}
},
{
- label: "所属部门",
+ label: "所属机构",
prop: "deptId",
type: "tree",
dicUrl: "api/blade-system/dept/lazy-list",
@@ -113,7 +113,7 @@
searchSpan:4,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属机构",
trigger: "blur"
}]
},
diff --git a/src/views/securityManageCar/securityManageCar.vue b/src/views/securityManageCar/securityManageCar.vue
index 2490135..52eb164 100644
--- a/src/views/securityManageCar/securityManageCar.vue
+++ b/src/views/securityManageCar/securityManageCar.vue
@@ -27,12 +27,10 @@
@click="handleDelete">删 除
</el-button>
</template>
- <template slot-scope="{row,index}" slot="menu">
- <el-button type="text"
- size="small"
- icon="el-icon-view"
- @click="handleDetail(row)">详情
- </el-button>
+ <template slot-scope="{type,size,row,index}" slot="menu">
+ <el-button icon="el-icon-view" :size="size" :type="type" @click="handleDetail(row)">详 情</el-button>
+ <el-button icon="el-icon-edit" v-if="permission.range_edit" :size="size" :type="type" @click="$refs.crud.rowEdit(row,index)">编 辑</el-button>
+ <el-button icon="el-icon-delete" v-if="permission.range_delete" :size="size" :type="type" @click="$refs.crud.rowDel(row,index)">删 除</el-button>
</template>
</avue-crud>
@@ -74,7 +72,9 @@
searchMenuSpan: 6,
border: true,
index: true,
- viewBtn: true,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false,
selection: true,
dialogClickModal: false,
column: [
@@ -109,7 +109,7 @@
}
},
{
- label: "所属部门",
+ label: "所属机构",
prop: "deptId",
type: "tree",
dicUrl: "api/blade-system/dept/lazy-list",
@@ -122,7 +122,7 @@
searchSpan:4,
rules: [{
required: true,
- message: "请选择所属部门",
+ message: "请选择所属机构",
trigger: "blur"
}]
},
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index c62272e..8c82344 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -29,6 +29,9 @@
</el-button>
</template>
<template slot-scope="scope" slot="menu">
+ <el-button icon="el-icon-view" :size="scope.size" :type="scope.type" @click="handleDetail(scope.row)">详 情</el-button>
+ <el-button icon="el-icon-edit" :size="scope.size" :type="scope.type" @click="$refs.crud.rowEdit(scope.row)">编 辑</el-button>
+ <el-button icon="el-icon-delete" :size="scope.size" :type="scope.type" @click="$refs.crud.rowDel(scope.row)">删 除</el-button>
<el-button
type="text"
icon="el-icon-circle-plus-outline"
@@ -43,6 +46,16 @@
<el-tag>{{row.deptCategoryName}}</el-tag>
</template>
</avue-crud>
+
+ <el-drawer
+ title="地图详情"
+ :visible.sync="isDetail"
+ :append-to-body="true"
+ size="60%"
+ direction="rtl"
+ :before-close="handleClose">
+ <map-box v-if="isDetail" :is-detail="isDetail" :route-range="routeRange"></map-box>
+ </el-drawer>
</basic-container>
</template>
@@ -55,10 +68,13 @@
getDept,
getDeptTree
} from "@/api/system/dept";
+ import {getDetail} from "@/api/deptPosition/deptPosition"
import {mapGetters} from "vuex";
import website from '@/config/website';
+ import MapBox from "@/components/map/mapBox";
export default {
+ components: {MapBox},
data() {
return {
form: {},
@@ -81,7 +97,9 @@
border: true,
index: true,
selection: true,
- viewBtn: true,
+ viewBtn: false,
+ delBtn: false,
+ editBtn: false,
menuWidth: 300,
dialogClickModal: false,
column: [
@@ -184,7 +202,9 @@
}
]
},
- data: []
+ data: [],
+ isDetail:false,
+ routeRange:"",
};
},
computed: {
@@ -295,6 +315,18 @@
});
});
},
+ //显示地图详情
+ handleDetail(row){
+ this.getPositionDetail(row)
+ },
+ getPositionDetail(row){
+ getDetail(null,row.id).then(res=>{
+ if (res.data.code == 200){
+ this.routeRange = res.data.data.position
+ this.isDetail = true
+ }
+ })
+ },
searchReset() {
this.query = {};
this.parentId = 0;
--
Gitblit v1.9.3