From b624ceba2053f5f9d82a63ea0682ca87ca54dc12 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 14 十二月 2022 16:35:30 +0800
Subject: [PATCH] 2022-12-14 肖辉 用户管理模块-新建用户密码校验修改 智能巡查模块-预警研判样式修改
---
src/views/intelligentPatrol/studyJudge/index.vue | 282 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 160 insertions(+), 122 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index e19e9d6..6b983fd 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -1,46 +1,82 @@
<template>
<div class="study-judge">
- <div class="study-judge-header">
- <span
- >鎮ㄦ湁<span @click="openDialogTable">{{ countData.review }}</span>鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{
- countData.register
- }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span
- >
- </div>
+ <!-- <div class="study-judge-header">-->
+ <!-- <span-->
+ <!-- >鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{-->
+ <!-- countData.register-->
+ <!-- }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span-->
+ <!-- >-->
+ <!-- </div>-->
<div class="study-judge-main">
- <div class="sjm-header">
- <div class="sjm-header-left">
- <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>
- <span class="moni-area">{{ currentEvent.street }}</span>
- <span>{{ currentEvent.address }}</span>
- </div>
- <div class="sjm-header-right">
- <el-button size="small" @click="createVideo(currentEvent, 'live')"
- >瀹炴椂棰勮
- </el-button
- >
- <el-button size="small" @click="createVideo(currentEvent, 'playback')"
- >褰曞儚鍥炴斁
- </el-button
- >
- </div>
- </div>
+ <!-- <div class="sjm-header">-->
+ <!-- <div class="sjm-header-left">-->
+ <!-- <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>-->
+ <!-- <span class="moni-area">{{ currentEvent.street }}</span>-->
+ <!-- <span>{{ currentEvent.address }}</span>-->
+ <!-- </div>-->
+ <!-- <div class="sjm-header-right">-->
+ <!-- <el-button size="small" @click="createVideo(currentEvent, 'live')"-->
+ <!-- >瀹炴椂棰勮</el-button-->
+ <!-- >-->
+ <!-- <el-button size="small" @click="createVideo(currentEvent, 'playback')"-->
+ <!-- >褰曞儚鍥炴斁</el-button-->
+ <!-- >-->
+ <!-- </div>-->
+ <!-- </div>-->
<div class="sjm-content">
<div class="sjm-content-left">
+ <!-- <div class="sjm-header-left">-->
+ <!-- <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>-->
+ <!-- <span class="moni-area">{{ currentEvent.street }}</span>-->
+ <!-- <span>{{ currentEvent.address }}</span>-->
+ <!-- </div>-->
+ <span
+ >鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{
+ countData.register
+ }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span
+ >
+ <div class="sjm-header-left">
+ <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>
+ <span class="moni-area">{{ currentEvent.street }}</span>
+ <span>{{ currentEvent.address }}</span>
+ </div>
<div
class="img-item"
v-for="(item, index) in imageList"
:key="item.id"
>
<span>鎶ヨ鍥剧墖</span>
- <img :src="item"/>
+ <img :src="item" />
<span v-if="index === 0"
>鎶ヨ鏃堕棿锛歿{ currentEvent.alarmTime }}</span
>
</div>
<div class="img-item" v-for="item in imageList" :key="item.id">
- <img :src="item"/>
+ <img :src="item" />
</div>
+ <el-form
+ ref="currentEvent"
+ label-width="120px"
+ :model="eventInfoData"
+ :rules="rules"
+ label-position="left"
+ class="left-form">
+ <el-form-item label="浜嬩欢缂栧彿:">
+ <span>{{ currentEvent.code }}</span>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绛夌骇:">
+ <span>{{ currentEvent.grade }}</span>
+ </el-form-item>
+ <el-form-item label="棣栨鎶ヨ鏃堕棿:">
+ <span>{{ currentEvent.alarmTime }}</span>
+ </el-form-item>
+ <el-form-item label="鏈�杩戞姤璀︽椂闂�:">
+ <span>{{ currentEvent.currentAlarmTime }}</span>
+ </el-form-item>
+ <el-form-item label="鎸佺画鏃堕棿:">
+ <span>{{ currentEvent.conntinueTime }}</span>
+ </el-form-item>
+ </el-form>
</div>
<div class="sjm-content-center">
<div class="map">
@@ -50,6 +86,14 @@
</div>
<div class="sjm-content-right">
<div class="card-box">
+ <div class="but-live">
+ <el-button size="small" @click="createVideo(currentEvent, 'live')"
+ >瀹炴椂棰勮</el-button
+ >
+ <el-button size="small" @click="createVideo(currentEvent, 'playback')"
+ >褰曞儚鍥炴斁</el-button
+ >
+ </div>
<div class="card-header">
<span>鎶ヨ璁板綍--{{ currentEvent.algoName }}</span>
</div>
@@ -59,21 +103,21 @@
:model="eventInfoData"
:rules="rules"
>
- <el-form-item label="浜嬩欢缂栧彿:">
- <span>{{ currentEvent.code }}</span>
- </el-form-item>
- <el-form-item label="浜嬩欢绛夌骇:">
- <span>{{ currentEvent.grade }}</span>
- </el-form-item>
- <el-form-item label="棣栨鎶ヨ鏃堕棿:">
- <span>{{ currentEvent.alarmTime }}</span>
- </el-form-item>
- <el-form-item label="鏈�杩戞姤璀︽椂闂�:">
- <span>{{ currentEvent.currentAlarmTime }}</span>
- </el-form-item>
- <el-form-item label="鎸佺画鏃堕棿:">
- <span>{{ currentEvent.conntinueTime }}</span>
- </el-form-item>
+ <!-- <el-form-item label="浜嬩欢缂栧彿:">-->
+ <!-- <span>{{ currentEvent.code }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="浜嬩欢绛夌骇:">-->
+ <!-- <span>{{ currentEvent.grade }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="棣栨鎶ヨ鏃堕棿:">-->
+ <!-- <span>{{ currentEvent.alarmTime }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鏈�杩戞姤璀︽椂闂�:">-->
+ <!-- <span>{{ currentEvent.currentAlarmTime }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鎸佺画鏃堕棿:">-->
+ <!-- <span>{{ currentEvent.conntinueTime }}</span>-->
+ <!-- </el-form-item>-->
<el-form-item label="鍏宠仈搴楅摵" prop="store">
<el-select
v-model="eventInfoData.store"
@@ -100,8 +144,7 @@
:label="item.id"
v-for="item in stateList"
:key="item.id"
- >{{ item.label }}
- </el-radio
+ >{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
@@ -149,12 +192,10 @@
<el-button
:disabled="currentPage === 1"
@click="pageChange('prev')"
- >涓婁竴鏉�
- </el-button
+ >涓婁竴鏉�</el-button
>
<el-button @click.native.prevent="handleConfirm"
- >纭
- </el-button
+ >纭</el-button
>
<el-button @click="pageChange('next')">涓嬩竴鏉�</el-button>
</el-form-item>
@@ -182,9 +223,6 @@
<div id="dom1" class="dom1"></div>
</div>
</el-dialog>
- <el-dialog :visible.sync="isShowTable" title="鎶ヨ淇℃伅" width="1200px">
- <inspection-table/>
- </el-dialog>
</div>
</template>
@@ -195,43 +233,42 @@
import { FILE_ORIGINAL_URL } from "@/utils";
import { validateCarNum } from "@/utils/validate";
import MyDispatch from "@/components/dispatch";
-import InspectionTable from "@/views/intelligentPatrol/studyJudge/inspectionTable/index.vue";
import MyMap from "@/components/map";
export default {
- components: { MyDispatch, MyMap ,InspectionTable},
+ components: { MyDispatch, MyMap },
created() {
this.getInspectionData();
this.initEventParams();
basecase
- .getInspectionCountData()
- .then((res) => {
- this.countData = res;
- })
- .catch((err) => this.$message.error(err));
+ .getInspectionCountData()
+ .then((res) => {
+ this.countData = res;
+ })
+ .catch((err) => this.$message.error(err));
getStoreInfoList({ current: 1, size: 100 })
- .then(({ list }) => {
- this.storeList = list;
- })
- .catch((err) => {
- this.$message.error(err);
- });
+ .then(({ list }) => {
+ this.storeList = list;
+ })
+ .catch((err) => {
+ this.$message.error(err);
+ });
baseInfo
- .getCategoryList()
- .then((res) => {
- this.categoryOptions = res;
- })
- .catch((err) => this.$message.error(err));
+ .getCategoryList()
+ .then((res) => {
+ this.categoryOptions = res;
+ })
+ .catch((err) => this.$message.error(err));
baseInfo
- .getTypeList()
- .then((res) => {
- this.typeList = res;
- })
- .catch((err) => this.$message.error(err));
+ .getTypeList()
+ .then((res) => {
+ this.typeList = res;
+ })
+ .catch((err) => this.$message.error(err));
},
mounted() {
this.timer = setInterval(() => {
@@ -251,13 +288,12 @@
}
};
return {
- timer:null,
+ timer: null,
countData: {
study: 0,
review: 0,
register: 0,
},
- isShowTable: true,
currentEvent: {},
stateList: [
{
@@ -326,9 +362,6 @@
};
},
methods: {
- openDialogTable(){
- this.isShowTable = true
- },
pageChange(type) {
if (type === "next") {
this.currentPage += 1;
@@ -340,32 +373,32 @@
getInspectionData() {
basecase
- .getInspectionData({ current: this.currentPage })
- .then(({ records }) => {
- this.currentEvent = records[0];
- if (this.currentEvent?.picData) {
- this.imageList = this.currentEvent.picData
- .split(",")
- .map((item) => `${FILE_ORIGINAL_URL}${item}`);
- }
- if (
- this.currentEvent?.alarmTime ||
- this.currentEvent?.currentAlarmTime
- ) {
- const { alarmTime, currentAlarmTime } = this.currentEvent;
- const continueAlarmTime =
- new Date().getTime() -
- (currentAlarmTime
- ? new Date(currentAlarmTime).getTime()
- : new Date(alarmTime).getTime());
- const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24;
- const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24;
- this.currentEvent.conntinueTime = `${parseInt(
- CONTINUE_DAY
- )}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`;
- }
- })
- .catch((err) => this.$message.error(err));
+ .getInspectionData({ current: this.currentPage })
+ .then(({ records }) => {
+ this.currentEvent = records[0];
+ if (this.currentEvent?.picData) {
+ this.imageList = this.currentEvent.picData
+ .split(",")
+ .map((item) => `${FILE_ORIGINAL_URL}${item}`);
+ }
+ if (
+ this.currentEvent?.alarmTime ||
+ this.currentEvent?.currentAlarmTime
+ ) {
+ const { alarmTime, currentAlarmTime } = this.currentEvent;
+ const continueAlarmTime =
+ new Date().getTime() -
+ (currentAlarmTime
+ ? new Date(currentAlarmTime).getTime()
+ : new Date(alarmTime).getTime());
+ const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24;
+ const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24;
+ this.currentEvent.conntinueTime = `${parseInt(
+ CONTINUE_DAY
+ )}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`;
+ }
+ })
+ .catch((err) => this.$message.error(err));
},
// 纭鐐瑰嚮浜嬩欢
@@ -408,13 +441,13 @@
const eventParams = Object.assign({}, this.eventInfoData);
delete eventParams.store;
basecase
- .confirmInspection({ ...eventParams, ...data })
- .then(() => {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.getInspectionData();
- this.initEventParams();
- })
- .catch((err) => this.$message.error(err));
+ .confirmInspection({ ...eventParams, ...data })
+ .then(() => {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.getInspectionData();
+ this.initEventParams();
+ })
+ .catch((err) => this.$message.error(err));
},
closeDialog() {
@@ -506,14 +539,14 @@
// });
_this.ws
- .createCtrl(params)
- .then((res) => {
- this.$message.success("鍒涘缓鎴愬姛");
- console.log("res", res);
- })
- .catch((e) => {
- console.log("error;", e);
- });
+ .createCtrl(params)
+ .then((res) => {
+ this.$message.success("鍒涘缓鎴愬姛");
+ console.log("res", res);
+ })
+ .catch((e) => {
+ console.log("error;", e);
+ });
if (ctrlType == "playback") {
const end = new Date();
@@ -587,7 +620,7 @@
beforeDestroy() {
clearInterval(this.timer);
this.timer = null;
- }
+ },
};
</script>
@@ -635,11 +668,12 @@
.sjm-content-left {
line-height: 4.8vh;
-
+ .left-form> ::v-deep.el-form-item__label{
+ font-size: 16px!important;
+ }
.img-item {
display: flex;
flex-direction: column;
-
img {
width: 15vw;
height: 20vh;
@@ -653,6 +687,10 @@
.sjm-content-right {
.card-box {
+ .but-live{
+ padding-left: 48px;
+ line-height: 4.8vh;
+ }
.card-header {
padding-left: 48px;
line-height: 4.8vh;
--
Gitblit v1.8.0