From eb7249bbf95796a031eeaaf93ff48463a3408ed7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 12 Mar 2021 23:25:09 +0800
Subject: [PATCH] 警情分发修改
---
src/views/realTimePolice/real.vue | 14 ++++++-
src/views/policeInformationDistribution/index.vue | 50 ++++++++++++++-----------
src/views/distribution/index.vue | 11 +----
3 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/src/views/distribution/index.vue b/src/views/distribution/index.vue
index 3c11985..39296e0 100644
--- a/src/views/distribution/index.vue
+++ b/src/views/distribution/index.vue
@@ -4,7 +4,7 @@
label-position="right"
size="mini"
label-width="100px"
- style="background: #fff; margin-left: 10px; margin-right: 10px; height: calc(100% - 40px); width: calc(100% - 20px)"
+ style="background: #fff; margin-left: 10px;padding-top: 40px !important; margin-right: 10px; height: calc(100% - 40px); width: calc(100% - 20px)"
>
<el-row>
<el-col span="12"
@@ -97,11 +97,7 @@
@change="selectChange"
placeholder="请选择处理人"
:disabled="
- this.form.type == 0
- ? this.form.handletype == 1
- ? true
- : false
- : true
+ this.form.type == 0 ? this.form.handletype == 1 ? true : false : false
"
>
<el-option
@@ -159,8 +155,6 @@
};
},
created() {
-
-
this.form = this.$route.query;
this.form.handletype = 1;
if (this.form.type == 0) {
@@ -251,6 +245,7 @@
},
processChange(value) {
+ debugger
value == "提示业主"
? (this.form.handletype = 1)
: (this.form.handletype = 0);
diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index 48e5531..56b96d8 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -144,10 +144,15 @@
prop: "galarmPeople"
},
{
+ label: "联系电话",
+ prop: "phoneNumber",
+ width: 96
+ },
+ {
label: "报警时间",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
prop: "galarmTime",
width: 140
},
@@ -178,21 +183,24 @@
prop: "handName"
},
{
- label: "联系电话",
- prop: "phoneNumber",
- width: 96
- },
- {
label: "处置时间",
type: "datetime",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "yyyy-MM-dd hh:mm:ss",
- prop: "handleTime",
+ addDisplay: false,
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ prop: "czTime",
width: 140
- }, {
- label: "事发地址",
- width: 150,
- prop: "place"
+ },{
+ label: "备注",
+ prop: "bz",
+ width: 150
+ },
+ {
+ label: "设备编号",
+ search: true,
+ searchSpan: 3,
+ width: 120,
+ prop: "deviceNumber"
},
{
label: "省份",
@@ -246,13 +254,10 @@
span: 3,
labelWidth: "0",
className: "cityClass3"
- },
- {
- label: "设备编号",
- search: true,
- searchSpan: 3,
- width: 120,
- prop: "deviceNumber"
+ }, {
+ label: "事发地址",
+ width: 200,
+ prop: "place"
},
{
label: "处理状态",
@@ -506,7 +511,7 @@
rowStyle({row, column, rowIndex}) {
if (row.type == "0") {
return {
- color: "#ff7627"
+ color: "#ff0000"
};
} else if (row.type == "1") {
return {
@@ -519,6 +524,7 @@
}
},
disposition(data) {
+
var arr = [];
this.$store.state.tags.tagList.forEach(item => {
if (item.label != "警情分发处置") {
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 0be03ec..3a4c3df 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -248,7 +248,7 @@
<el-date-picker
v-model="form.czTime"
type="datetime"
- value-format="yyyy-MM-dd hh:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
>
</el-date-picker>
@@ -877,7 +877,9 @@
coordinate: null,
jd: row.jd,
wd: row.wd,
- addvcd: row.district,
+ district: row.district,
+ city: row.city,
+ province: row.province,
czTime: row.czTime,
jjTime: row.jjTime,
bz: row.bz
@@ -891,6 +893,14 @@
that.updateJtyep(row);
that.dialogTableVisible = false;
+ var arr = [];
+ that.$store.state.tags.tagList.forEach(item => {
+ if (item.label != "警情分发处置") {
+ arr.push(item);
+ }
+ });
+ that.$store.state.tags.tagList = arr;
+ row.type = 0;
that.$router.push({ path: "/distribution/index", query: row });
})
--
Gitblit v1.9.3