Compare commits

..

No commits in common. "905cd689bedd9c247623fe3b5ffe5fd4bae06dab" and "8385634bd8902a23d01674c0c4d3caca0d8bb57b" have entirely different histories.

3 changed files with 12 additions and 27 deletions

View File

@ -37,13 +37,15 @@ axios.interceptors.response.use(
// "http://220.191.238.50:996/api/login?returnURL=" + // "http://220.191.238.50:996/api/login?returnURL=" +
// window.location.href; // window.location.href;
const cookies = document.cookie.split(";"); // const cookies = document.cookie.split(";");
for (let i = 0; i < cookies.length; i++) { // for (let i = 0; i < cookies.length; i++) {
const cookie = cookies[i]; // const cookie = cookies[i];
const eqPos = cookie.indexOf("="); // const eqPos = cookie.indexOf("=");
const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie; // const name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie;
document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;"; // document.cookie =
} // name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/;";
// }
router.replace({ router.replace({
path: "/guide", path: "/guide",
}); });

View File

@ -159,7 +159,7 @@ const login = () => {
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
// document.cookie='lytoken=6b0e380b4a8f46baae4923f83faf670d'
var token = getCookie("lytoken"); var token = getCookie("lytoken");
// var token = '6b0e380b4a8f46baae4923f83faf670d'; // var token = '6b0e380b4a8f46baae4923f83faf670d';

View File

@ -405,7 +405,7 @@ import j8 from "@/assets/images/map/j8.png";
import j9 from "@/assets/images/map/j9.png"; import j9 from "@/assets/images/map/j9.png";
import j10 from "@/assets/images/map/j10.png"; import j10 from "@/assets/images/map/j10.png";
import j11 from "@/assets/images/map/j11.png"; import j11 from "@/assets/images/map/j11.png";
import j1_map from "@/assets/images/map/j1_map.png"; import j1_map from "@/assets/images/map/j1-map.png";
import j2_map from "@/assets/images/map/j2_map.png"; import j2_map from "@/assets/images/map/j2_map.png";
import j3_map from "@/assets/images/map/j3_map.png"; import j3_map from "@/assets/images/map/j3_map.png";
import j4_map from "@/assets/images/map/j4_map.png"; import j4_map from "@/assets/images/map/j4_map.png";
@ -815,46 +815,31 @@ const yaosuTotal = ref([
id: 1, id: 1,
name: "幼儿园", name: "幼儿园",
img: j1, img: j1,
img_map: j1_map,
wz: false, wz: false,
tooltip: "zyysmc",
url: "/api/ggfwyth/ysyzt/getZyys?zyyslx=幼儿园",
}, },
{ {
id: 2, id: 2,
name: "小学", name: "小学",
img: j2, img: j2,
img_map: j2_map,
wz: false, wz: false,
tooltip: "zyysmc",
url: "/api/ggfwyth/ysyzt/getZyys?zyyslx=小学",
}, },
{ {
id: 3, id: 3,
name: "初中", name: "初中",
img: j3, img: j3,
img_map: j3_map,
wz: false, wz: false,
tooltip: "zyysmc",
url: "/api/ggfwyth/ysyzt/getZyys?zyyslx=初中",
}, },
{ {
id: 4, id: 4,
name: "高中", name: "高中",
img: j4, img: j4,
img_map: j4_map,
wz: false, wz: false,
tooltip: "zyysmc",
url: "/api/ggfwyth/ysyzt/getZyys?zyyslx=高中",
}, },
{ {
id: 5, id: 5,
name: "医院", name: "医院",
img: j5, img: j5,
img_map: j5_map,
wz: false, wz: false,
tooltip: "zyysmc",
url: "/api/ggfwyth/ysyzt/getZyys?zyyslx=医院",
}, },
{ {
id: 6, id: 6,
@ -2680,13 +2665,12 @@ const changeys = (name) => {
tooltip = item.tooltip; tooltip = item.tooltip;
} }
}); });
if (name == "摄像头" || name == "AED" || name=='幼儿园' || name=='小学'|| name=='初中' || name=='高中'|| name=='医院') { if (name == "摄像头" || name == "AED") {
getZyys(url, name, img, img_map, tooltip); getZyys(url, name, img, img_map, tooltip);
} }
if (name == "养老机构") { if (name == "养老机构") {
getZyys2(name, img, img_map, tooltip); getZyys2(name, img, img_map, tooltip);
} }
} }
}; };
//线 //线
@ -2710,7 +2694,6 @@ const getZyys = (url, name, img, img_map, tooltip) => {
item.center = JSON.parse(newStr); item.center = JSON.parse(newStr);
break; break;
default: default:
item.center = [Number(item.jd), Number(item.wd)];
break; break;
} }