diff --git a/src/components/home/leftFive.vue b/src/components/home/leftFive.vue
new file mode 100644
index 0000000..cc5a191
--- /dev/null
+++ b/src/components/home/leftFive.vue
@@ -0,0 +1,247 @@
+
+
+
+

+
施工环境
+
+
+
+
+
+
+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[8].jcValue
+ : ''
+ }}°C
+
温度
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[7].jcValue
+ : ''
+ }}m/s
+
风速
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[9].jcValue
+ : ''
+ }}%rh
+
湿度
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[5].jcValue
+ : ''
+ }}db
+
噪声
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[3].jcValue
+ : ''
+ }}/ugm3
+
PM2.5
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[4].jcValue
+ : ''
+ }}/ugm3
+
PM10
+

+
+
+
+
+
+
+
+
diff --git a/src/components/home/leftSeven.vue b/src/components/home/leftSeven.vue
new file mode 100644
index 0000000..a738981
--- /dev/null
+++ b/src/components/home/leftSeven.vue
@@ -0,0 +1,226 @@
+
+
+
+

+
基坑检测
+
+
+
+
+
+
+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[0].jcValue
+ : ''
+ }}%VOL
+
含氧量
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[1].jcValue
+ : ''
+ }}%PPM
+
一氧化碳
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[2].jcValue
+ : ''
+ }}%LEL
+
可燃气体
+

+
+
+
{{
+ environmentInfoList
+ ? environmentInfoList[3].jcValue
+ : ''
+ }}%PPM
+
硫化氢
+

+
+
+
+
+
+
+
+
diff --git a/src/components/home/leftSix.vue b/src/components/home/leftSix.vue
new file mode 100644
index 0000000..92a7b2a
--- /dev/null
+++ b/src/components/home/leftSix.vue
@@ -0,0 +1,456 @@
+
+
+
+

+
组塔检测
+
+
+
+
+
+
+ 离线
+
+
+
+ 报警
+
+
+
+ 在线
+
+
+
倾角监测设备
+
+
拉力监测设备
+
+
+
+
+
+

+
+ 倾角
+ {{ angleFirst }}°
+
+
+
+
+ {{ item.jcTime }}
+ {{ item.jcValue }}{{ item.jcUnit }}
+
+
+
+
+
+
+

+
+ 拉力
+ {{ pullFirst }}N
+
+
+
+
+ {{ item.jcTime }}
+ {{ item.jcValue }}{{ item.jcUnit }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/Workbench/components/workbenchEdit.vue b/src/views/Workbench/components/workbenchEdit.vue
index 7afbe04..76245ba 100644
--- a/src/views/Workbench/components/workbenchEdit.vue
+++ b/src/views/Workbench/components/workbenchEdit.vue
@@ -108,6 +108,9 @@ import VueGridLayout from 'vue-grid-layout'
import LeftOne from '@/components/home/leftOne.vue'
import LeftTwo from '@/components/home/leftTwo.vue'
import LeftThree from '@/components/home/leftThree.vue'
+import LeftFive from '@/components/home/leftFive.vue'
+import LeftSix from '@/components/home/leftSix.vue'
+import LeftSeven from '@/components/home/leftSeven.vue'
import RightOne from '@/components/home/rightOne.vue'
import RightTwo from '@/components/home/rightTwo.vue'
import CountryMap from '@/components/home/countryMap.vue'
@@ -124,7 +127,10 @@ export default {
LeftThree,
RightOne,
RightTwo,
- CountryMap
+ CountryMap,
+ LeftFive,
+ LeftSix,
+ LeftSeven
},
computed: {
searchComp() {
@@ -430,6 +436,33 @@ export default {
isAccord: '1*1',
rigCont: '2*2'
},
+ {
+ id: 7,
+ name: '环境检测',
+ componentName: 'LeftFive',
+ w: 3,
+ h: 1,
+ isAccord: '1*1',
+ rigCont: '1*3'
+ },
+ {
+ id: 8,
+ name: '组塔检测',
+ componentName: 'LeftSix',
+ w: 2,
+ h: 2,
+ isAccord: '1*1',
+ rigCont: '2*2'
+ },
+ {
+ id: 9,
+ name: '基坑检测',
+ componentName: 'LeftSeven',
+ w: 3,
+ h: 1,
+ isAccord: '1*1',
+ rigCont: '1*3'
+ }
],
rowHeight: 0,
previewLayout: [],
diff --git a/src/views/Workbench/components/workbenchTemp.vue b/src/views/Workbench/components/workbenchTemp.vue
index 1b1429f..493932c 100644
--- a/src/views/Workbench/components/workbenchTemp.vue
+++ b/src/views/Workbench/components/workbenchTemp.vue
@@ -22,7 +22,7 @@
>
-
+
@@ -46,6 +46,9 @@ import ItemSix from './item-six.vue'
import LeftOne from '@/components/home/leftOne.vue'
import LeftTwo from '@/components/home/leftTwo.vue'
import LeftThree from '@/components/home/leftThree.vue'
+import LeftFive from '@/components/home/leftFive.vue'
+import LeftSix from '@/components/home/leftSix.vue'
+import LeftSeven from '@/components/home/leftSeven.vue'
import RightOne from '@/components/home/rightOne.vue'
import RightTwo from '@/components/home/rightTwo.vue'
import CountryMap from '@/components/home/countryMap.vue'
@@ -57,14 +60,18 @@ import {
querySubProjInfoApi
} from '@/api/substation/substation'
export default {
- /* props: {
- layoutList: {
- type: Array,
- default: () => [
- // 第一行
- ],
- },
- }, */
+ props: {
+ // layoutList: {
+ // type: Array,
+ // default: () => [
+ // // 第一行
+ // ],
+ // },
+ proId: {
+ type: Number,
+ default: undefined,
+ }
+ },
components: {
GridLayout: VueGridLayout.GridLayout,
GridItem: VueGridLayout.GridItem,
@@ -74,7 +81,10 @@ export default {
RightOne,
RightTwo,
CountryMap,
- CommonDialog
+ CommonDialog,
+ LeftFive,
+ LeftSix,
+ LeftSeven
},
data() {
return {
@@ -196,8 +206,20 @@ export default {
}
},
created() {
+ setTimeout(() => {
+ console.log('created-->工程id', this.proId)
+ }, 200)
this.getGeoData()
},
+ // 监听工程id变化
+ watch: {
+ proId: {
+ handler: function (val) {
+ console.log('workbench--watch-->工程id', val)
+ },
+ immediate: true
+ }
+ },
mounted() {
this.getTableData()
this.rowHeight = (this.$refs['workbenchEditRef'].clientHeight - 65) / 12
diff --git a/src/views/Workbench/index.vue b/src/views/Workbench/index.vue
index 1387276..b6c1fb3 100644
--- a/src/views/Workbench/index.vue
+++ b/src/views/Workbench/index.vue
@@ -1,11 +1,26 @@
+
+
+
+
+
编辑工作台
@@ -15,7 +30,7 @@
@handleSubmit="handleSubmit"
style="margin-top: 10px"
/>
-
+
@@ -28,6 +43,7 @@ import LeftThree from '@/components/home/leftThree.vue'
import RightOne from '@/components/home/rightOne.vue'
import RightTwo from '@/components/home/rightTwo.vue'
import CountryMap from '@/components/home/countryMap.vue'
+import { queryProjListApi } from '@/api/tableApis'
export default {
components: {
@@ -43,14 +59,14 @@ export default {
data() {
return {
idEdit: false,
-
+ proId: undefined,
+ proOptions: [],
}
},
mounted() {
- // this.getTableData()
+ this.getTableData()
},
methods: {
-
handleEditWorkbench() {
this.idEdit = true
},
@@ -62,6 +78,24 @@ export default {
// this.getTableData()
this.idEdit = false
},
+ // 获取工程列表
+ async getTableData() {
+ const params = {
+ pageNum: 1,
+ pageSize: 999,
+ }
+ let res = await queryProjListApi(params)
+ console.log('🚀 ~ 获取工程列表 ~ res:', res)
+ if (res.data.code === 200) {
+ this.proOptions = res.data.rows.map((item) => {
+ return {
+ value: item.id,
+ label: item.proName,
+ }
+ })
+ this.proId = res.data.rows[0].id
+ }
+ },
},
}
@@ -79,5 +113,12 @@ export default {
right: 10px;
font-size: 16px;
}
+
+ .select {
+ position: absolute;
+ top: -35px;
+ right: 150px;
+ font-size: 16px;
+ }
}