From ad88a6c7badd36789a851c34bdca8e0d0dc30dfb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 14 四月 2023 14:57:01 +0800
Subject: [PATCH] bug修改
---
src/views/intelligentPatrol/studyJudge/index.vue | 141 +++++++++++++++++++++++++++++++---------------
1 files changed, 94 insertions(+), 47 deletions(-)
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 293d94b..4d43eee 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -30,7 +30,7 @@
<!-- <span class="moni-area">{{ currentEvent.street }}</span>-->
<!-- <span>{{ currentEvent.address }}</span>-->
<!-- </div>-->
- <span
+ <span @click="openDialogTable" class="count-data-span"
>鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{
countData.register
}}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span
@@ -64,9 +64,9 @@
label-position="left"
class="left-form"
>
- <el-form-item label="浜嬩欢缂栧彿:">
+ <!-- <el-form-item label="浜嬩欢缂栧彿:">
<span>{{ currentEvent.code }}</span>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浜嬩欢绛夌骇:">
<span>{{ currentEvent.grade }}</span>
</el-form-item>
@@ -228,6 +228,9 @@
<div id="dom1" class="dom1"></div>
</div>
</el-dialog>
+ <el-dialog :visible.sync="isShowTable" title="鎶ヨ淇℃伅" width="1200px">
+ <inspection-table />
+ </el-dialog>
</div>
</template>
@@ -238,21 +241,21 @@
import { FILE_ORIGINAL_URL } from "@/utils";
import { validateCarNum } from "@/utils/validate";
import MyDispatch from "@/components/dispatch";
-
-import MyMap from "@/components/map";
+// import InspectionTable from "@/views/intelligentPatrol/studyJudge/inspectionTable/index.vue";
+// import MyMap from "@/components/map";
+import MyMap from "@/components/map/leafletMap.vue";
export default {
components: { MyDispatch, MyMap },
created() {
- this.getInspectionData();
+ if (this.info) {
+ this.currentEvent = this.info;
+ this.loadData();
+ } else {
+ this.getInspectionData();
+ }
this.initEventParams();
- basecase
- .getInspectionCountData()
- .then((res) => {
- this.countData = res;
- })
- .catch((err) => this.$message.error(err));
-
+ this.getInspectionCount();
getStoreInfoList({ current: 1, size: 100 })
.then(({ list }) => {
this.storeList = list;
@@ -277,8 +280,8 @@
},
mounted() {
this.timer = setInterval(() => {
- setTimeout(this.getInspectionData, 0);
- }, 1000 * 10);
+ this.getInspectionCount();
+ }, 1000 * 60 * 15);
},
data() {
const validateCarNumber = (rule, value, callback) => {
@@ -293,6 +296,7 @@
}
};
return {
+ isShowTable: false,
timer: null,
countData: {
study: 0,
@@ -370,6 +374,19 @@
};
},
methods: {
+ getInspectionCount() {
+ basecase
+ .getInspectionCountData({
+ showLoading: false,
+ })
+ .then((res) => {
+ this.countData = res;
+ })
+ .catch((err) => this.$message.error(err));
+ },
+ openDialogTable() {
+ this.isShowTable = true;
+ },
pageChange(type) {
if (type === "next") {
this.currentPage += 1;
@@ -380,41 +397,59 @@
},
getInspectionData() {
+ let data = {
+ current: this.currentPage,
+ pageSize: 1,
+ videoId: this.seachData.videoId,
+ };
+ if (this.seachData.alarmTime) {
+ data.beginTime = this.seachData.alarmTime[0];
+ data.endTime = this.seachData.alarmTime[1];
+ }
+ if (this.seachData.gradeId) {
+ data.gradeId = this.seachData.gradeId[1];
+ }
basecase
- .getInspectionData({ current: this.currentPage })
- .then(({ records }) => {
- this.currentEvent = records[0];
- this.point = {
- x: this.currentEvent.longitude,
- y: this.currentEvent.latitude,
- };
- this.zoom = 19;
- this.mark = { title: this.currentEvent.address };
- 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)}灏忔椂`;
+ .getInspectionData(data)
+ .then(({ records, total }) => {
+ this.countData.review = total;
+ if (records.length > 0) {
+ this.currentEvent = records[0];
+ this.loadData();
+ } else {
+ this.currentEvent = {};
+ this.$message("褰撳墠鏌ヨ鏉′欢鏃犳暟鎹�");
}
})
.catch((err) => this.$message.error(err));
},
-
+ loadData() {
+ debugger;
+ this.point = {
+ x: this.currentEvent.longitude,
+ y: this.currentEvent.latitude,
+ };
+ this.zoom = 18;
+ this.mark = { title: this.currentEvent.address };
+ if (this.currentEvent?.picData) {
+ this.imageList = this.currentEvent.picData
+ .split(",")
+ .map((item) => `${FILE_ORIGINAL_URL}sccg/API/img?fileUrl=${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)}灏忔椂`;
+ }
+ },
// 纭鐐瑰嚮浜嬩欢
handleConfirm() {
this.$refs.currentEvent.validate((flag) => {
@@ -490,8 +525,8 @@
if (res) {
// 杩炴帴瀹㈡埛绔垚鍔�
this.ws.login({
- loginIp: "183.245.159.161",
- loginPort: "8282",
+ loginIp: "172.28.194.180",
+ loginPort: "7902",
userName: "suichang",
userPwd: "a12345677",
https: 1,
@@ -630,11 +665,16 @@
second = second < 10 ? "0" + second : second;
return y + "-" + m + "-" + d + " " + h + ":" + minute + ":" + second;
},
+ resetAll() {
+ this.seachData = {};
+ },
},
beforeDestroy() {
clearInterval(this.timer);
this.timer = null;
},
+
+ props: ["info", "seachData"],
};
</script>
@@ -682,6 +722,10 @@
.sjm-content-left {
line-height: 4.8vh;
+ .count-data-span {
+ cursor: pointer;
+ color: #66b1ff;
+ }
.left-form > ::v-deep.el-form-item__label {
font-size: 16px !important;
}
@@ -735,4 +779,7 @@
height: 100%;
min-width: 460px;
}
+.header {
+ line-height: normal;
+}
</style>
--
Gitblit v1.8.0