| public/map/popup/html/FlareClusterLayer_v3 copy.html | ●●●●● patch | view | raw | blame | history | |
| public/map/widgets/supervisoryMap/FlareClusterLayer_v3.js | ●●●●● patch | view | raw | blame | history | |
| src/page/crumbsL/crumbsL.vue | ●●●●● patch | view | raw | blame | history | |
| src/page/index/top/index.vue | ●●●●● patch | view | raw | blame | history | |
| src/store/modules/user.js | ●●●●● patch | view | raw | blame | history | |
| src/views/clientManagement/clientManagement.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/dataL/dataL.vue | ●●●●● patch | view | raw | blame | history |
public/map/popup/html/FlareClusterLayer_v3 copy.html
@@ -251,7 +251,7 @@ }, methods: { looks() { window.parent.parent.location.hash = `#/dataL/dataL?id=${this.ourData.id}&deviceName=${this.ourData.deviceName}&deviceNumber=${this.ourData.deviceNumber}&deviceType=${this.ourData.deviceType}&ownership=${this.ourData.ownership}&ownerId=&devicestate=${this.ourData.devicestate}&stime=${this.ourData.stime}&parentId=${this.ourData.parentId}&jd=${this.ourData.jd}&wd=${this.ourData.wd}&street=${this.ourData.street}&dtype=${this.ourData.dtype}&serialNumber=${this.ourData.serialNumber}&stype=&channelNumber=${this.ourData.channelNumber}&pay=&expireTime=${this.ourData.expireTime}&heartbeat=${this.ourData.heartbeat}&province=${this.ourData.province}&city=${this.ourData.city}&district=${this.ourData.district}&state=&reason=&deptId=${this.ourData.deptId}&onePhone=${this.ourData.onePhone}&twoPhone=${this.ourData.twoPhone}&oneId=${this.ourData.oneId}&twoId=&threeId=&oneContacts=${this.ourData.oneContacts}&twoContacts=${this.ourData.twoContacts}&type=${this.ourData.type}&beginTime=&endTime=&pid=${this.ourData.pid}&onlineStatus=${this.ourData.onlineStatus}&jtype=${this.ourData.jtype}&threePhone=${this.ourData.threePhone}&threeContacts=${this.ourData.threeContacts}`; window.parent.parent.location.hash = `#/dataL/dataL?id=${this.ourData.id}&deviceName=${this.ourData.deviceName}&deviceNumber=${this.ourData.deviceNumber}&deviceType=${this.ourData.deviceType}&ownership=${this.ourData.ownership}&ownerId=&devicestate=${this.ourData.devicestate}&stime=${this.ourData.stime}&parentId=${this.ourData.parentId}&jd=${this.ourData.jd}&wd=${this.ourData.wd}&street=${this.ourData.street}&dtype=${this.ourData.dtype}&serialNumber=${this.ourData.serialNumber}&stype=&channelNumber=${this.ourData.channelNumber}&pay=&expireTime=${this.ourData.expireTime}&heartbeat=${this.ourData.heartbeat}&province=${this.ourData.province}&city=${this.ourData.city}&district=${this.ourData.district}&state=${this.ourData.state}&reason=&deptId=${this.ourData.deptId}&onePhone=${this.ourData.onePhone}&twoPhone=${this.ourData.twoPhone}&oneId=${this.ourData.oneId}&twoId=&threeId=&oneContacts=${this.ourData.oneContacts}&twoContacts=${this.ourData.twoContacts}&type=${this.ourData.type}&beginTime=&endTime=&pid=${this.ourData.pid}&onlineStatus=${this.ourData.onlineStatus}&jtype=${this.ourData.jtype}&threePhone=${this.ourData.threePhone}&threeContacts=${this.ourData.threeContacts}`; }, getdatas(dat) {
@@ -786,7 +786,7 @@ _clusterData: function () { //此函数当前仅适用于不使用预聚集数据的情况 //this function currently only applies if not using preclustered data console.log('改变111111111111111') // console.log('改变111111111111111') if (this.preClustered) { return; } src/page/crumbsL/crumbsL.vue
@@ -4,16 +4,29 @@ <div class="titles">您的位置：</div> <!-- <button @click="cc">cccc</button> --> <!-- <el-breadcrumb-item style="position: relative;top: -3px;left: 5px">您的位置：</el-breadcrumb-item> --> <el-breadcrumb separator="/"> <!-- <el-breadcrumb-item v-show="!onceRouter" :to="{ path: '/wel/index' }">首页</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> </el-breadcrumb> --> <div class="ourCrumbsl" v-for="(item, index) of breadListLast" :key="item.path" > <div class="aaa" v-show="breadListLast.length != index + 1"> <a href="javascript:;" @click="$router.push({ path: item.path})">{{ item.name }}</a> /  </div> <div class="bbb" v-show="breadListLast.length == index + 1"> <div>{{ item.name }}</div> </div> </div> </div> <!-- <router-view></router-view> --> </div> @@ -64,9 +77,11 @@ methods: { loadChange(states) { //导航栏进就是一级路由，其他页面push if (this.isrf) {//刷新读取localStorage if (this.isrf) { //刷新读取localStorage this.breadListLast = JSON.parse(localStorage.getItem("crumbsl")); } else {//关闭重写 } else { //关闭重写 var path = this.$route.path, p = path.split("/").pop(), n = this.$route.name, @@ -92,8 +107,8 @@ //判断是否有重复项，有则删除其后路由↓ var ourP = this.breadListLast; for (var os in ourP) { if(n == '首页'){ n = '数据模式' if (n == "首页") { n = "数据模式"; } if (ourP[os].name == n && os != ourP.length - 1) { this.breadListLast.splice( @@ -104,11 +119,11 @@ } } // console.log(p, n, "写入多级面包屑"); } this.sOld = s; // window.localStorage.crumbsl = this.breadListLast; localStorage.setItem("crumbsl", JSON.stringify(this.breadListLast)); } }, loadChange2(states) { @@ -285,8 +300,15 @@ console.log("首次被加载"); window.name = "isReload"; // 在首次进入页面时我们可以给window.name设置一个固定值 } else if (window.name == "isReload") { this.isrf = true; console.log("页面被刷新"); var abb = localStorage.getItem("crumbsl"); if (abb) { this.isrf = true; console.log("页面被刷新"); } else { this.isrf = false; console.log("页面被刷新,但后台没有数据"); } } this.loadChange("moun"); }, @@ -305,8 +327,19 @@ background: #fff; .titles { position: absolute; top: 17px; top: 17.15px; left: 5px; font-weight: 400; } .ourCrumbsl { // border: hotpink 1px solid; float: left; font-weight: 400; position: relative; top: -3px; a{ font-weight: 400; } } } } src/page/index/top/index.vue
@@ -97,6 +97,7 @@ ></i> </div> </el-tooltip> <!-- 顶部导航用户图片位置 --> <img class="top-bar__img" :src="userInfo.avatar" /> <el-dropdown> <span class="el-dropdown-link"> src/store/modules/user.js
@@ -103,11 +103,12 @@ }) }, //获取用户信息 GetUserInfo({commit}) { GetUserInfo({commit}) {//获取用户信息liu++ return new Promise((resolve, reject) => { getUserInfo().then((res) => { const data = res.data.data; commit('SET_ROLES', data.roles); console.log(data); resolve(data); }).catch(err => { reject(err); src/views/clientManagement/clientManagement.vue
@@ -570,7 +570,7 @@ "form.map": { // form是表单或者表格绑定的数据集，v-model='form' handler(val) { debugger if (val) { this.form.wd = val.latitude; this.form.jd = val.longitude; src/views/dataL/dataL.vue
@@ -482,7 +482,7 @@ <div class="r-one"> <div class="r-heard"> <div class="r-heard-top">部署信息</div> <button @click="modifyl" class="r-but-top">修改</button> <!-- <button @click="modifyl" class="r-but-top">修改</button> --> </div> <div class="r-body"> <div class="r-b-top"> @@ -1023,11 +1023,11 @@ states = "预警"; } } console.log(o, 1000); console.log(s, 1000); console.log(j, 1000); // console.log(o, 1000); // console.log(s, 1000); // console.log(j, 1000); console.log(states, 1000); // console.log(states, 1000); this.state = states; this.evaluate = "空气质量";
