Skip to content

L
lbs-gpsbd-web
Commit 400b3e6d authored by yangkaiyi's avatar yangkaiyi
Browse files
Options

feat: 存档

parent 889ff121
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 112 deletions
package.json
View file @ 400b3e6d
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"less": "^3.0.4", "less": "^3.0.4",
"less-loader": "^5.0.0", "less-loader": "^5.0.0",
"mitt": "^2.1.0",
"moment": "^2.29.1", "moment": "^2.29.1",
"normalize.css": "7.0.0", "normalize.css": "7.0.0",
"nprogress": "0.2.0", "nprogress": "0.2.0",
......
src/main.js
View file @ 400b3e6d
...@@ -5,6 +5,7 @@ import App from "./App"; ...@@ -5,6 +5,7 @@ import App from "./App";
import router from "./router"; import router from "./router";
import store from "./vuex/store"; import store from "./vuex/store";
import i18n from "./i18n/i18n"; import i18n from "./i18n/i18n";
import mitt from "mitt";
import "normalize.css/normalize.css"; // A modern alternative to CSS resets import "normalize.css/normalize.css"; // A modern alternative to CSS resets
import "element-ui/lib/theme-chalk/index.css"; import "element-ui/lib/theme-chalk/index.css";
...@@ -22,7 +23,30 @@ import dataV from "@jiaminghi/data-view"; ...@@ -22,7 +23,30 @@ import dataV from "@jiaminghi/data-view";
import "@/icons"; // icon import "@/icons"; // icon
import "@/permission"; // permission control import "@/permission"; // permission control
let count = 0;
let timer = () =>
setTimeout(() => {
let dom = document.querySelector("#audio");
let notice = document.querySelector(".el-notification");
if (notice && dom) {
dom.play();
// console.log(7777, count);
count += 1;
count < 10 && timer();
}
}, 60 * 1000);
window.Vue = Vue; window.Vue = Vue;
window.$bus = mitt();
window.$bus.on("playAudio", () => {
let dom = document.querySelector("#audio");
dom.play();
if (count !== 0) {
count = 0;
} else {
timer();
}
});
require("https://oss.lbssoft.com/lbsmap/lbsmap-0.6.4.min.js"); require("https://oss.lbssoft.com/lbsmap/lbsmap-0.6.4.min.js");
//require('./utils/lbsmap-0.6.4.min.js') //require('./utils/lbsmap-0.6.4.min.js')
require("https://oss.lbssoft.com/lbs3dmap/lbs3dmap-0.0.7.min.js"); require("https://oss.lbssoft.com/lbs3dmap/lbs3dmap-0.0.7.min.js");
......
src/styles/common.scss
View file @ 400b3e6d
...@@ -105,4 +105,16 @@ body { ...@@ -105,4 +105,16 @@ body {
bottom: 0; bottom: 0;
right: 20px; right: 20px;
} }
.el-notification__title {
font-size: 18px !important;
}
.el-notification__content {
font-size: 16px !important;
padding: 20px 0;
}
.el-notification {
top: 50% !important;
left: 50% !important;
transform: translate(-50%, -50%) !important;
}
} }
src/utils/util.js
View file @ 400b3e6d
...@@ -15,54 +15,54 @@ export default { ...@@ -15,54 +15,54 @@ export default {
Math.round((attributes.battery / 100) * 6) + Math.round((attributes.battery / 100) * 6) +
'" class="battery"></div> ' '" class="battery"></div> '
: ""); : "");
footer = // footer =
footer + // footer +
(attributes.voltage // (attributes.voltage
? '<span title=\'电压\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-chatou"></use></svg></span>' + // ? '<span title=\'电压\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-chatou"></use></svg></span>' +
attributes.voltage + // attributes.voltage +
"v" // "v"
: ""); // : "");
footer = // footer =
footer + // footer +
(attributes.ignition == undefined // (attributes.ignition == undefined
? "" // ? ""
: "" + // : "" +
(attributes.ignition // (attributes.ignition
? "<span title='ACC:" + // ? "<span title='ACC:" +
attributes.ignition + // attributes.ignition +
'\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-fadongji"></use></svg></span>' // '\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-fadongji"></use></svg></span>'
: "<span title='ACC:" + // : "<span title='ACC:" +
attributes.ignition + // attributes.ignition +
'\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-fadongji"></use></svg></span>')); // '\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-fadongji"></use></svg></span>'));
footer = // footer =
footer + // footer +
(attributes.defense == undefined // (attributes.defense == undefined
? "" // ? ""
: "" + // : "" +
(attributes.defense // (attributes.defense
? '<span title=\'设防\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-lockclose"></use></svg></span>' // ? '<span title=\'设防\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-lockclose"></use></svg></span>'
: '<span title=\'撤防\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-lockopen"></use></svg></span>')); // : '<span title=\'撤防\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-lockopen"></use></svg></span>'));
footer = // footer =
footer + // footer +
(!attributes.temp // (!attributes.temp
? "" // ? ""
: '<span title=\'温度\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-temp"></use></svg>' + // : '<span title=\'温度\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-temp"></use></svg>' +
attributes.temp + // attributes.temp +
"℃</span>"); // "℃</span>");
footer = // footer =
footer + // footer +
(!attributes.turn // (!attributes.turn
? "" // ? ""
: '<span title=\'正反转\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-jiaobanche"></use></svg>' + // : '<span title=\'正反转\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-jiaobanche"></use></svg>' +
attributes.turn + // attributes.turn +
"</span>"); // "</span>");
footer = // footer =
footer + // footer +
(!attributes.fuelPercentage // (!attributes.fuelPercentage
? "" // ? ""
: '<span title=\'油量\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-fuel"></use></svg>' + // : '<span title=\'油量\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-fuel"></use></svg>' +
attributes.fuelPercentage + // attributes.fuelPercentage +
"%</span>"); // "%</span>");
if (footer != "") { if (footer != "") {
footer = footer =
"<hr style='height:1px;border:none;border-top:1px dashed #0066CC;'>" + "<hr style='height:1px;border:none;border-top:1px dashed #0066CC;'>" +
...@@ -72,57 +72,57 @@ export default { ...@@ -72,57 +72,57 @@ export default {
}, },
popupTopRight: function (position) { popupTopRight: function (position) {
var html = ""; var html = "";
var attributes = JSON.parse(position.attributes); // var attributes = JSON.parse(position.attributes);
if (attributes.rssi) { // if (attributes.rssi) {
html = // html =
'<svg title=\'GSM信号\' class="icon" aria-hidden="true"><use xlink:href="#icon-gongyong-xinhao' + // '<svg title=\'GSM信号\' class="icon" aria-hidden="true"><use xlink:href="#icon-gongyong-xinhao' +
attributes.rssi + // attributes.rssi +
'"></use></svg>'; // '"></use></svg>';
} // }
html = // html =
html + // html +
(position.mode == 0 // (position.mode == 0
? '<span title=\'GPS定位\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-gps"></use></svg><span>' + // ? '<span title=\'GPS定位\'><svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-gps"></use></svg><span>' +
(!attributes.sat // (!attributes.sat
? "" // ? ""
: ' <span style="font-size : 0.3em;">' + attributes.sat + "</span>") // : ' <span style="font-size : 0.3em;">' + attributes.sat + "</span>")
: position.mode == 1 // : position.mode == 1
? '<svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-jizhan"></use></svg>' + // ? '<svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-jizhan"></use></svg>' +
(!position.accuracy // (!position.accuracy
? "" // ? ""
: '<span style="font-size : 0.3em;">' + // : '<span style="font-size : 0.3em;">' +
position.accuracy + // position.accuracy +
"m</span>") // "m</span>")
: '<svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-wifi"></use></svg>' + // : '<svg aria-hidden="true" class="bubble-icon"><use xlink:href="#icon-wifi"></use></svg>' +
(!position.accuracy // (!position.accuracy
? "" // ? ""
: '<span style="font-size : 0.3em;">' + // : '<span style="font-size : 0.3em;">' +
position.accuracy + // position.accuracy +
"m</span>")); // "m</span>"));
return html; return html;
}, },
popupContent: function (device) { popupContent: function (device) {
var attributes = JSON.parse(device.position.attributes); var attributes = JSON.parse(device.position.attributes);
return [ return [
messages[store.state.common.system.lang].map.popupStatus + // messages[store.state.common.system.lang].map.popupStatus +
":" + // ":" +
(device.motion == 1 // (device.motion == 1
? parseInt(device.position.speed) + // ? parseInt(device.position.speed) +
"km/h (" + // "km/h (" +
this.formartCourse(device.position.course) + // this.formartCourse(device.position.course) +
")" // ")"
: messages[store.state.common.system.lang].map.popupStop + // : messages[store.state.common.system.lang].map.popupStop +
"(" + // "(" +
this.beforeTime(device.position.time) + // this.beforeTime(device.position.time) +
")") + // ")") +
(attributes.alarm // (attributes.alarm
? "[" + // ? "[" +
messages[store.state.common.system.lang].map.deviceAlarm[ // messages[store.state.common.system.lang].map.deviceAlarm[
attributes.alarm // attributes.alarm
] + // ] +
"]" // "]"
: ""), // : ""),
// messages[store.state.common.system.lang].map.popupMileage + // messages[store.state.common.system.lang].map.popupMileage +
// ":" + // ":" +
// (attributes.todaytrip ? attributes.todaytrip : 0) + // (attributes.todaytrip ? attributes.todaytrip : 0) +
......
src/utils/websocket.js
View file @ 400b3e6d
...@@ -2,6 +2,23 @@ import { Message, Notification } from "element-ui"; ...@@ -2,6 +2,23 @@ import { Message, Notification } from "element-ui";
import util from "./util"; import util from "./util";
let token = ""; let token = "";
// setTimeout(() => {
// console.log(99999);
// window.$bus.emit("playAudio");
// }, 5000);
// setTimeout(() => {
// console.log(88888);
// window.$bus.emit("playAudio");
// }, 15000);
// Notification({
// title: `标题标题标题标题标题`,
// message: "内容内容内容内容内容",
// duration: 0,
// type: "warning",
// });
if (localStorage.user) { if (localStorage.user) {
// token = JSON.parse(localStorage.user).token; // token = JSON.parse(localStorage.user).token;
...@@ -61,6 +78,7 @@ const ws = { ...@@ -61,6 +78,7 @@ const ws = {
removing: "拆除报警", removing: "拆除报警",
fault: "fault", fault: "fault",
}; };
window.$bus.emit("playAudio");
Notification({ Notification({
title: `${name} ${txt[type]}`, title: `${name} ${txt[type]}`,
message: util.dateFormat( message: util.dateFormat(
......
src/vuex/mutations.js
View file @ 400b3e6d
...@@ -120,19 +120,19 @@ export default { ...@@ -120,19 +120,19 @@ export default {
); );
} }
if (state.user.userConfig.events[devstatus.status]) { if (state.user.userConfig.events[devstatus.status]) {
// TODO:需不需要提示？devstatus.status是配置什么 // Notification({
Notification({ // title:
title: // state.user.devices.list[index].name +
state.user.devices.list[index].name + // " " +
" " + // messages[state.common.system.lang].map[
messages[state.common.system.lang].map[ // state.user.status[devstatus.status]
state.user.status[devstatus.status] // ],
], // message: util.dateFormat(devstatus.time, "YYYY-MM-DD HH:mm:ss"),
message: util.dateFormat(devstatus.time, "YYYY-MM-DD HH:mm:ss"), // type: devstatus.status == 1 ? "success" : "warning",
type: devstatus.status == 1 ? "success" : "warning", // duration: 0,
duration: 0, // });
}); // window.$bus.emit("playAudio");
state.user.playAlarmSound = true; // state.user.playAlarmSound = true;
} }
}, },
[types.USER_RESPONSE_DEVICE_COMMAND](state, commands) { [types.USER_RESPONSE_DEVICE_COMMAND](state, commands) {
......
yarn.lock
View file @ 400b3e6d
...@@ -4983,6 +4983,11 @@ mitt@1.1.2: ...@@ -4983,6 +4983,11 @@ mitt@1.1.2:
resolved "https://registry.npm.taobao.org/mitt/download/mitt-1.1.2.tgz#380e61480d6a615b660f07abb60d51e0a4e4bed6" resolved "https://registry.npm.taobao.org/mitt/download/mitt-1.1.2.tgz#380e61480d6a615b660f07abb60d51e0a4e4bed6"
integrity sha1-OA5hSA1qYVtmDwertg1R4KTkvtY= integrity sha1-OA5hSA1qYVtmDwertg1R4KTkvtY=
mitt@^2.1.0:
version "2.1.0"
resolved "https://registry.npm.taobao.org/mitt/download/mitt-2.1.0.tgz?cache=0&sync_timestamp=1594823826025&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmitt%2Fdownload%2Fmitt-2.1.0.tgz#f740577c23176c6205b121b2973514eade1b2230"
integrity sha1-90BXfCMXbGIFsSGylzUU6t4bIjA=
mixin-deep@^1.2.0: mixin-deep@^1.2.0:
version "1.3.2" version "1.3.2"
resolved "https://registry.nlark.com/mixin-deep/download/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" resolved "https://registry.nlark.com/mixin-deep/download/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
...@@ -5006,12 +5011,7 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkd ...@@ -5006,12 +5011,7 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkd
dependencies: dependencies:
minimist "^1.2.5" minimist "^1.2.5"
moment@^2.11.1: moment@^2.11.1, moment@^2.29.1:
version "2.29.1"
resolved "https://registry.nlark.com/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=
moment@^2.29.1:
version "2.29.1" version "2.29.1"
resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M= integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment