企业端修复完成

src/assets/css/font.css

@@ -46,4 +46,12 @@
   font-family: 'PingFang-SC-Bold';
   src: url('../css/font/DIN CONDENSED BOLD.TTF');
 }
+@font-face {
+  font-family: 'PingFang-SC-Medium';
+  src: url('../css/font/PingFang Medium.ttf');
+}
+@font-face {
+  font-family: 'PingFang-SC-Regular';
+  src: url('../css/font/PingFang Regular.ttf');
+}
 

src/assets/newmap/index.js

@@ -1,11 +1,13 @@
 export default [
   {
+    id: '1',
     parkOrgId: '948e4da9-ef4a-11eb-9790-00163e06dee2',
     parkName: '金星富民置业工业园',
     parkLayer: require('./木渎金星富民工业园(尧峰工业园)-楼栋.json'),
     floorLayer: require('./木渎金星富民工业园(尧峰工业园).json'),
   },
   {
+    id: '2',
     parkOrgId: '948e5118-ef4a-11eb-9790-00163e06dee2',
     parkName: '金桥汽配产业园',
     parkLayer: require('./金桥汽配产业园-楼栋.json'),

src/views/vxEwm/garden/index copy.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="vx-container">
+    <div class="general-header"></div>
+    <div class="general-view">
+      <router-view />
+    </div>
+    <div class="general-footnote">
+      <div class="app-download-hint"></div>
+      <div class="download-btn" @click="handlerDownload()">
+        <span>></span>
+        <a>点击下载</a>
+        <span><</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { phoneIf } from '@/util/sbIf.js'
+import { Toast } from 'vant'
+export default {
+  data() {
+    return {
+      urlAndorid: 'https://www.pgyer.com/6TpZ',
+      urliOS: '',
+    }
+  },
+  created() {
+    document.title = this.$route.query.name || '工业园' //修改浏览器标题
+    let windowBar = document.getElementById('statusBar')
+    windowBar.style.height = 0 + 'px'
+  },
+  methods: {
+    /**
+     * 下载APP
+     */
+    handlerDownload() {
+      const equipment = phoneIf()
+      if (equipment == 'IOS') {
+        if (window.plus) window.plus.runtime.openURL(this.urliOS)
+      } else if (equipment == 'Android') {
+        if (window.plus) window.plus.runtime.openURL(this.urlAndorid)
+      } else {
+        Toast(`暂未开发${equipment}版本app`)
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.vx-container {
+  position: relative;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100vh;
+  overflow: hidden;
+}
+.general-header {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 10;
+  width: 100%;
+  height: 16%;
+  background: url('~@/assets/image/vxEwm/top-header-bg.png');
+  background-size: 100% 100%;
+}
+.general-view {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 20;
+  width: 100%;
+  height: 80%;
+  background-color: #e8f3fc;
+  border-radius: 20px;
+  overflow: hidden;
+  box-sizing: border-box;
+  padding: 0.3rem 0.21rem;
+}
+.general-footnote {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  z-index: 10;
+  width: 100%;
+  height: 20%;
+  background: url('~@/assets/image/vxEwm/bottom-foot-bg.png');
+  background-size: 100% 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: flex-end;
+  .back-home {
+    width: 1.94rem;
+    height: 0.5rem;
+    background: url('~@/assets/image/vxEwm/backHome.png');
+    background-size: 100% 100%;
+  }
+  .app-download-hint {
+    width: 4.11rem;
+    height: 0.4rem;
+    margin: 0.1rem 0;
+    background: url('~@/assets/image/vxEwm/download-text.png');
+    background-size: 100% 100%;
+  }
+  .download-btn {
+    margin-bottom: 0.1rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #feffff;
+    a {
+      margin: 0 0.1rem;
+      text-decoration: underline;
+    }
+  }
+}
+</style>

src/views/vxEwm/garden/index.vue

@@ -4,8 +4,9 @@
     <div class="general-view">
       <router-view />
     </div>
+
     <div class="general-footnote">
-      <div class="app-download-hint"></div>
+      <div class="app-download-hint">查看更多信息请下载 “安全木渎APP”</div>
       <div class="download-btn" @click="handlerDownload()">
         <span>></span>
         <a>点击下载</a>
@@ -17,34 +18,14 @@
 
 <script>
 import { phoneIf } from '@/util/sbIf.js'
-import { Toast } from 'vant'
 export default {
   data() {
     return {
-      urlAndorid: 'https://www.pgyer.com/6TpZ',
-      urliOS:
-        'https://apps.apple.com/cn/app/%E6%9C%A8%E6%B8%8E%E6%99%BA%E6%85%A7%E5%AE%89%E7%9B%91/id1597682147',
+      systeam: '',
     }
   },
   created() {
-    document.title = this.$route.query.name || '工业园' //修改浏览器标题
-    let windowBar = document.getElementById('statusBar')
-    windowBar.style.height = 0 + 'px'
-  },
-  methods: {
-    /**
-     * 下载APP
-     */
-    handlerDownload() {
-      const equipment = phoneIf()
-      if (equipment == 'IOS') {
-        if (window.plus) window.plus.runtime.openURL(this.urliOS)
-      } else if (equipment == 'Android') {
-        if (window.plus) window.plus.runtime.openURL(this.urlAndorid)
-      } else {
-        Toast(`暂未开发${equipment}版本app`)
-      }
-    },
+    this.systeam = phoneIf()
   },
 }
 </script>
@@ -54,62 +35,50 @@ export default {
   position: relative;
   top: 0;
   left: 0;
-  width: 100%;
-  height: 100vh;
+  min-height: 100vh;
+  background: url('~@/assets/image/vxEwm/middle-bg.png');
+  background-size: cover;
   overflow: hidden;
-}
+
   .general-header {
     position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 10;
-  width: 100%;
-  height: 16%;
-  background: url('~@/assets/image/vxEwm/top-header-bg.png');
+    top: 1vh;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 4.8rem;
+    height: 8.3vh;
+
+    background: url('~@/assets/image/vxEwm/logo.png');
     background-size: 100% 100%;
   }
+
   .general-view {
     position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 20;
+    top: 46%;
+    transform: translateY(-46%);
+    height: 79%;
     width: 100%;
-  height: 80%;
-  background-color: #e8f3fc;
-  border-radius: 20px;
+    background: #e8f3fc;
+    border-radius: 30px;
     overflow: hidden;
     box-sizing: border-box;
-  padding: 0.3rem 0.21rem;
+    padding: 0.3rem 0.21rem 0 0.21rem;
   }
   .general-footnote {
     position: absolute;
-  bottom: 0;
+    bottom: 3vh;
     left: 0;
     z-index: 10;
     width: 100%;
-  height: 20%;
-  background: url('~@/assets/image/vxEwm/bottom-foot-bg.png');
-  background-size: 100% 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: flex-end;
-  .back-home {
-    width: 1.94rem;
-    height: 0.5rem;
-    background: url('~@/assets/image/vxEwm/backHome.png');
-    background-size: 100% 100%;
-  }
     .app-download-hint {
-    width: 4.11rem;
-    height: 0.4rem;
-    margin: 0.1rem 0;
-    background: url('~@/assets/image/vxEwm/download-text.png');
-    background-size: 100% 100%;
+      font-size: 0.25rem;
+      color: #fff;
+      font-weight: bold;
+      text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
+      font-family: 'PingFang-SC-Regular';
     }
     .download-btn {
-    margin-bottom: 0.1rem;
+      margin-top: 0.1rem;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -120,4 +89,5 @@ export default {
       }
     }
   }
+}
 </style>

src/views/vxEwm/garden/park/components/enterpriseList.vue

@@ -20,13 +20,15 @@
       @load="onLoad"
     >
       <div class="list-box">
-        <van-cell
-          is-link
+        <div
+          class="list-item"
           v-for="item in enterpriseList"
           :key="item.id"
           @click="onInfoClcik(item)"
-          >{{ item.name }}
-        </van-cell>
+        >
+          <div class="item-name">{{ item.name }}</div>
+          <div class="item-icon"><van-icon name="arrow" color="#CCCCCC" /></div>
+        </div>
       </div>
     </van-list>
   </div>
@@ -151,14 +153,33 @@ div {
 }
 
 .list-box {
-  border-radius: 28px;
+  border-radius: 25px;
   background-color: #fff;
   box-shadow: 0 2px 12px 0 #0000001a;
+  padding: 0 0.3rem;
+
+  .list-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0.2rem 0;
+    border-bottom: 1px solid RGBA(218, 218, 218, 0.6);
+    .item-name {
+      font-size: 0.24rem;
+      font-weight: bold;
+      color: #333333;
+      font-family: 'PingFang-SC-Regular';
+      white-space: nowrap; /* 让文本只显示在一行 */
+      overflow: hidden; /* 隐藏溢出部分 */
+      text-overflow: ellipsis; /* 显示省略号 */
+    }
+  }
   & > div:first-child {
     border-radius: 16px 16px 0 0;
   }
   & > div:last-child {
     border-radius: 0 0 16px 16px;
+    border: 0;
   }
 }
 /deep/.van-cell__value {

src/views/vxEwm/garden/park/components/statistics.vue

@@ -410,6 +410,7 @@ div {
   box-sizing: border-box;
 }
 .statistics-container {
+  padding-bottom: 0.3rem;
   & > div {
     display: flex;
     align-items: center;

src/views/vxEwm/garden/park/index.vue

@@ -48,9 +48,8 @@
           </div>
           <div
             class="timer-item"
-            v-for="(item, index) in fuzeList"
+            v-for="(item, index) in handlerParkMan"
             :key="index"
-            v-show="index != 1"
           >
             <div class="circle"></div>
             <div class="circle-line"></div>
@@ -77,6 +76,35 @@
               </div>
             </div>
           </div>
+          <div class="timer-item">
+            <div class="circle"></div>
+            <div class="circle-line"></div>
+            <div class="data-mian">
+              <div class="timer-line-title">网格员</div>
+              <div
+                class="link-man"
+                v-for="(item, index) in handlerNetMan"
+                :key="index"
+                style="padding-bottom: 0.3rem"
+              >
+                <div class="man-box">
+                  <div>
+                    <div class="linkMan-icon"></div>
+                    <div class="linkMan-text">{{ item.name }}</div>
+                  </div>
+                  <div>
+                    <div class="linkMan-tel"></div>
+                    <a
+                      :href="'tel:' + item.phone"
+                      style="color: #177fd4; text-decoration: underline"
+                      class="linkMan-text"
+                      >{{ item.phone }}</a
+                    >
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
           <div class="timer-item">
             <div class="circle"></div>
             <div class="data-mian" style="padding-bottom: 0.1rem">
@@ -209,6 +237,14 @@ export default {
     statistical,
     enterpriseList,
   },
+  computed: {
+    handlerParkMan() {
+      return this.fuzeList.filter((item) => item.type == '园区负责人')
+    },
+    handlerNetMan() {
+      return this.fuzeList.filter((item) => item.type == '网格员')
+    },
+  },
   created() {
     this.querParams.parkProfileId = this.$route.query.id
     this.loading = Toast.loading('加载中...')
@@ -254,6 +290,7 @@ export default {
     getFzr() {
       listPrincipal(this.querParams).then((res) => {
         this.fuzeList = res.rows
+        console.log(this.fuzeList, '负责人')
       })
     },
 
@@ -290,14 +327,23 @@ export default {
       //也可以直接用数据去接收
       this.mapLayer.mapLayer1 = L.featureGroup()
       this.mapLayer.mapLayer2 = L.featureGroup()
-      let querys = this.$route.query
-      this.setParks(id, querys.name)
+      let parkId = this.$route.query.id
+      let parkName = ''
+      mapJson.forEach((item) => {
+        if (item.id == parkId) {
+          parkName = item.parkName
+        }
+      })
+      if (!parkName) {
+        this.$message.error('暂无该工业园面数据...')
+        return
+      }
+      this.setParks(id, parkName)
     },
     setParks(parkOrgId, name) {
       this.mapLayer.mapLayer1.clearLayers() //清除该图层中数据
       this.parkName = name
       let mapObj = mapJson.filter((item) => item.parkName == name)
-      console.log(mapObj, '面数据')
       if (mapObj.length == 0) {
         this.$message.error('暂无该工业园面数据...')
         return
@@ -405,7 +451,7 @@ div {
   width: 100%;
   display: flex;
   align-items: center;
-  margin-bottom: 0.5rem;
+  margin-bottom: 0.4rem;
   & > div {
     flex: 1;
     font-size: 0.25rem;
@@ -429,10 +475,11 @@ div {
   }
 }
 .container-box {
-  height: calc(100% - 0.7rem);
+  height: calc(100% - 0.5rem);
   overflow-y: auto;
 }
 .tab-type {
+  padding-bottom: 0.2rem;
   .map {
     overflow: hidden;
     height: 5.58rem;