From 23bdcca2b8a90286c45926fd0978b08fa304fbb4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 18:24:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
public/weather/wea_img/dayu.png | 0
src/router/views/index.js | 28 +-
public/weather/wea_img/xiaoxue.png | 0
src/page/index/top/top-menu.vue | 2
src/views/policeTracking/policeTracking.vue | 37 +++
src/components/real-popup/kongbai.vue | 13 +
public/weather/wea_img/wu.png | 0
public/xcxh5map/map.html | 118 ++++++------
public/weather/wea_img/mai.png | 0
public/weather/wea_img/leizhenyubingbao.png | 0
public/weather/wea_img/zhongyu.png | 0
public/weather/wea_img/qiangshachenbao.png | 0
src/page/crumbsL/crumbsL.vue | 71 +++++--
src/views/realTimePolice/real.vue | 8
public/weather/wea_img/daxue.png | 0
public/weather/wea_img/天气.jpg | 0
public/weather/wea_img/default.png | 0
public/weather/wea_img/qing.png | 0
public/weather/wea_img/shachenbao.png | 0
src/views/dataL/dataL.vue | 40 +---
public/weather/wea_img/zhenyu.png | 0
src/components/real-popup/main.vue | 26 ++
public/weather/wea_img/fuchen.png | 0
public/weather/wea_img/xiaoyu.png | 0
public/img/bjkeji.jpg | 0
src/views/supervisoryConsole/map.vue | 4
public/weather/wea_img/dabaoyu.png | 0
src/views/security/security.vue | 2
public/weather/wea_img/duoyun.png | 0
src/views/dataL/homeL.vue | 2
public/weather/wea_img/zhenxue.png | 0
src/views/clientManagement/clientManagement.vue | 6
public/img/bjkeji3.jpg | 0
src/page/index/logo.vue | 14 +
public/weather/wea_img/yin.png | 0
public/weather/wea_img/tedabaoyu.png | 0
src/views/policeInformationDistribution/index.vue | 2
public/weather/wea_img/leizhenyu.png | 0
public/weather/index.html | 105 +++++++++++
public/weather/wea_img/baoxue.png | 0
public/weather/wea_img/yangsha.png | 0
src/views/clientManagement/clientManagement_copy.vue | 2
public/weather/wea_img/zhongxue.png | 0
public/weather/wea_img/baoyu.png | 0
public/weather/wea_img/dongyu.png | 0
src/views/distribution/index.vue | 2
46 files changed, 320 insertions(+), 162 deletions(-)
diff --git a/public/img/bjkeji.jpg b/public/img/bjkeji.jpg
index c5f3002..721729c 100644
--- a/public/img/bjkeji.jpg
+++ b/public/img/bjkeji.jpg
Binary files differ
diff --git a/public/img/bjkeji3.jpg b/public/img/bjkeji3.jpg
new file mode 100644
index 0000000..c5f3002
--- /dev/null
+++ b/public/img/bjkeji3.jpg
Binary files differ
diff --git a/public/weather/index.html b/public/weather/index.html
new file mode 100644
index 0000000..3c9e458
--- /dev/null
+++ b/public/weather/index.html
@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <meta charset="UTF-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>天气</title>
+ <!-- axios -->
+ <script src='../map/lib/axios.js'></script>
+ <script src="https://cdn.jsdelivr.net/npm/vue@2.6.12"></script>
+ <style>
+ #weather {
+ font-weight: 400;
+ opacity: 0.7;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+right: -20px;
+ }
+
+ .time {
+ position: relative;
+ top: -6px;
+ }
+ </style>
+</head>
+
+<body>
+ <div id="weather">
+ <span class="time">
+ {{nowTime.year}}年{{nowTime.month}}月{{nowTime.day}}日 {{nowTime.hour}}:{{nowTime.minute}}:{{nowTime.second}}
+ </span>
+ <span class="weathers">
+ <!-- {{city}}：{{weathers.nowWeather}} {{weathers.highTemperature}}-{{weathers.lowTemperature}} -->
+ <iframe width="235" scrolling="no" height="30" frameborder="0" allowtransparency="true"
+ src="https://i.tianqi.com?c=code&id=34&icon=1&site=12"></iframe>
+ </span>
+ </div>
+ <script>
+ var me = new Vue({
+ el: '#weather',
+ data: {
+ begin: false,
+ weathers: {
+ nowWeather: '',
+ highTemperature: '',
+ lowTemperature: '',
+ },
+ nowTime: {
+ year: '',
+ month: '',
+ day: '',
+ hour: '',
+ minute: '',
+ second: '',
+ },
+ city: "南昌",
+ },
+ methods: {
+ getNewTime() {
+ this.nowTime.year = (new Date()).getFullYear();
+ this.nowTime.month = (new Date()).getMonth();
+ this.nowTime.day = (new Date()).getDay();
+ this.nowTime.hour = (new Date()).getHours() < 10 ? '0' + (new Date()).getHours() : (new Date()).getHours();
+ this.nowTime.minute = (new Date()).getMinutes() < 10 ? '0' + (new Date()).getMinutes() : (new Date()).getMinutes();
+ this.nowTime.second = (new Date()).getSeconds() < 10 ? '0' + (new Date()).getSeconds() : (new Date()).getSeconds();
+ },
+ // getWeather() {
+ // var that = this;
+ // // var url = `http://wthrcdn.etouch.cn/weather_mini?city=${this.city}`
+ // var url = `https://web.byisf.com/weatherGet/weather_mini?city=${this.city}`
+ // axios.get(url).then((res) => {
+ // var data = res.data.data,
+ // nowDay = data.forecast[0];
+ // that.weathers.nowWeather = nowDay.type;
+ // that.weathers.highTemperature = nowDay.high.slice(3);
+ // that.weathers.lowTemperature = nowDay.low.slice(3);
+ // that.begin = true;
+ // })
+ // },
+ // getCity() {
+ // var ctiyName = returnCitySN["cname"];
+ // console.log(ctiyName, 4343543);
+ // this.city = '南昌'
+ // this.getWeather();
+ // }
+ },
+ mounted() {
+ this.getNewTime();
+ setInterval(() => {
+ this.getNewTime();
+ }, 1000);
+ // this.begin = true;
+ // this.getWeather();
+ // this.getCity();
+ }
+ })
+ </script>
+
+</body>
+
+</html>
diff --git a/public/weather/wea_img/baoxue.png b/public/weather/wea_img/baoxue.png
new file mode 100644
index 0000000..7fd7647
--- /dev/null
+++ b/public/weather/wea_img/baoxue.png
Binary files differ
diff --git a/public/weather/wea_img/baoyu.png b/public/weather/wea_img/baoyu.png
new file mode 100644
index 0000000..3f308c6
--- /dev/null
+++ b/public/weather/wea_img/baoyu.png
Binary files differ
diff --git a/public/weather/wea_img/dabaoyu.png b/public/weather/wea_img/dabaoyu.png
new file mode 100644
index 0000000..9626522
--- /dev/null
+++ b/public/weather/wea_img/dabaoyu.png
Binary files differ
diff --git a/public/weather/wea_img/daxue.png b/public/weather/wea_img/daxue.png
new file mode 100644
index 0000000..f391d45
--- /dev/null
+++ b/public/weather/wea_img/daxue.png
Binary files differ
diff --git a/public/weather/wea_img/dayu.png b/public/weather/wea_img/dayu.png
new file mode 100644
index 0000000..761ff5f
--- /dev/null
+++ b/public/weather/wea_img/dayu.png
Binary files differ
diff --git a/public/weather/wea_img/default.png b/public/weather/wea_img/default.png
new file mode 100644
index 0000000..44fde76
--- /dev/null
+++ b/public/weather/wea_img/default.png
Binary files differ
diff --git a/public/weather/wea_img/dongyu.png b/public/weather/wea_img/dongyu.png
new file mode 100644
index 0000000..334c6f8
--- /dev/null
+++ b/public/weather/wea_img/dongyu.png
Binary files differ
diff --git a/public/weather/wea_img/duoyun.png b/public/weather/wea_img/duoyun.png
new file mode 100644
index 0000000..45d0ccf
--- /dev/null
+++ b/public/weather/wea_img/duoyun.png
Binary files differ
diff --git a/public/weather/wea_img/fuchen.png b/public/weather/wea_img/fuchen.png
new file mode 100644
index 0000000..be3f0f9
--- /dev/null
+++ b/public/weather/wea_img/fuchen.png
Binary files differ
diff --git a/public/weather/wea_img/leizhenyu.png b/public/weather/wea_img/leizhenyu.png
new file mode 100644
index 0000000..2a30100
--- /dev/null
+++ b/public/weather/wea_img/leizhenyu.png
Binary files differ
diff --git a/public/weather/wea_img/leizhenyubingbao.png b/public/weather/wea_img/leizhenyubingbao.png
new file mode 100644
index 0000000..ec72b52
--- /dev/null
+++ b/public/weather/wea_img/leizhenyubingbao.png
Binary files differ
diff --git a/public/weather/wea_img/mai.png b/public/weather/wea_img/mai.png
new file mode 100644
index 0000000..0e51215
--- /dev/null
+++ b/public/weather/wea_img/mai.png
Binary files differ
diff --git a/public/weather/wea_img/qiangshachenbao.png b/public/weather/wea_img/qiangshachenbao.png
new file mode 100644
index 0000000..f008208
--- /dev/null
+++ b/public/weather/wea_img/qiangshachenbao.png
Binary files differ
diff --git a/public/weather/wea_img/qing.png b/public/weather/wea_img/qing.png
new file mode 100644
index 0000000..68b47a4
--- /dev/null
+++ b/public/weather/wea_img/qing.png
Binary files differ
diff --git a/public/weather/wea_img/shachenbao.png b/public/weather/wea_img/shachenbao.png
new file mode 100644
index 0000000..23f0b38
--- /dev/null
+++ b/public/weather/wea_img/shachenbao.png
Binary files differ
diff --git a/public/weather/wea_img/tedabaoyu.png b/public/weather/wea_img/tedabaoyu.png
new file mode 100644
index 0000000..2ec5be5
--- /dev/null
+++ b/public/weather/wea_img/tedabaoyu.png
Binary files differ
diff --git a/public/weather/wea_img/wu.png b/public/weather/wea_img/wu.png
new file mode 100644
index 0000000..31063c7
--- /dev/null
+++ b/public/weather/wea_img/wu.png
Binary files differ
diff --git a/public/weather/wea_img/xiaoxue.png b/public/weather/wea_img/xiaoxue.png
new file mode 100644
index 0000000..5fa1769
--- /dev/null
+++ b/public/weather/wea_img/xiaoxue.png
Binary files differ
diff --git a/public/weather/wea_img/xiaoyu.png b/public/weather/wea_img/xiaoyu.png
new file mode 100644
index 0000000..d29d04b
--- /dev/null
+++ b/public/weather/wea_img/xiaoyu.png
Binary files differ
diff --git a/public/weather/wea_img/yangsha.png b/public/weather/wea_img/yangsha.png
new file mode 100644
index 0000000..c352308
--- /dev/null
+++ b/public/weather/wea_img/yangsha.png
Binary files differ
diff --git a/public/weather/wea_img/yin.png b/public/weather/wea_img/yin.png
new file mode 100644
index 0000000..0b52dcd
--- /dev/null
+++ b/public/weather/wea_img/yin.png
Binary files differ
diff --git a/public/weather/wea_img/zhenxue.png b/public/weather/wea_img/zhenxue.png
new file mode 100644
index 0000000..6d4326f
--- /dev/null
+++ b/public/weather/wea_img/zhenxue.png
Binary files differ
diff --git a/public/weather/wea_img/zhenyu.png b/public/weather/wea_img/zhenyu.png
new file mode 100644
index 0000000..02caffe
--- /dev/null
+++ b/public/weather/wea_img/zhenyu.png
Binary files differ
diff --git a/public/weather/wea_img/zhongxue.png b/public/weather/wea_img/zhongxue.png
new file mode 100644
index 0000000..28bae7b
--- /dev/null
+++ b/public/weather/wea_img/zhongxue.png
Binary files differ
diff --git a/public/weather/wea_img/zhongyu.png b/public/weather/wea_img/zhongyu.png
new file mode 100644
index 0000000..2843e57
--- /dev/null
+++ b/public/weather/wea_img/zhongyu.png
Binary files differ
diff --git "a/public/weather/wea_img/\345\244\251\346\260\224.jpg" "b/public/weather/wea_img/\345\244\251\346\260\224.jpg"
new file mode 100644
index 0000000..7682fd9
--- /dev/null
+++ "b/public/weather/wea_img/\345\244\251\346\260\224.jpg"
Binary files differ
diff --git a/public/xcxh5map/map.html b/public/xcxh5map/map.html
index d0cfbc6..671da15 100644
--- a/public/xcxh5map/map.html
+++ b/public/xcxh5map/map.html
@@ -32,66 +32,66 @@
<script type="text/javascript">
var map = null;
function beginJuheMap(map) {
- map = L.map('map', { //初始化地图
- center: [31.87, 120.54],
- zoom: 12,
- // crs: L.CRS.EPSG4326, //设置坐标系4326
- attributionControl: false, //去掉右下角
- zoomControl: false, //去掉缩放
- });
- L.tileLayer( //添加切片图层
- "http://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}", {
- subdomains: ["1", "2", "3", "4"],
- attribution: "高德"
- }
- ).addTo(map);
- var markers = L.markerClusterGroup();
-
- var transportIcon = L.Icon.extend({ //图标初始化
- options: {
- iconSize: [30, 30], // 图标尺寸
- // iconAnchor: [30, 30], // 图标偏移量
- // popupAnchor: [-20, -20] // 弹出框偏移量
- }
- });
- var carIcon = new transportIcon({ //引入图标
- iconUrl: './img/gray.png'
- }),
- planeIcon = new transportIcon({
- iconUrl: './img/green.png'
- }),
- busIcon = new transportIcon({
- iconUrl: './img/red.png'
- });
-console.log(datalist,43545343)
- for (var i = 0; i < datalist.length; i++) {
- var a = datalist[i];
- var title = a.title;
- if (a.state == 0) {
- var marker = L.marker([a.jd, a.wd], {
- icon: carIcon,
- title: title
- });
- } else if (a.state == 1) {
- var marker = L.marker([a.jd, a.wd], {
- icon: planeIcon,
- title: title
- });
- } else if (a.state == 2) {
- var marker = L.marker([a.jd, a.wd], {
- icon: busIcon,
- title: title
- });
- }
- marker.bindPopup(title);
- markers.addLayer(marker);
- }
- map.addLayer(markers);
-
- markers.on('click', function(a) {
- console.log(a.layer, 11111111111);
- });
+ map = L.map('map', { //初始化地图
+ center: [31.87, 120.54],
+ zoom: 12,
+ // crs: L.CRS.EPSG4326, //设置坐标系4326
+ attributionControl: false, //去掉右下角
+ zoomControl: false, //去掉缩放
+ });
+ L.tileLayer( //添加切片图层
+ "http://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}", {
+ subdomains: ["1", "2", "3", "4"],
+ attribution: "高德"
}
+ ).addTo(map);
+ var markers = L.markerClusterGroup();
+
+ var transportIcon = L.Icon.extend({ //图标初始化
+ options: {
+ iconSize: [30, 30], // 图标尺寸
+ // iconAnchor: [30, 30], // 图标偏移量
+ // popupAnchor: [-20, -20] // 弹出框偏移量
+ }
+ });
+ var carIcon = new transportIcon({ //引入图标
+ iconUrl: './img/gray.png'
+ }),
+ planeIcon = new transportIcon({
+ iconUrl: './img/green.png'
+ }),
+ busIcon = new transportIcon({
+ iconUrl: './img/red.png'
+ });
+ console.log(datalist, 43545343)
+ for (var i = 0; i < datalist.length; i++) {
+ var a = datalist[i];
+ var title = a.title;
+ if (a.state == 0) {
+ var marker = L.marker([a.jd, a.wd], {
+ icon: carIcon,
+ title: title
+ });
+ } else if (a.state == 1) {
+ var marker = L.marker([a.jd, a.wd], {
+ icon: planeIcon,
+ title: title
+ });
+ } else if (a.state == 2) {
+ var marker = L.marker([a.jd, a.wd], {
+ icon: busIcon,
+ title: title
+ });
+ }
+ marker.bindPopup(title);
+ markers.addLayer(marker);
+ }
+ map.addLayer(markers);
+
+ markers.on('click', function (a) {
+ console.log(a.layer, 11111111111);
+ });
+ }
beginJuheMap(map);
</script>
diff --git a/src/components/real-popup/kongbai.vue b/src/components/real-popup/kongbai.vue
new file mode 100644
index 0000000..f01df48
--- /dev/null
+++ b/src/components/real-popup/kongbai.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>过度</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/components/real-popup/main.vue b/src/components/real-popup/main.vue
index 8e43d60..cd5abef 100644
--- a/src/components/real-popup/main.vue
+++ b/src/components/real-popup/main.vue
@@ -229,7 +229,7 @@
</el-button> -->
<el-button
type="success"
- @click.stop="updateJtyep(form, 1, '办结')"
+ @click.stop="updateJtyep(form, 2, '办结')"
>办结
</el-button>
@@ -553,7 +553,6 @@
)
.then(function () {
that.dialogTableVisible = false;
-
axios({
method: "post",
url: `/api/blade-jfpts/rvideo/stop`,
@@ -561,12 +560,25 @@
jid: row.id,
},
}).then((resdata) => {});
-
// that.onLoad(that.page, that.query);
- that.$router.push({
- path: "/policeTracking/track",
- query: that.form,
- });
+ if (t == "办结") {
+ // location.reload();
+ that.$router.push({
+ path: "/real-popup/kongbai",
+ query: that.form,
+ });
+ setTimeout(() => {
+ that.$router.push({
+ path: "/realTimePolice/real",
+ });
+ }, 10);
+
+ } else {
+ that.$router.push({
+ path: "/policeTracking/track",
+ query: that.form,
+ });
+ }
});
},
getDate() {
diff --git a/src/page/crumbsL/crumbsL.vue b/src/page/crumbsL/crumbsL.vue
index f87703b..ebd68ad 100644
--- a/src/page/crumbsL/crumbsL.vue
+++ b/src/page/crumbsL/crumbsL.vue
@@ -2,19 +2,6 @@
<div class="breadEval">
<div class="breadTitle">
<div class="titles">您的位置：</div>
- <!-- <button @click="cc">cccc</button> -->
- <!-- <el-breadcrumb-item style="position: relative;top: -3px;left: 5px">您的位置：</el-breadcrumb-item> -->
- <!-- <el-breadcrumb-item v-show="!onceRouter" :to="{ path: '/wel/index' }">首页</el-breadcrumb-item> -->
- <!-- <el-breadcrumb separator="/">
- <el-breadcrumb-item
- :to="item.path"
- v-for="item of breadListLast"
- :key="item.path"
- style="border: hotpink 1px solid"
- >
- {{ item.name }}
- </el-breadcrumb-item>
- </el-breadcrumb> -->
<div
class="ourCrumbsl"
v-for="(item, index) of breadListLast"
@@ -31,14 +18,28 @@
</div>
</div>
</div>
+ <div class="weather">
+ <div class="gaizi"></div>
+ <iframe
+ class="weatherif"
+ width="480"
+ height="30"
+ :src="urlData"
+ scrolling="no"
+ ></iframe>
+ </div>
+
<!-- <router-view></router-view> -->
</div>
</template>
<script>
+import axios from "axios";
+
export default {
//面包屑解决方案，此方法只适用于面包屑与路由显示顺序一致，例如path：01/02/03 面包屑也是01/02/03
data() {
return {
+ urlData: "",
//手动配置项：breadListIm为路由与面包屑名称对应关系,breadLoadName为面包屑组件路由
upName: {
监控台: "welcomeData",
@@ -78,13 +79,18 @@
showDataL: 10,
};
},
+ created() {
+ this.urlData = "/weather/index.html";
+ },
methods: {
loadChange(states) {
//导航栏进就是一级路由，其他页面push
if (this.isrf) {
//刷新读取localStorage
this.breadListLast = JSON.parse(localStorage.getItem("crumbsl"));
- this.$store.commit("SET_SHOWDATAL", localStorage.getItem("crumbslname"));
+ var b = localStorage.getItem("crumbslname") == "false" ? false : true;
+ console.log(b, typeof b, Boolean(b), 65343);
+ this.$store.commit("SET_SHOWDATAL", b);
} else {
//关闭重写
var path = this.$route.path,
@@ -349,31 +355,46 @@
<style lang="scss" scoped>
.breadEval {
color: rgba($color: #000000, $alpha: 0.7);
- position: relative;
- top: -10px;
- font-size: 14px;
height: 100%;
- background: #f3f7fd;
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
.breadTitle {
- padding: 20px 30px;
- padding-left: 80px;
+ // padding: 20px 30px;
+ padding-left: 20px;
background: #fff;
+ display: flex;
+ justify-content: space-between;
.titles {
- position: absolute;
- top: 17.15px;
- left: 5px;
+ // position: absolute;
+ // top: 17.15px;
+ // left: 5px;
font-weight: 400;
}
.ourCrumbsl {
// border: hotpink 1px solid;
float: left;
font-weight: 400;
- position: relative;
- top: -3px;
+ // position: relative;
+ // top: 11.15px;
a {
font-weight: 400;
}
}
}
+ .weather {
+ right: 10px;
+ .weatherif {
+ border: transparent;
+ }
+ }
+}
+.gaizi {
+ width: 500px;
+ height: 30px;
+ background: transparent;
+ position: absolute;
+ right: 0;
}
</style>
\ No newline at end of file
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index a4d3190..dc91434 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -194,7 +194,7 @@
<el-form-item>
<el-button
type="success"
- @click.stop="updateJtyep(form, 1, '办结')"
+ @click.stop="updateJtyep(form, 2, '办结')"
>办结
</el-button>
@@ -538,10 +538,14 @@
},
}).then((resdata) => {});
- that.$router.push({
- path: "/policeTracking/track",
- query: that.form,
- });
+ if (t == "办结") {
+ location.reload();
+ } else {
+ that.$router.push({
+ path: "/policeTracking/track",
+ query: that.form,
+ });
+ }
});
},
beginTimeOrEndTime(time) {
diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue
index 373413e..30cd4a6 100644
--- a/src/page/index/top/top-menu.vue
+++ b/src/page/index/top/top-menu.vue
@@ -84,7 +84,7 @@
homeItem: {
name: "首页",
source: "el-icon-s-home",
- path: "/dataL/homeL",
+ path: "/wel/index",
},
dataItem: {
name: "数据模式",
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 0df1c25..4ce4845 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -416,20 +416,20 @@
import( /* webpackChunkName: "views" */ '@/views/report/announcementReport')
}]
},
-// {
-// path: '/dataL',
-// redirect: '/dataL/homeL',
-// component: Layout,
-// children: [{
-// path: 'homeL',
-// name: '首页',
-// meta: {
-// i18n: 'report'
-// },
-// component: () =>
-// import( /* webpackChunkName: "views" */ '@/views/dataL/homeL')
-// }]
-// },
+{
+ path: '/real-popup',
+ redirect: '/real-popup/kongbai',
+ component: Layout,
+ children: [{
+ path: 'kongbai',
+ name: '首页',
+ meta: {
+ i18n: 'report'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/components/real-popup/kongbai')
+ }]
+},
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 7b0cb30..4562030 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -77,7 +77,7 @@
<i class="yj" v-if="row.dxzt == '2' "></i>
<i class="gz" v-if="row.dxzt == '3' "></i>
</el-tag>
-
+
</template>
<template slot-scope="{ row }" slot="type">
@@ -1029,7 +1029,7 @@
if(data.records[i].dtype=="" || data.records[i].dtype==0){
data.records[i].dxzt = 1;
}
-
+
}
}
@@ -1125,7 +1125,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ window.frames[1].init("equipment", {x: row.jd, y: row.wd});
};
})
},rightClick(row, event) {
diff --git a/src/views/clientManagement/clientManagement_copy.vue b/src/views/clientManagement/clientManagement_copy.vue
index 808f5e7..98af045 100644
--- a/src/views/clientManagement/clientManagement_copy.vue
+++ b/src/views/clientManagement/clientManagement_copy.vue
@@ -722,7 +722,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("equipment", {x: row.jd, y: row.wd});
+ window.frames[1].init("equipment", {x: row.jd, y: row.wd});
};
})
},
diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index bfba118..0917c68 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -1005,15 +1005,9 @@
});
});
},
- stetDetails(d, imgdata) {
+ stetDetails(c, imgdata) {
this.name = "无数据" && this.a.deviceName;
//设备状态
- // [grey,green,red][
- // onlineStatus = 0,
- // onlineStatus = 1,
- // state!= "",
- // jtype != 2
- // ]
var states,
d = this.a.dtype;
if (d == 0) {
@@ -1025,25 +1019,6 @@
} else if (d == 2) {
states = "预警";
}
-
- // if (s != "") {
- // states = "故障";
- // } else {
- // if (j != 1) {
- // if (o == 1) {
- // states = "正常";
- // } else {
- // states = "掉线";
- // }
- // } else {
- // states = "预警";
- // }
- // }
- // console.log(o, 1000);
- // console.log(s, 1000);
- // console.log(j, 1000);
-
- // console.log(states, 1000);
this.state = states;
this.evaluate = "空气质量";
@@ -1074,7 +1049,7 @@
installation: this.a.stime, // 安装时间
heartbeat: this.a.heartbeat, // 心跳时间
};
- this.form = d;
+ this.form = c;
},
getdataG() {
var dataG = {
@@ -1186,7 +1161,7 @@
this.startEcharts01();
},
getMap() {
- window.frames[0].init("DetailMap", {
+ window.frames[1].init("DetailMap", {
x: this.a.jd,
y: this.a.wd,
});
@@ -1297,15 +1272,15 @@
// this.doEvents();
// var timel = setTimeout(() => {
this.$refs.detailMap.onload = () => {
- // window.frames[0].init("DetailMap", {
+ // window.frames[1].init("DetailMap", {
// x: this.a.jd,
// y: this.a.wd,
// });
- if (window.frames[0].init) {
+ if (window.frames[1].init) {
this.getMap();
} else {
// this.re();
- console.log(`没有找到到window.frames[0].init`);
+ console.log(`没有找到到window.frames[1].init`);
}
};
},
@@ -1327,6 +1302,9 @@
};
</script>
<style lang="scss" >
+video::-webkit-media-controls-timeline {
+ display: none;
+ }
#Lour {
width: 100%;
font-size: 14px;
diff --git a/src/views/dataL/homeL.vue b/src/views/dataL/homeL.vue
index 02cec46..614b7df 100644
--- a/src/views/dataL/homeL.vue
+++ b/src/views/dataL/homeL.vue
@@ -39,7 +39,7 @@
this.$router.push({ path: "/healthcode/healthcode" });
},
down3() {
- this.$router.push({ path: "/parcel/parcel" });
+ this.$router.push({ path: "/parcel/parcelKind" });
},
down4() {
this.$router.push({ path: "/animalHeat/animalHeat" });
diff --git a/src/views/distribution/index.vue b/src/views/distribution/index.vue
index d5355b9..12b505e 100644
--- a/src/views/distribution/index.vue
+++ b/src/views/distribution/index.vue
@@ -243,7 +243,7 @@
mounted() {
this.$refs.DistributionMapDiv.onload = () => {
- window.frames[0].init("AlertSecurity", {
+ window.frames[1].init("AlertSecurity", {
x: this.form.jd,
y: this.form.wd,
});
diff --git a/src/views/policeInformationDistribution/index.vue b/src/views/policeInformationDistribution/index.vue
index aa81d43..8675cc7 100644
--- a/src/views/policeInformationDistribution/index.vue
+++ b/src/views/policeInformationDistribution/index.vue
@@ -538,7 +538,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("ClientManagement", {x: row.jd, y: row.wd});
+ window.frames[1].init("ClientManagement", {x: row.jd, y: row.wd});
};
});
},
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 434c630..619bfae 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -585,6 +585,16 @@
},
created() {
this.form = this.$route.query;
+ if (
+ !(
+ this.form.securityArr &&
+ this.form.securityArr != null &&
+ this.form.securityArr != undefined &&
+ this.form.securityArr.length > 0
+ )
+ ) {
+ this.form.securityArr = [];
+ }
this.updatedPageData();
this.vaddress = this.form.vaddress;
this.getReceivingAlarm();
@@ -594,7 +604,7 @@
this.getAudios();
this.getImgAndVideo();
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("AlertSecurity", {
+ window.frames[1].init("AlertSecurity", {
x: this.form.jd,
y: this.form.wd,
});
@@ -730,7 +740,7 @@
bz: this.form.bz,
snumber: this.form.alarmId,
sname: this.form.alarmPeople,
- deviceNumber:this.form.deviceNumber,
+ deviceNumber: this.form.deviceNumber,
zc: zc,
zctime: this.getDate().current,
};
@@ -762,7 +772,7 @@
getList() {
var that = this;
- var deptid = that.form.deptId.slice(0,19);//报错deptId格式不对liu.2021.5.7
+ var deptid = that.form.deptId.slice(0, 19); //报错deptId格式不对liu.2021.5.7
axios
.get(
`/api/blade-user/pages?current=1&size=9999&work_status=&deptId=${deptid}`
@@ -770,8 +780,13 @@
.then(function (res) {
that.tableData = [];
var i = 0;
-
- if (that.form.securityArr.length > 0) {
+ console.log(that.form, 89);
+ if (
+ that.form.securityArr &&
+ that.form.securityArr != null &&
+ that.form.securityArr != undefined &&
+ that.form.securityArr.length > 0
+ ) {
res.data.data.records.forEach((item) => {
if (item.id == that.form.securityId) {
that.tableData.push({
@@ -937,7 +952,17 @@
},
}).then(function (res) {
that.form = res.data.data.records[0];
- that.getList();//报错deptId格式不对liu.2021.5.7
+ if (
+ !(
+ that.form.securityArr &&
+ that.form.securityArr != null &&
+ that.form.securityArr != undefined &&
+ that.form.securityArr.length > 0
+ )
+ ) {
+ that.form.securityArr = [];
+ }
+ that.getList(); //报错deptId格式不对liu.2021.5.7
});
},
},
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 74dedae..1be720c 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -149,7 +149,7 @@
</el-drawer>
</basic-container>
</template>
-
+
<script>
import { getList, remove, update, add, getclient } from "@/api/real/real";
import { mapGetters } from "vuex";
@@ -800,7 +800,7 @@
this.showMap = true;
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
- window.frames[0].init("ClientManagement", { x: row.jd, y: row.wd });
+ window.frames[1].init("ClientManagement", { x: row.jd, y: row.wd });
};
});
},
@@ -929,7 +929,7 @@
},
};
</script>
-
+
<style>
.el-card__body .waringTypeClass {
width: 12%;
@@ -1045,4 +1045,4 @@
.tabFontSize {
font-size: 15px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 0caf6c7..503ef84 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -256,7 +256,7 @@
}else{
that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
}
-
+
this.$nextTick(() => {
this.$refs.securityMap.onload = () => {
if (window.frames[0].init) {
diff --git a/src/views/supervisoryConsole/map.vue b/src/views/supervisoryConsole/map.vue
index 0063206..a1bf3ab 100644
--- a/src/views/supervisoryConsole/map.vue
+++ b/src/views/supervisoryConsole/map.vue
@@ -23,7 +23,7 @@
},
mounted() {
// this.$refs.supervisoryMap.onload = () => {
- // window.frames[0].init("AlertSecurity", {
+ // window.frames[1].init("AlertSecurity", {
// x: this.form.jd,
// y: this.form.wd,
// });
@@ -33,4 +33,4 @@
</script>
<style>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3