From becf4b68d07cc3248cba8c652768a8be41875410 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 18 Mar 2021 11:35:40 +0800
Subject: [PATCH] 部分弹框样式修改，省-区三级联动，部分接口调整
---
src/views/realTimePolice/real.vue | 318 ++++++++++++++---------------------------------------
1 files changed, 84 insertions(+), 234 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 66eb9d4..b13a290 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-03-17 15:21:33
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-03-17 16:44:50
+ * @Last Modified time: 2021-03-18 11:24:28
*/
<template>
<basic-container>
@@ -192,12 +192,8 @@
</el-row>
<el-row>
<el-col span="12">
- <el-form-item label="行政区">
- <el-input
- disabled="true"
- v-model="form.district"
- autocomplete="off"
- ></el-input>
+ <el-form-item label="省份" class="cityClassParams">
+ <avue-form :option="itemOption" v-model="form"></avue-form>
</el-form-item>
</el-col>
<el-col span="12">
@@ -262,7 +258,6 @@
</el-form-item>
</el-col>
<el-col span="12">
-<<<<<<< HEAD
<el-form-item label="监控视频">
<el-button type="success" @click.stop="queryOldVideo(form)"
>视频通话
@@ -270,15 +265,10 @@
<el-button type="primary" @click.stop="queryOldVideo(form)"
>查看历史
</el-button>
-=======
- <el-form-item label="备注">
- <el-input v-model="form.bz" autocomplete="off"></el-input>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
</el-row>
-<<<<<<< HEAD
<el-row>
<el-col span="12">
<el-form-item label="报警内容">
@@ -287,31 +277,11 @@
v-model="form.content"
autocomplete="off"
></el-input>
-=======
- <el-row>
- <el-form-item label="报警内容">
- <el-input
- disabled="true"
- v-model="form.content"
- autocomplete="off"
- ></el-input>
- </el-form-item>
- </el-row>
-
- <el-row>
- <el-col span="12">
- <el-form-item label="视频通话">
- <el-button type="primary" @click.stop="queryOldVideo(form)"
- >查看视频
- </el-button>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
</el-form-item>
</el-col>
<el-col span="12">
- <el-form-item label="历史视频">
- <el-button type="primary" @click.stop="queryOldVideo(form)"
- >查看视频
- </el-button>
+ <el-form-item label="备注">
+ <el-input v-model="form.bz" autocomplete="off"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -325,7 +295,6 @@
@click.stop="aKeyToCall($event, form)"
>查看视频
</el-button> -->
-<<<<<<< HEAD
<el-button type="success" @click.stop="revoke(form)"
>办结
</el-button>
@@ -336,12 +305,6 @@
alt=""
/>
-=======
- <el-button type="warning" @click.stop="revoke(form)"
- >办结
- </el-button>
- <el-button type="danger" class="push-nmb-btn">推送110</el-button>
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
<el-button type="primary" @click.stop="generate(form)"
>派送保安
</el-button>
@@ -374,15 +337,6 @@
import Recorder from "js-audio-recorder";
-<<<<<<< HEAD
-var newAddOper = axios.create({
- baseURL: "http://s16s652780.51mypc.cn",
- withCredentials: false,
- headers: {},
-});
-
-=======
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
export default {
data() {
return {
@@ -391,11 +345,7 @@
videoSource: "",
dialogTableVisible: false,
innerVisibleVideo: false,
-<<<<<<< HEAD
- activeClass: -1,
-=======
activeClass: 3,
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
form: {},
query: {},
dateTime: [],
@@ -600,6 +550,57 @@
},
],
},
+ itemOption: {
+ menuBtn: false,
+ column: [
+ {
+ disabled: true,
+ row: false,
+ prop: "province",
+ type: "select",
+ placeholder: "省份",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "city",
+ type: "select",
+ placeholder: "地市",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ {
+ disabled: true,
+ row: false,
+ prop: "district",
+ type: "select",
+ placeholder: "区县",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 1,
+ labelWidth: "0",
+ className: "cityClassSelect",
+ },
+ ],
+ },
data: [],
isActive: false,
recorder: null,
@@ -647,7 +648,6 @@
(error) => {
window.console.log(error);
loading();
-<<<<<<< HEAD
}
);
},
@@ -668,28 +668,6 @@
}
);
},
-=======
- }
- );
- },
- rowUpdate(row, index, done, loading) {
- row.coordinate = "";
- update(row).then(
- () => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!",
- });
- done();
- },
- (error) => {
- window.console.log(error);
- loading();
- }
- );
- },
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
@@ -708,11 +686,7 @@
});
},
searchReset() {
-<<<<<<< HEAD
- this.activeClass = -1;
-=======
this.activeClass = 3;
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
this.query = {};
this.onLoad(this.page);
},
@@ -846,14 +820,11 @@
currentData.getMinutes() < 10
? "0" + currentData.getMinutes()
: currentData.getMinutes();
-<<<<<<< HEAD
//秒
var currenS =
currentData.getSeconds() < 10
? "0" + currentData.getSeconds()
: currentData.getSeconds();
-=======
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
return {
week: {
@@ -884,7 +855,6 @@
currenM +
":00",
},
-<<<<<<< HEAD
current:
currentY +
"-" +
@@ -897,8 +867,6 @@
currenM +
":" +
currenS,
-=======
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
};
},
getBZdata(e) {
@@ -975,11 +943,6 @@
this.dialogTableVisible = true;
},
generate(row) {
-<<<<<<< HEAD
-=======
- console.log(row);
- return;
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
var that = this;
if (row.czTime == "" || row.czTime == null) {
this.$message({
@@ -1021,7 +984,6 @@
message: "生成警单成功",
type: "success",
});
-<<<<<<< HEAD
that.updateJtyep(row);
that.dialogTableVisible = false;
@@ -1043,12 +1005,11 @@
}
},
revoke(row) {
- console.log(row);
var that = this;
-
- newAddOper
+
+ axios
.post(
- "/blade-jfpts/operation/save",
+ "/api/blade-jfpts/operation/save",
{},
{
params: {
@@ -1176,142 +1137,6 @@
.then((result) => {
this.innerVisibleVideo = true;
-=======
-
- 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;
- row.id = response.data.data;
- that.$router.push({ path: "/distribution/index", query: row });
- })
- .catch(function (error) {
- that.dialogTableVisible = false;
- });
- }
- },
- revoke(row) {
- var that = this;
- axios({
- url: "/api/blade-jfpts/alarm/alarm/deletejj?id=" + row.id,
- method: "post",
- }).then(function () {
- that.dialogTableVisible = false;
- that.onLoad(that.page, that.query);
- });
- },
- updateJtyep(row) {
- var that = this;
- axios({
- url:
- "/api/blade-jfpts/alarm/alarm/updateJtype?id=" +
- row.id +
- "&czTime=" +
- row.czTime +
- "&bz=" +
- row.bz,
- method: "post",
- }).then(function () {
- that.onLoad(that.page, that.query);
- });
- },
-
- beginTimeOrEndTime(time) {
- var beginTime = new Date(time);
-
- var endTime = new Date(new Date(time).valueOf() - 1000 * 60 * 60 * 3);
-
- var beginY = beginTime.getFullYear();
-
- var beginM =
- beginTime.getMonth() + 1 < 10
- ? "0" + (beginTime.getMonth() + 1)
- : beginTime.getMonth() + 1;
-
- var beginD =
- beginTime.getDate() < 10
- ? "0" + beginTime.getDate()
- : beginTime.getDate();
-
- var beginH =
- beginTime.getHours() < 10
- ? "0" + beginTime.getHours()
- : beginTime.getHours();
-
- var beginm =
- beginTime.getMinutes() < 10
- ? "0" + beginTime.getMinutes()
- : beginTime.getMinutes();
-
- var begins =
- beginTime.getSeconds() < 10
- ? "0" + beginTime.getSeconds()
- : beginTime.getSeconds();
-
- var endY = endTime.getFullYear();
-
- var endM =
- endTime.getMonth() + 1 < 10
- ? "0" + (endTime.getMonth() + 1)
- : endTime.getMonth() + 1;
-
- var endD =
- endTime.getDate() < 10 ? "0" + endTime.getDate() : endTime.getDate();
-
- var endH =
- endTime.getHours() < 10 ? "0" + endTime.getHours() : endTime.getHours();
-
- var endm =
- endTime.getMinutes() < 10
- ? "0" + endTime.getMinutes()
- : endTime.getMinutes();
-
- var ends =
- endTime.getSeconds() < 10
- ? "0" + endTime.getSeconds()
- : endTime.getSeconds();
- return {
- begin: beginY + beginM + beginD + beginH + beginm + begins,
- end: endY + endM + endD + endH + endm + ends,
- };
- },
- queryOldVideo(data) {
- var newAxios = axios.create({
- baseURL: "https://web.byisf.com:18000",
- withCredentials: false,
- headers: {
- "Content-type": "application/x-www-form-urlencoded",
- },
- });
-
- var time = this.beginTimeOrEndTime(data.alarmTime);
-
- newAxios
- .post(
- "/api_control",
- {},
- {
- params: {
- param: JSON.stringify({ PktType: "GetAccessToken" }),
- },
- }
- )
- .then((res) => {
- newAxios
- .get(
- `https://web.byisf.com:18000/GetPlayUrl?deviceCode=${data.serialNumber}&chl=${data.channelNumber}`
- )
- .then((result) => {
- this.innerVisibleVideo = true;
-
->>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
this.videoSource = result.data.data.m3u8;
});
@@ -1479,6 +1304,31 @@
padding-right: 0px !important;
}
+.cityClassParams .avue-form__group.avue-form__group--flex {
+ display: flex;
+ justify-content: space-between;
+}
+
+.cityClassParams .cityClassSelect {
+ flex: 1;
+ margin: 0 !important;
+ padding-left: 0px !important;
+ padding-right: 0px !important;
+}
+
+.cityClassParams .cityClassSelect:nth-child(2) {
+ margin: 0 10px !important;
+}
+
+.cityClassParams .cityClassSelect .el-form-item {
+ margin-bottom: 0px !important;
+}
+
+.cityClassParams .cityClassSelect .el-form-item .el-input__inner {
+ height: 28px !important;
+ line-height: 28px !important;
+}
+
.cityClass2 div label {
display: none;
}
--
Gitblit v1.9.3