+
@@ -16,8 +21,12 @@ Vue.component("screen-select", {
data:{
type:Array
},
- val:{
- type:[String,Number,Object]
+ def:{
+ type:Object
+ },
+ type:{
+ type:Number,
+ default:0
}
},
data() {
@@ -27,7 +36,9 @@ Vue.component("screen-select", {
}
},
mounted(){
-
+ if(this.def){
+ this.value = this.def.text
+ }
},
methods: {
clickSelectInput(){
@@ -43,10 +54,8 @@ Vue.component("screen-select", {
}
},
watch:{
- val:{
- hander(){
- this.value=this.val||'';
- },
+ def:function (n,o) {
+ this.value = n.text
}
}
diff --git a/src/pages/quality/concreteStrength.vue b/src/pages/quality/concreteStrength.vue
index 5c87c24..2d7e3e6 100644
--- a/src/pages/quality/concreteStrength.vue
+++ b/src/pages/quality/concreteStrength.vue
@@ -2,36 +2,262 @@
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/pages/quality/standardCuringRoom.vue b/src/pages/quality/standardCuringRoom.vue
index 8461c14..413e007 100644
--- a/src/pages/quality/standardCuringRoom.vue
+++ b/src/pages/quality/standardCuringRoom.vue
@@ -2,40 +2,253 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
diff --git a/src/pages/safe/excavation.vue b/src/pages/safe/excavation.vue
index 787ffb2..158c3b7 100644
--- a/src/pages/safe/excavation.vue
+++ b/src/pages/safe/excavation.vue
@@ -180,7 +180,7 @@
+
+
+
+
+
+ 
+
+
+
+
+ 外置温度
+ {{ lastRunData.tempOut == undefined ? 0 : lastRunData.tempOut }} ℃
+
+
+
+
+
+
+
+
+ 内置温度
+ {{ lastRunData.tempIn == undefined ? 0 : lastRunData.tempIn }}℃
+
+
+
+ 
+
+
+
+
+ 强度
+ {{ lastRunData.strong == undefined ? 0 : lastRunData.strong }} MPa
+
+
+
+ 
+
+
+
+
+ 成熟度
+ {{ lastRunData.cooked == undefined ? 0 : lastRunData.cooked }}°C*小时
+
+
+
+
+
+ 当前设备
+ 混凝土强度监测
+
+
+
+
+ | 设备名称： | +
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ lastChooseDevice.deviceStatus == 1 ? '离线' : '在线' }}
+ |
+
| 名称： | +
+ 混凝土监控设备-{{ lastChooseDevice.deviceId }}
+ |
+
| 安装位置： | +{{ lastChooseDevice.address }} | +
| 设备状态： | +
+
+ {{ lastChooseDevice.deviceStatus == 1 ? '离线' : '在线' }}
+ |
+
| 设备编码： | +{{ lastChooseDevice.deviceId }} | +
| 更新时间： | +{{ lastChooseDevice.deviceUpdateTime }} | +
+
+
+
+ 正在发生
+
+
+
+
+
+
+ {{ item.type }}
+
+
+
+ ![]()
+
+
+
+ {{ item.content }} (正常范围：{{ item.threshold }})
+ {{ item.time }}
+ 预警差值：{{ item.chaValue
+ }}
+ 恢复时间：{{ item.recoveryTime }}
+
+ 
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+ 当前温度
+ {{ lastRunData.temperature }} ℃
+
+
+
+
+
+
+
+
+ 标准温度
+ 18-22℃
+
+
+
+ 
+
+
+
+
+ 当前湿度
+ {{ lastRunData.humidity }} %RH
+
+
+
+
+
+
+
+
+ 标准湿度
+ 95%RH以上
+
+
+
+
+
+ 当前设备
+ 标养室监测
+
+
+
+
+ | 设备名称： | +
+
+
+
+
+
+
+ 在线
+ 离线
+ |
+
| 名称： | +
+ {{ lastChooseDevice.name }}
+ |
+
| 安装位置： | ++ |
| 设备状态： | +
+ 无警告/在线
+ |
+
| 设备编码： | +{{ lastChooseDevice.deviceId }} | +
| 更新时间： | +{{ lastChooseDevice.create_time }} | +
+
+
+
+ 正在发生
+
+
+
+
+
+
+ {{ item.type }}
+
+
+
+ ![]()
+
+
+
+ {{ item.content }} (正常范围：{{ item.threshold }})
+ {{ item.time }}
+ 预警差值：{{ item.chaValue}}
+
+
+
+
+ 暂无数据
+ {{
+ class="title-item" @click="selPoint = it">{{
it.name }}
@@ -270,7 +270,10 @@
-
+
+
@@ -283,11 +286,11 @@ import '@/components/module/module-one-1-2'
import '@/components/module/module-one-2-1'
import '@/components/classify-bar'
import '@/components/trend-line-chart'
-
+import enginChart from '../engin/enginChart.vue'
export default {
//基坑
name: 'JhbigscreenExcavation',
-
+ components: { enginChart },
data() {
return {
selPoint: {},
@@ -312,7 +315,7 @@ export default {
btnNav: 1,
CollWeiyiPointData: {},
CollWeiyiPointDataData: [],
-
+
CollQingxiePointDataX: {},
CollQingxiePointDataXdData: [],
@@ -349,11 +352,60 @@ export default {
ratD: '0.23', ratM: 12, ratS: 'D'
}
});
- this.selPoint = this.pointData[0];
+ this.selPoint = this.pointData[0];
this.init();
+ this.initChart();
},
methods: {
+ initChart() {
+
+ let opt2 = {
+ grid: {
+ left: 30,
+ right: 30,
+ top: 40,
+ bottom: 60
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
+ },
+ color: ['#409eff'],
+ xAxis: {
+ type: 'category',
+ data: ["地表沉降","深层水平位移","立柱水平位移","临近道路路基沉降","边坡顶部水平位移","支撑轴力","围护桩顶部竖向位移","围护桩顶部水平位移"],
+ axisLabel: {
+ color: "#fff",
+ fontSize: 10,
+ interval: 0, rotate: 30
+ }
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ show: true,
+ color: "#fff"
+ }
+ },
+ series: [
+ {
+
+ label: {
+ show: true,
+ color: '#82c9ff',
+ position: 'top',
+ },
+ data: [100,120,240,100,120,130,140,100,190],
+ type: 'bar'
+
+ }
+ ]
+ };
+ this.$refs.chart1.init(opt2);
+ },
init() {
this.warningTypeInterval = setInterval(this.automaticRollType, 5000);
},
@@ -564,28 +616,34 @@ export default {
.mon-point-title {
color: #51b5ff;
}
- .mon-point-row{
+
+ .mon-point-row {
line-height: 60px;
- font-size:12px;
- .sp-data{
+ font-size: 12px;
+
+ .sp-data {
display: inline-block;
- width:105px;
+ width: 105px;
}
- .sp-lbl{
+
+ .sp-lbl {
display: inline-block;
- width:110px;
+ width: 110px;
}
- .mon-arr{
- font-size:16px;
+
+ .mon-arr {
+ font-size: 16px;
font-weight: bold;
- &.mon-arr-A{
- color:red;
+
+ &.mon-arr-A {
+ color: red;
}
- &.mon-arr-D{
- color:green;
+
+ &.mon-arr-D {
+ color: green;
}
}
}
- }
+ }
}
+