From 0ba8436bdb5df41772d6477a899fd259d0c4419c Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 23 Apr 2021 13:46:44 +0800
Subject: [PATCH] logo更换，及追踪页面严谨判断
---
public/img/ydlogo.png | 0
src/views/policeTracking/policeTracking.vue | 193 ++++++++++++++++++++++-------------------------
src/page/index/top/index.vue | 2
3 files changed, 92 insertions(+), 103 deletions(-)
diff --git a/public/img/ydlogo.png b/public/img/ydlogo.png
new file mode 100644
index 0000000..bdd814c
--- /dev/null
+++ b/public/img/ydlogo.png
Binary files differ
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 7186397..850bac0 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -22,7 +22,7 @@
</div>
<div class="top-bar__right">
<img
- src="/img/ydlg.png"
+ src="/img/ydlogo.png"
style="height: 44px; vertical-align: middle"
alt=""
/>
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index ea5d109..a62d353 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -379,105 +379,92 @@
</el-form>
</el-card>
- <el-row :gutter="20">
- <el-col :span="16">
- <div class="grid-content bg-purple"></div>
- </el-col>
- <el-col :span="8">
- <div class="grid-content bg-purple"></div>
- </el-col>
- </el-row>
-
- <div class="demo-image__placeholder">
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
<div
- role="tab"
- aria-expanded="true"
- aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823"
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
>
- <div
- role="button"
- tabindex="0"
- class="el-collapse-item__header focusing is-active"
- >
- <div class="avue-group__header avue-group">
- <i class="el-icon-s-order avue-group__icon"></i>
- <h1 class="avue-group__title">警情反馈</h1>
- </div>
- </div>
- </div>
-
- <el-card>
- <el-input
- disabled="true"
- type="textarea"
- v-model="security.describe"
- autocomplete="off"
- ></el-input>
- </el-card>
-
- <div class="block">
- <div
- style="margin-top: 20px"
- role="tab"
- aria-expanded="true"
- aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823"
- >
- <div
- role="button"
- tabindex="0"
- class="el-collapse-item__header focusing is-active"
- >
- <div class="avue-group__header avue-group">
- <i class="el-icon-camera-solid avue-group__icon"></i>
- <h1 class="avue-group__title">现场图片</h1>
- </div>
- </div>
- </div>
- <el-card class="scene-image-box">
- <el-image
- v-for="(item, index) in imgSrc"
- :key="index"
- :src="item"
- :preview-src-list="srcList"
- v-show="imgSrc.length > 0"
- ></el-image>
- <span v-show="imgSrc.length == 0">暂无现场图片</span>
- </el-card>
- </div>
- <div class="block">
- <div
- style="margin-top: 20px"
- role="tab"
- aria-expanded="true"
- aria-controls="el-collapse-content-823"
- aria-describedby="el-collapse-content-823"
- >
- <div
- role="button"
- tabindex="0"
- class="el-collapse-item__header focusing is-active"
- >
- <div class="avue-group__header avue-group">
- <i class="el-icon-video-camera-solid avue-group__icon"></i>
- <h1 class="avue-group__title">现场视频</h1>
- </div>
- </div>
- </div>
- <div>
- <el-card>
- <video
- :src="feedbackVideo"
- style="width: 100%; height: 100%; object-fit: fill"
- controls
- v-show="feedbackVideo != ''"
- ></video>
- <span v-show="feedbackVideo == ''">暂无现场视频</span>
- </el-card>
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-s-order avue-group__icon"></i>
+ <h1 class="avue-group__title">警情反馈</h1>
</div>
</div>
</div>
+
+ <el-card>
+ <el-input
+ disabled="true"
+ type="textarea"
+ v-model="security.describe"
+ autocomplete="off"
+ ></el-input>
+ </el-card>
+
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-camera-solid avue-group__icon"></i>
+ <h1 class="avue-group__title">现场图片</h1>
+ </div>
+ </div>
+ </div>
+
+ <el-card class="scene-image-box">
+ <el-image
+ v-for="(item, index) in imgSrc"
+ :key="index"
+ :src="item"
+ :preview-src-list="srcList"
+ v-show="imgSrc.length > 0"
+ ></el-image>
+ <span v-show="imgSrc.length == 0">暂无现场图片</span>
+ </el-card>
+
+ <div
+ style="margin-top: 20px"
+ role="tab"
+ aria-expanded="true"
+ aria-controls="el-collapse-content-823"
+ aria-describedby="el-collapse-content-823"
+ >
+ <div
+ role="button"
+ tabindex="0"
+ class="el-collapse-item__header focusing is-active"
+ >
+ <div class="avue-group__header avue-group">
+ <i class="el-icon-video-camera-solid avue-group__icon"></i>
+ <h1 class="avue-group__title">现场视频</h1>
+ </div>
+ </div>
+ </div>
+
+ <el-card>
+ <video
+ :src="feedbackVideo"
+ style="width: 100%; height: 100%; object-fit: fill"
+ controls
+ v-show="feedbackVideo != ''"
+ ></video>
+ <span v-show="feedbackVideo == ''">暂无现场视频</span>
+ </el-card>
<el-row :align="center" style="margin-top: 40px">
<el-col :offset="10">
@@ -871,14 +858,16 @@
jid: this.form.id,
},
}).then((resdata) => {
- if (resdata.data.data[0].List.length > 0)
- this.security = resdata.data.data[0].List[0];
- if (resdata.data.data[0].tp.length > 0) {
- this.imgSrc = resdata.data.data[0].tp;
- this.srcList = resdata.data.data[0].tp;
- }
- if (resdata.data.data[0].sp.length > 0) {
- this.feedbackVideo = resdata.data.data[0].sp[0];
+ if (resdata.data.data.length > 0) {
+ if (resdata.data.data[0].List.length > 0)
+ this.security = resdata.data.data[0].List[0];
+ if (resdata.data.data[0].tp.length > 0) {
+ this.imgSrc = resdata.data.data[0].tp;
+ this.srcList = resdata.data.data[0].tp;
+ }
+ if (resdata.data.data[0].sp.length > 0) {
+ this.feedbackVideo = resdata.data.data[0].sp[0];
+ }
}
});
},
--
Gitblit v1.9.3