From d28f23aea4bb508b0f957813c40d2e6e64cba1ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com> Date: Fri, 25 Aug 2023 15:51:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E9=98=B2=E5=91=98=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gridman/emphasis/index.vue | 2 +- src/views/gridman/firefighter/index.vue | 90 ++++++---- .../gridman/firefighter/widget/AddForm.vue | 164 +++++++++++------- src/views/gridman/forestranger/index.vue | 71 ++++---- .../gridman/forestranger/widget/AddForm.vue | 164 +++++++++++------- src/views/gridman/site/index.vue | 31 +++- 6 files changed, 319 insertions(+), 203 deletions(-) diff --git a/src/views/gridman/emphasis/index.vue b/src/views/gridman/emphasis/index.vue index 4b875ca..e1b5684 100644 --- a/src/views/gridman/emphasis/index.vue +++ b/src/views/gridman/emphasis/index.vue @@ -21,7 +21,7 @@
diff --git a/src/views/gridman/firefighter/index.vue b/src/views/gridman/firefighter/index.vue index 4b875ca..4c95b45 100644 --- a/src/views/gridman/firefighter/index.vue +++ b/src/views/gridman/firefighter/index.vue @@ -21,26 +21,16 @@
- + - - + - - - - - - - @@ -50,11 +40,8 @@ - - - - - +
@@ -68,6 +55,7 @@ import extend from "@/extensions/delRows.js" import * as modules from '@/api/modules' import * as login from '@/api/login' + import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import waves from '@/directive/waves' // 水波纹指令 import permissionBtn from '@/components/PermissionBtn' @@ -103,7 +91,7 @@ pageSize: 20, name: null, }, - detailInfo:[] + detailInfo: [] } }, @@ -122,7 +110,7 @@ methods: { add() { this.addServiceVisible = true; - this.detailInfo=[] + this.detailInfo = [] this.titleStr = '添加' }, addSuccess() { @@ -131,7 +119,7 @@ }, del() { var _this = this - if(this.multipleSelection.length != 1){ + if (this.multipleSelection.length != 1) { this.$message({ type: 'info', message: '请选择一条数据进行删除' @@ -143,7 +131,7 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { - postMethodCommon("/Grid/DeleteKeyUser?Id=" + _this.multipleSelection[0].id, {}).then(res => { + postMethodCommon("/FireGrid/DeleteFireFighter?Id=" + _this.multipleSelection[0].id, {}).then(res => { if (res.code == 200) { this.$message({ type: "success", @@ -161,7 +149,7 @@ }, react() { - if(this.multipleSelection.length != 1){ + if (this.multipleSelection.length != 1) { this.$message({ type: 'info', message: '请选择一条数据进行编辑' @@ -234,21 +222,11 @@ }, getList() { this.listLoading = true - getMethodCommon("/Grid/LoadKeyUser", this.listQuery).then(res => { + getMethodCommon("/FireGrid/GetFireFighter", this.listQuery).then(res => { if (res.code == 200) { + console.log(res) this.tableData = res.data - this.tableData.forEach((item, index) => { - switch (item.state) { - case 0: this.tableData[index].state = "未审核"; - break; - case 1: this.tableData[index].state = "审核通过"; - break; - case 2: this.tableData[index].state = "未通过"; - break; - case 3: this.tableData[index].state = "全部"; - break; - } - }) + this.total = res.count this.listLoading = false } @@ -280,9 +258,40 @@ \ No newline at end of file diff --git a/src/views/gridman/onepicture/index.vue b/src/views/gridman/onepicture/index.vue index 4b875ca..757b75a 100644 --- a/src/views/gridman/onepicture/index.vue +++ b/src/views/gridman/onepicture/index.vue @@ -1,467 +1,444 @@ - \ No newline at end of file From 7e6aaa49a2af8123fc87cfaee773de9ba99da5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com> Date: Fri, 25 Aug 2023 16:18:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/gridman/forestranger/index.vue | 2 +- src/views/gridman/index.vue | 90 +++++++++++++----------- src/views/gridman/navigation/index.vue | 12 +++- 3 files changed, 57 insertions(+), 47 deletions(-) diff --git a/src/views/gridman/forestranger/index.vue b/src/views/gridman/forestranger/index.vue index 09a4168..578df78 100644 --- a/src/views/gridman/forestranger/index.vue +++ b/src/views/gridman/forestranger/index.vue @@ -102,7 +102,7 @@ }, created() { - this.getList() + // this.getList() }, mounted() { diff --git a/src/views/gridman/index.vue b/src/views/gridman/index.vue index e4c4a8b..697f9b9 100644 --- a/src/views/gridman/index.vue +++ b/src/views/gridman/index.vue @@ -1,11 +1,11 @@ @@ -13,59 +13,63 @@ \ No newline at end of file diff --git a/src/views/gridman/navigation/index.vue b/src/views/gridman/navigation/index.vue index 151a8a8..9c4d649 100644 --- a/src/views/gridman/navigation/index.vue +++ b/src/views/gridman/navigation/index.vue @@ -6,9 +6,9 @@

欢迎进入网格化管理系统！

-
- -
{{item.lable}}
+
+ +
{{item.lable}}
@@ -60,6 +60,12 @@ }, ] } + }, + methods:{ + goItem(item){ + this.$router.push({'path':item.url}) + this.$emit('updateProjectId',item.lable) + } } }