Merge branch 'dev-yjl' into 'shenzhen-dev'

中建四-安全管理-塔机监测、高支模数据对接

See merge request !129

public/js/config.js

@@ -1,4 +1,4 @@
-// var COMPANY = ''; //通用
+var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -8,7 +8,7 @@
 // COMPANY = 'henan' // 河南春笋
 // COMPANY = 'xingxuan'
 // COMPANY = 'hengtong'//瑞士恒通
-COMPANY = 'yunlian'//云联万物
+// COMPANY = 'yunlian'//云联万物
 
 
 

src/assets/js/api/zhongjianFourth.js

@@ -85,6 +85,7 @@ export const getDeclareAgeApi = data => get('/xmgl/workerInfo/getDeclareAge',dat
 //分页查询临边防护-设备实时数据
 export const getFpdcdSelectPageApi = data => get('/xmgl/fpdcd/selectPage',data)
 export const getPersonnelSituationApi = data => get('/xmgl/workerInfo/getPersonnelSituation',data)
+export const getHighFormworkApi = data => post('/xmgl/highFormworkMeasureCurrentData/big/screen/list',data)
 
 
 

src/assets/js/http.js

@@ -75,8 +75,10 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
   // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
   // axios.defaults.baseURL = 'http://192.168.34.221:8088' //郭圣雄本地
-  // axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.221:8188' //郭圣雄本地
-  axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8210' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8199' //郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.169.34.133:8070' //彭洁本地
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'

src/views/projectAdmin/fourEngin/security/centerBottom.vue

@@ -128,28 +128,94 @@
           <div class="td">倾角Y报警</div>
           <div class="td">倾角报警</div>
           <div class="td">幅度</div>
-          <div class="td">风速</div>
+          <div class="td">风速(m/s)</div>
           <div class="td">倾角</div>
           <div class="td">高度</div>
-          <div class="td">载重</div>
+          <div class="td">载重(kg)</div>
           <div class="td">数据接收时间</div>
         </div>
       </div>
       <div class="tbody">
         <vue-scroll>
-          <div class="row" v-for="i in 10" :key="i">
+          <div class="row" v-for="(item, index) in TowerList" :key="index">
-            <div class="td">中建四项目深基坑</div>
+            <div class="td" style="margin-left: -10px">
-            <div class="td">沉降监测3号</div>
+              {{
-            <div class="td">深层水平位移</div>
+                item.angleDirection == 0
-            <div class="td">-0.77</div>
+                  ? '停止回转'
-            <div class="td">-1.04</div>
+                  : item.angleDirection == 1
-            <div class="td">2022-09-01</div>
+                  ? '向右回转'
-            <div class="td">正常</div>
+                  : item.angleDirection == 2
-            <div class="td">正常</div>
+                  ? '向左回转'
-            <div class="td">正常</div>
+                  : '无'
-            <div class="td">正常</div>
+              }}
-            <div class="td">正常</div>
+            </div>
-            <div class="td">正常</div>
+            <div class="td" style="margin-left: -22px">
+              {{
+                item.heightDirection == 0
+                  ? '停止升降'
+                  : item.heightDirection == 1
+                  ? '向下落勾'
+                  : item.heightDirection == 2
+                  ? '向上起勾'
+                  : '无'
+              }}
+            </div>
+            <div class="td" style="margin-left: -20px">
+              {{
+                item.rangeDirection == 0
+                  ? '停止变幅'
+                  : item.rangeDirection == 1
+                  ? '向外变幅'
+                  : item.rangeDirection == 2
+                  ? '向内变幅'
+                  : '无'
+              }}
+            </div>
+            <div class="td" style="margin-left: -18px">
+              {{
+                item.windSpeedAlarm == 0
+                  ? '正常'
+                  : item.windSpeedAlarm == 1
+                  ? '报警'
+                  : item.windSpeedAlarm == 2
+                  ? '预警'
+                  : '无'
+              }}
+            </div>
+            <div class="td" style="margin-left: -20px">
+              {{
+                item.obliguityYAlarm == 0
+                  ? '正常'
+                  : item.obliguityYAlarm == 1
+                  ? '报警'
+                  : item.obliguityYAlarm == 2
+                  ? '预警'
+                  : '无'
+              }}
+            </div>
+            <div class="td" style="margin-left: -20px">
+              {{
+                item.obliguityAlarm == 0
+                  ? '正常'
+                  : item.obliguityAlarm == 1
+                  ? '报警'
+                  : item.obliguityAlarm == 2
+                  ? '预警'
+                  : '无'
+              }}
+            </div>
+            <div class="td" style="margin-left: -20px">{{ item.ranger }}</div>
+            <div class="td" style="margin-left: -20px">
+              {{ item.windspeed }}
+            </div>
+            <div class="td" style="margin-left: -20px">
+              {{ item.obliguity }}
+            </div>
+            <div class="td" style="margin-left: -20px">{{ item.height }}</div>
+            <div class="td" style="margin-left: -20px">{{ item.loading }}</div>
+            <div class="td" style="margin-left: -25px">
+              {{ item.reciveTime }}
+            </div>
           </div>
         </vue-scroll>
       </div>
@@ -175,13 +241,13 @@
       </div>
       <div class="tbody">
         <vue-scroll>
-          <div class="row" v-for="i in 10" :key="i">
+          <div class="row" v-for="(item, index) in highFormList" :key="index">
-            <div class="td">中建四项目深基坑</div>
+            <div class="td">{{ item.measurePointName }}</div>
-            <div class="td">沉降监测3号</div>
+            <div class="td">{{ item.measurePointNumber }}</div>
-            <div class="td">深层水平位移</div>
+            <div class="td">{{ item.angleYAxis }}</div>
-            <div class="td">-0.77</div>
+            <div class="td">{{ item.pressure }}</div>
-            <div class="td">-1.04</div>
+            <div class="td">{{ item.subside }}</div>
-            <div class="td">2022-09-01</div>
+            <div class="td" style="width: 120px">{{ item.collectTime }}</div>
           </div>
         </vue-scroll>
       </div>
@@ -221,14 +287,6 @@
       </div> -->
     </div>
 
-    <!-- <div class="tbody">
-        <div class="dataImg">
-          <img src="@/assets/images/noData3.png" alt srcset />
-          <p>{{$t('message.dataBoard.nodata')}}</p>
-        </div>
-      </div>
-    </div> -->
-
     <!-- 云端建设工厂 -->
     <div class="list" v-if="tabIndex == 4">
       <!-- <div class="thead">
@@ -254,7 +312,11 @@
 </template>
 
 <script>
-import { getFpdcdSelectPageApi } from '@/assets/js/api/zhongjianFourth'
+import {
+  getFpdcdSelectPageApi,
+  getHighFormworkApi
+} from '@/assets/js/api/zhongjianFourth'
+import { getTowerCurrentDataListApi } from '@/assets/js/api/towerCrane'
 import Card from '../components/Card.vue'
 export default {
   components: { Card },
@@ -264,11 +326,15 @@ export default {
       tabs: ['临边防护', '塔机监测', '高支模监测', '深基坑', '云端建设工厂'],
       current: 0, //页数
       size: 0, //条数
-      edgeList: []
+      edgeList: [], //临边防护
+      TowerList: [], //塔机监测
+      highFormList: [] //高支模
     }
   },
   created() {
     this.getEdgeDate()
+    this.getTowerCurrentData()
+    this.getHighFormworkData()
   },
   methods: {
     //点击切换
@@ -284,6 +350,26 @@ export default {
         this.edgeList = res.result.records
         console.log('临边防护-res', this.edgeList)
       })
+    },
+    //塔机监测-数据获取
+    getTowerCurrentData() {
+      getTowerCurrentDataListApi({
+        projectSn: this.$store.state.projectSn
+      }).then((res) => {
+        if (res.code == 200) {
+          console.log('塔机监测-', res)
+          this.TowerList = res.result.records
+        }
+      })
+    },
+    //高支模监测-数据获取
+    getHighFormworkData() {
+      getHighFormworkApi({
+        projectSn: this.$store.state.projectSn
+      }).then((res) => {
+        this.highFormList = res.result.records
+        console.log('高支模监测-res', res)
+      })
     }
   }
 }