暂存

.env.development

@@ -11,9 +11,9 @@
 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 ='http://192.168.0.124:9028'
 # 图片前缀正式服务器
-VUE_APP_IMGURL ='http://221.229.220.83:9028'
+VUE_APP_IMGURL ='http://192.168.0.124:9028'
 # 图片前缀本地服务器
 # VUE_APP_IMGURL ='http://192.168.0.123:9028'
 

.env.production

@@ -17,4 +17,3 @@ VUE_APP_IMGURL ='http://221.229.220.83:9028'
 VUE_APP_VERSION = "3.2.8"
 VUE_APP_VERSION2 = "3.2.8"
 
-一期

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'

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/request.js

@@ -87,7 +87,7 @@ request.interceptors.response.use(
       const isSucceed = await refreshToken()
       if (isSucceed) {
         //重新请求
-        console.log('重新刷新')
+        // console.log('重新刷新')
         errorData.config.headers.Authorization =
           'Bearer ' + localStorage.getItem('mudu_token') //替换token
         let result = await request.request(errorData.config) //重新请求

src/api/request2.js

@@ -78,7 +78,7 @@ request.interceptors.response.use(
     }
   },
   (error) => {
-    console.log(error.response)
+    // console.log(error.response)
     if (error.response && error.response.status === 401) {
       Toast({
         message: '登录过期，请重新登录',

src/router/index.js

@@ -22,9 +22,8 @@ const router = new Router({ routes })
 
 // 路由拦截
 router.beforeEach((to, from, next) => {
-  console.log('值', to)
   store.commit('SET_IS_SHOW', {
-    text: to.name == '企业详情' ? '工业园' : '企业',
+    text: to.name == '企业详情' ? '工业园' : to.name == '企业详情2' ? '楼栋': '企业',
     isShow: to.query.isShow || to.params.isShow,
   })
   console.log(to)

src/router/vxEwm.js

@@ -42,6 +42,25 @@ let routes = [
       },
     ],
   },
+  {
+    path: '/enterpriseData2',
+    name: '企业信息',
+    component: () => import('@/views/vxEwm/enterprise/index.vue'),
+    redirect: '/enterpriseData2/info',
+    children: [
+      {
+        path: '/enterpriseData2/info',
+        name: '企业详情2',
+        component: () => import('@/views/vxEwm/enterprise/info.vue'),
+      },
+      {
+        path: '/enterpriseData2/check/info',
+        name: '巡检详情',
+        component: () =>
+          import('@/views/vxEwm/enterprise/components/firmInfo.vue'),
+      },
+    ],
+  },
 ]
 
 // {

src/util/refresh.js

@@ -21,6 +21,6 @@ export async function refreshToken() {
 }
 
 export function isRefreshRequest(config) {
-  console.log(config.__isRefreshToken)
+  // console.log(config.__isRefreshToken)
   return !!config.__isRefreshToken //两个取反，变成boolean
 }

src/views/vxEwm/build/build/index.vue

@@ -1,16 +1,14 @@
 <template>
   <div class="enterprise-list">
     <div class="title-gr">
-      <div class="icon-circle">
+      <div class="icon-circle"> </div>
-
+      <div class="build-name">{{ parkName }} {{ buildingName }}</div>
-      </div>
-      <div class="build-name">金星富民置业工业园 1栋</div>
     </div>
     <div class="serch-input">
       <div class="input-box">
-        <input type="text" v-model="querParams.name" placeholder="请输入搜索关键词" />
+        <input type="text" v-model="querParams.enterpriseName" placeholder="请输入搜索关键词" />
-        <div class="input-close" v-show="querParams.name">
+        <div class="input-close" v-show="querParams.enterpriseName">
-          <van-icon name="clear" @click="querParams.name = undefined" />
+          <van-icon name="clear" @click="querParams.enterpriseName = undefined" />
         </div>
       </div>
       <div class="serch-btn" @click="onSearch"></div>
@@ -18,7 +16,7 @@
     <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
       <div class="list-box">
         <div class="list-item" v-for="item in enterpriseList" :key="item.id" @click="onInfoClcik(item)">
-          <div class="item-name">{{ item.name }}</div>
+          <div class="item-name">{{ item.enterpriseName }}</div>
           <div class="item-icon"><van-icon name="arrow" color="#CCCCCC" /></div>
         </div>
       </div>
@@ -28,6 +26,8 @@
 
 <script>
 import xApi from '@/api/xApi'
+import { listEnterpriseBuildPark } from '@/api/mudu/park.js'
+
 export default {
   props: {
     parkProfileId: {
@@ -38,20 +38,21 @@ export default {
     return {
       total: 0,
       querParams: {
-        ParkID: null,
+        buildingId: null,
-        page: 1,
+        parkId: null,
-        limit: 10,
+        pageNum: 1,
-        name: undefined,
+        pageSize: 10,
+        enterpriseName: null
       },
       enterpriseList: [],
       loading: false,
       finished: false,
+      parkName:null,
+      buildingName:null,
     }
   },
   created() {
-    this.querParams.ParkID = this.parkProfileId
 
-    console.log(this.querParams)
   },
   methods: {
     onLoad() {
@@ -60,31 +61,36 @@ export default {
       }, 500)
     },
     getList() {
-      xApi.allenterpriselist(this.querParams).then((res) => {
+      this.querParams.buildingId = this.$route.query.buildingId
-        this.enterpriseList.push(...res.data)
+      this.querParams.parkId = this.$route.query.parkId
-        this.total = res.count
+
+      listEnterpriseBuildPark(this.querParams).then((res) => {
+        this.enterpriseList = this.enterpriseList.concat(res.rows)
+        this.parkName = this.enterpriseList[0].parkName
+        this.buildingName = this.enterpriseList[0].buildingName
+        this.total = res.total
         this.loading = false
-        // 数据全部加载完成
         if (this.enterpriseList.length >= this.total) {
           this.finished = true
+        } else {
+          this.querParams.pageNum++
         }
-        this.querParams.page++
       })
     },
     onSearch() {
       this.loading = false
       this.finished = false
-      this.querParams.page = 1
+      this.querParams.pageNum = 1
-      this.querParams.limit = 10
+      this.querParams.pageSize = 10
       this.total = 0
       this.enterpriseList = []
-      this.getList()
+      // this.getList()
     },
     onInfoClcik(item) {
       this.$router.replace({
-        path: '/enterpriseData',
+        path: '/enterpriseData2/info',
         query: {
-          id: item.id,
+          id: item.enterpriseId,
           isShow: true,
         },
       })

src/views/vxEwm/enterprise/index.vue

@@ -2,24 +2,17 @@
   <div class="vx-container">
     <div class="general-header"></div>
     <div class="header-bg"></div>
-    <div
+    <div :class="$route.name == '巡检详情' ? 'general-view-two' : 'general-view'" :style="{
-      :class="$route.name == '巡检详情' ? 'general-view-two' : 'general-view'"
-      :style="{
       height: $store.state.showBtnData.isShow == 'true' ? '' : '79%',
       top: $store.state.showBtnData.isShow == 'true' ? '' : '46%',
       transform:
         $store.state.showBtnData.isShow == 'true' ? '' : 'translateY(-46%)',
-      }"
+    }">
-    >
       <router-view />
     </div>
 
     <div class="general-footnote">
-      <div
+      <div class="back-home" v-show="$store.state.showBtnData.isShow == 'true'" @click="backHome">
-        class="back-home"
-        v-show="$store.state.showBtnData.isShow == 'true'"
-        @click="backHome"
-      >
         <img src="@/assets/image/vxEwm/back.png" alt="" class="back-icon" />
         <span> 返回{{ $store.state.showBtnData.text }}</span>
       </div>
@@ -27,7 +20,7 @@
       <div class="download-btn" @click="handlerDownload()">
         <span>></span>
         <a>点击下载</a>
-        <span><</span>
+        <span> &lt; </span>
       </div>
     </div>
     <div class="footonte-bg"></div>
@@ -53,6 +46,14 @@ export default {
           path: '/park',
           query: { id: this.$store.state.parkId },
         })
+      } else if (this.$store.state.showBtnData.text == '楼栋') {
+        this.$router.replace({
+          path: '/build',
+          query: {
+            buildingId: null,
+            parkId: null,
+          },
+        })
       } else {
         this.$router.replace({
           path: '/enterpriseData/info',
@@ -126,6 +127,7 @@ export default {
     box-sizing: border-box;
     padding: 0.3rem 0.21rem 0 0.21rem;
   }
+
   .footonte-bg {
     position: absolute;
     bottom: 0;
@@ -136,6 +138,7 @@ export default {
     background: url('~@/assets/image/vxEwm/bg2.png');
     background-size: 100% 100%;
   }
+
   .general-view-two {
     position: absolute;
     top: 37%;
@@ -149,6 +152,7 @@ export default {
     box-sizing: border-box;
     padding: 0 0.21rem 0 0.21rem;
   }
+
   .general-footnote {
     position: absolute;
     bottom: 0;
@@ -163,18 +167,21 @@ export default {
       width: 1.85rem;
       height: 0.5rem;
       margin: auto;
+
       .back-icon {
         display: inline-block;
         height: 0.3rem;
         height: 0.25rem;
         margin-right: 0.05rem;
       }
+
       color: #177fd4;
       font-weight: bold;
       font-size: 0.22rem;
       border-radius: 28px;
       background-image: linear-gradient(to right, #accbee, #e7f0fd);
     }
+
     .app-download-hint {
       margin-top: 0.1rem;
       font-size: 0.24rem;
@@ -183,6 +190,7 @@ export default {
       font-weight: bold;
       text-shadow: 0px 0px 0px #0e50b4;
     }
+
     .download-btn {
       margin-top: 0.1rem;
       padding-bottom: 3vh;
@@ -190,6 +198,7 @@ export default {
       align-items: center;
       justify-content: center;
       color: #feffff;
+
       a {
         margin: 0 0.1rem;
         text-decoration: underline;

src/views/vxEwm/enterprise/info.vue

@@ -510,7 +510,7 @@ export default {
     getIdInfo(id) {
       xApi.getEnterInfo(id).then((res) => {
         this.parkList = res.data
-        console.log(this.parkList, '企业')
+        // console.log(this.parkList, '企业')
         document.title = this.parkList.name || '企业' //修改浏览器标题
       })
     },

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

@@ -59,7 +59,7 @@ export default {
   created() {
     this.querParams.ParkID = this.parkProfileId
 
-    console.log(this.querParams)
+    // console.log(this.querParams)
   },
   methods: {
     onLoad() {

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

@@ -381,13 +381,13 @@ export default {
         Status: state,
       }
       getTroublelist(querParams).then((res) => {
-        console.log('sasa', res)
+        // console.log('sasa', res)
         this.parkData[key] = res.count
       })
     },
     getParkInfo() {
       getParkinfo(this.parkOrgId).then((res) => {
-        console.log('mlkkk', res)
+        // console.log('mlkkk', res)
         this.parkData.enterpriseNum = res.data.enterpriseCountSum
       })
     },

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

@@ -299,7 +299,7 @@ export default {
     getFzr() {
       listPrincipal(this.querParams).then((res) => {
         this.fuzeList = res.rows
-        console.log(this.fuzeList, '负责人')
+        // console.log(this.fuzeList, '负责人')
       })
     },