修复返回按钮不显示问题

.env.development

@@ -6,18 +6,14 @@
  # @FilePath: \MuduAPP\.env.development
 ### 
 ## 开发环境变量
-# VUE_APP_HOST = "http://mdapi.junln.net/api/v1.0/"
+VUE_APP_HOST = "/api/v1.0/"
-# VUE_APP_FILE_HOST = "http://mdapi.junln.net/api/"
+VUE_APP_FILE_HOST = "https://www.jichuanglanhai.com:88/api/"
-VUE_APP_HOST = "http://221.229.220.83:8007/api/v1.0/"
-VUE_APP_FILE_HOST = "http://221.229.220.83:8007/api/"
 # 二期接口
-VUE_APP_RUOYI ='http://221.229.220.83:9028'
+VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88'
-# 图片前缀正式服务器
+# VUE_APP_RUOYI ='http://39.101.188.84:9028'
-VUE_APP_IMGURL ='http://221.229.220.83:9028'
+
-# 图片前缀本地服务器
+
-# VUE_APP_IMGURL ='http://192.168.0.123:9028'
 
-VUE_APP_INTERFACE = ""
 
 VUE_APP_VERSION = "3.2.7"
 VUE_APP_VERSION2 = "3.2.7"

.env.production

@@ -1,17 +1,13 @@
 ## 生产环境变量
-# VUE_APP_HOST = "http://mdapi.junln.net/api/v1.0/"
+VUE_APP_HOST = "https://www.jichuanglanhai.com:88/api/v1.0/"
-# VUE_APP_FILE_HOST = "http://mdapi.junln.net/api/"
+VUE_APP_FILE_HOST = "https://www.jichuanglanhai.com:88/api/"
-VUE_APP_HOST = "http://221.229.220.83:8007/api/v1.0/"
+
-VUE_APP_FILE_HOST = "http://221.229.220.83:8007/api/"
 
-# VUE_APP_INTERFACE = "https://mdz.keyush.cn:8030"
 # 二期接口
-VUE_APP_RUOYI ='http://221.229.220.83:9028'
+VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88'
+
 
-# IOS和安卓访问 
-VUE_APP_INTERFACE = "http://39.101.188.84:89"
-# 图片前缀正式服务器
-VUE_APP_IMGURL ='http://221.229.220.83:9028'
 
 VUE_APP_VERSION = "3.2.8"
 VUE_APP_VERSION2 = "3.2.8"
+

package.json

@@ -40,8 +40,8 @@
     "babel-eslint": "^10.0.1",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
-    "node-sass": "^4.9.0",
+    "node-sass": "^4.13.0",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^8.0.0",
     "vue-template-compiler": "^2.6.10"
   },
   "eslintConfig": {

src/App.vue

@@ -33,7 +33,7 @@ export default {
     var designWidth = 750 // 设计图的宽度
     var baseFontsize = 120 // cssrem插件设置的基础px
     var realFontsize = (window.screen.width / designWidth) * baseFontsize // 计算实际字号
-    console.log(realFontsize, '基准')
+    // console.log(realFontsize, '基准')
     // console.log(realFontsize)
     document.getElementsByTagName('html')[0].style.fontSize =
       realFontsize + 'px'
@@ -63,9 +63,7 @@ body {
   width: 100%;
   z-index: 2000;
 }
-::-webkit-scrollbar {
+
-  display: none; /*隐藏滚轮*/
-}
 // 输入框填充密码背景
 input:-webkit-autofill,
 textarea:-webkit-autofill,

src/api/mudu/park.js

@@ -39,6 +39,16 @@ export function listManagement(query) {
     params: query
   })
 }
+
+  //查询园区负责人列表
+  export function listEnterpriseBuildPark(query) {
+    return request({
+      url: '/mudu/enterprisebuildpark',
+      method: 'get',
+      params: query
+    })
+  }
+  
 // // 园区详情 enterprise/parkinfo/
 // export function getParkinfo(id) {
 //   return request.get('enterprise/parkinfo/' + id)

src/api/mudu/records.js

@@ -31,7 +31,7 @@ export function updateHistory(data) {
   return request({
     url: '/mudu/history',
     method: 'put',
-    data
+    data,
   })
 }
 
@@ -42,3 +42,11 @@ export function delHistory(id) {
     method: 'delete',
   })
 }
+
+export function loginMudu2(data) {
+  return request({
+    url: '/loginnocaptcha',
+    method: 'post',
+    data,
+  })
+}

src/api/request.js

@@ -18,12 +18,12 @@ import { refreshToken, isRefreshRequest } from '@/util/refresh.js'
 // 实例化axios
 const request = axios.create({
   baseURL: process.env.VUE_APP_HOST,
-  timeout: 50000,
+  timeout: 50000
 })
 
 // request--请求 拦截器
 request.interceptors.request.use(
-  (config) => {
+  config => {
     if (config.url !== 'secret/token') {
       let token = localStorage.getItem('mudu_token')
       let authToken = 'Bearer ' + token
@@ -36,7 +36,7 @@ request.interceptors.request.use(
         let params = config.data
         // debugger
         const formData = new FormData()
-        Object.keys(params).forEach((key) => {
+        Object.keys(params).forEach(key => {
           //参数为null或者'null'时候不传入后台
           if (params[key] && params[key] !== 'null')
             formData.append(key, params[key])
@@ -46,19 +46,19 @@ request.interceptors.request.use(
     }
     return config
   },
-  (error) => {
+  error => {
     Promise.reject(error)
   }
 )
 
 // response--响应 拦截器
 request.interceptors.response.use(
-  async (response) => {
+  async response => {
     // 系统返回状态判断
     if (response.data.code === 500) {
       Toast({
         message: response.data.message,
-        position: 'bottom',
+        position: 'bottom'
       })
       // router.replace('/')
       return Promise.reject(response.data)
@@ -70,7 +70,7 @@ request.interceptors.response.use(
         if (message.length === 0) message = '暂无数据'
         Toast({
           message: message,
-          position: 'bottom',
+          position: 'bottom'
         })
       }
       return Promise.reject(response.data)
@@ -80,8 +80,9 @@ request.interceptors.response.use(
       return response.data
     }
   },
-  async (error) => {
+  async error => {
     let errorData = error.response
+
     if (errorData.status === 401 && !isRefreshRequest(errorData.config)) {
       const isSucceed = await refreshToken()
       if (isSucceed) {
@@ -94,13 +95,13 @@ request.interceptors.response.use(
       } else {
         Toast({
           message: '刷新令牌失败',
-          position: 'bottom',
+          position: 'bottom'
         })
       }
     } else {
       Toast({
         message: '网络异常，请检查网络情况',
-        position: 'bottom',
+        position: 'bottom'
       })
     }
     return Promise.reject(error)

src/api/request2.js

@@ -9,10 +9,12 @@
 
 // import Vue from 'vue';
 import router from '../router'
-import CryptoJS from 'crypto-js'
+
 import axios from 'axios'
 import { Toast } from 'vant'
 
+import { refreshToken, isRefreshRequest } from '@/util/refresh2.js'
+
 // 实例化axios
 const request = axios.create({
   baseURL: process.env.VUE_APP_RUOYI,
@@ -23,7 +25,7 @@ const request = axios.create({
 request.interceptors.request.use(
   (config) => {
     if (config.url !== 'secret/token') {
-      let token = localStorage.getItem('mudu_token')
+      let token = localStorage.getItem('mudu2_token')
       let authToken = 'Bearer ' + token
       config.headers['Authorization'] = authToken
     }
@@ -51,7 +53,25 @@ request.interceptors.request.use(
 
 // response--响应 拦截器
 request.interceptors.response.use(
-  (response) => {
+  async (response) => {
+    let errorData = response
+
+    if (errorData.data.code === 401 && !isRefreshRequest(errorData.config)) {
+      const isSucceed = await refreshToken()
+      if (isSucceed) {
+        //重新请求
+        // console.log('重新刷新')
+        errorData.config.headers.Authorization =
+          'Bearer ' + localStorage.getItem('mudu2_token') //替换token
+        let result = await request.request(errorData.config) //重新请求
+        return result
+      } else {
+        Toast({
+          message: '刷新令牌失败',
+          position: 'bottom',
+        })
+      }
+    }
     // 系统返回状态判断
     if (response.data.code === 500) {
       Toast({
@@ -78,7 +98,7 @@ request.interceptors.response.use(
     }
   },
   (error) => {
-    console.log(error.response)
+    // console.log(error.response)
     if (error.response && error.response.status === 401) {
       Toast({
         message: '登录过期，请重新登录',

src/assets/css/all-style.css

@@ -1,3 +1,7 @@
+
+/* div{
+  font-family: 'PingFang-SC-Medium';
+} */
 /* 上有标题栏、下有菜单栏的内容 */
 .main-center {
   width: 100%;
@@ -218,7 +222,7 @@
 }
 .cell-map-point {
   position: absolute;
-  width: 0.3rem;
+  width: 0.28rem;
   height: 0.3rem;
   /* border-radius: 0.3rem;
   background-color: #2487ff; */
@@ -270,3 +274,52 @@
 .text-13 .land-name3 {
   font-size: 16px;
 }
+.layerItem {
+
+  font-size: 0.17rem;
+  color: #FEFFFF;
+  text-align: center;
+   text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
+  /* transform: rotate(-20deg); */
+}
+
+.map-icon-box{
+
+}
+.park-icon{
+  width: 100%;
+  position: relative;
+}
+.park-icon .icon{
+  position: absolute;
+  top: -0.5rem;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 0.4rem;
+  height: 0.48rem;
+  background: url(../image/vxEwm/map-marker.png);
+  background-size: 100% 100%;
+}
+.park-icon .icon-name{
+font-weight: 800;
+font-size: 0.24rem;
+color: #044274;
+text-align: center;
+text-shadow: -1px -1px 0 white,  
+                    1px -1px 0 white,
+                    -1px 1px 0 white,
+                    1px 1px 0 white;
+
+}
+.check-icon{
+  position: relative;
+  div{
+    position: absolute;
+    top: -0.33rem;
+    left: 0;
+    width: 0.4rem;
+    height: 0.44rem;
+     background: url(../image/vxEwm/location.png);
+  background-size: 100% 100%;
+  }
+}

src/assets/css/font.css

@@ -1,49 +1,9 @@
-/* @font-face {
+
-  font-family: 'Source Han Sans CN-Normal';
+
-  src: url('../css/font/siyuan-Normal.otf');
-} */
-/* @font-face {
-  font-family: 'Source Han Sans CN-Regular';
-  src: url('../css/font/siyuan-Regular.otf');
-} */
-/* @font-face {
-  font-family: 'Source Han Sans CN-Bold';
-  src: url('../css/font/siyuan-Bold.otf');
-} */
-/* @font-face {
-  font-family: 'Source Han Sans CN-Medium';
-  src: url('../css/font/siyuan-Medium.otf');
-} */
-@font-face {
-  font-family: 'DIN-BlackItalic';
-  src: url('../css/font/DIN-BlackItalic.otf');
-}
-@font-face {
-  font-family: 'D-DIN-Bold';
-  src: url('../css/font/D-DIN-Bold.otf');
-}
-@font-face {
-  font-family: 'Digital';
-  src: url('../css/font/DS-Digital.TTF');
-}
-@font-face {
-  font-family: 'YouSheBiaoTiHei-Bold';
-  src: url('../css/font/YouSheBiaoTiHei.ttf');
-}
-@font-face {
-  font-family: 'AlibabaPuHuiTi-Medium';
-  src: url('../css/font/siyuan-Medium.otf');
-}
-@font-face {
-  font-family: 'AlibabaPuHuiTi-Regular';
-  src: url('../css/font/siyuan-Regular.otf');
-}
-@font-face {
-  font-family: 'DIN-BlackItali';
-  src: url('../css/font/DIN-BlackItalic.otf');
-}
 @font-face {
   font-family: 'PingFang-SC-Bold';
   src: url('../css/font/DIN CONDENSED BOLD.TTF');
 }
 
+
+