|
|
@@ -22,10 +22,25 @@
|
|
|
style="width:32%;margin:0" @click="getAdd">新增</u-button>
|
|
|
<u-button icon="eye" type="primary" size="small" style="width:32%;margin:0"
|
|
|
@click="getGasIdentify">识别</u-button>
|
|
|
- <u-button icon="trash" type="primary" size="small" style="width:32%;margin:0">删除</u-button>
|
|
|
+ <u-button icon="trash" type="primary" size="small" style="width:32%;margin:0"
|
|
|
+ @click="delSb">删除</u-button>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="bot-gas-list">
|
|
|
+ <!-- 识别列表 -->
|
|
|
+ <view class="sb-list" v-if="indexList.length != 0">
|
|
|
+ <u-list>
|
|
|
+ <u-list-item v-for="(item, index) in indexList" :key="index">
|
|
|
+ <u-cell :title="item['检查地点']">
|
|
|
+ <view slot="value" class="u-slot-title">
|
|
|
+ <u-tag text="选择" plain size="mini" type="warning" @click="choiceSb(item)">
|
|
|
+ </u-tag>
|
|
|
+ </view>
|
|
|
+ </u-cell>
|
|
|
+ </u-list-item>
|
|
|
+ </u-list>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view :class="indexList.length != 0 ? 'bot-gas-list1' : 'bot-gas-list'">
|
|
|
<view class="top-title">
|
|
|
<view style="font-weight: bold;">瓦斯填报列表</view>
|
|
|
</view>
|
|
|
@@ -90,16 +105,15 @@
|
|
|
<uni-data-select placeholder="请选择检测次数" align="center" :clear="true" v-model="formState.count"
|
|
|
:localdata="rangeCount" @change="changeCount"></uni-data-select>
|
|
|
</view>
|
|
|
- <view class="dialog-item" v-if="!nfcShow">
|
|
|
+ <view class="dialog-item">
|
|
|
<text class="dialog-label">煤层工作面：</text>
|
|
|
<uni-data-select placeholder="请选择煤层工作面" align="center" :clear="true" v-model="formState.mcgzm"
|
|
|
:localdata="rangeMcgzm" @change="changeMc"></uni-data-select>
|
|
|
</view>
|
|
|
<view class="dialog-item">
|
|
|
<text class="dialog-label">检测地点：</text>
|
|
|
- <uni-data-select v-if="!nfcShow" placeholder="请选择检测地点" align="center" :clear="true"
|
|
|
- v-model="formState.jcdd" :localdata="rangeJcdd" @change="changeJc"></uni-data-select>
|
|
|
- <u--input v-else v-model="formState.jcdd" disabled inputAlign="center"></u--input>
|
|
|
+ <uni-data-select placeholder="请选择检测地点" align="center" :clear="true" v-model="formState.jcdd"
|
|
|
+ :localdata="rangeJcdd" @change="changeJc"></uni-data-select>
|
|
|
</view>
|
|
|
<view class="dialog-item" @click="getChangeTime">
|
|
|
<text class="dialog-label">检测时间：</text>
|
|
|
@@ -187,24 +201,25 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
-
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import api from "@/api/api";
|
|
|
import moment from 'moment'
|
|
|
-import testNfc from "@/common/util/hexiii-nfc.js"
|
|
|
+// import testNfc from "@/common/util/hexiii-nfc.js"
|
|
|
import { mapGetters } from "vuex";
|
|
|
+import configService from '@/common/service/config.service.js'
|
|
|
export default {
|
|
|
name: 'gasFill',
|
|
|
props: {},
|
|
|
|
|
|
data() {
|
|
|
return {
|
|
|
+ indexList: [],//识别数据
|
|
|
+ indexParam: {},//当前选中识别的数据
|
|
|
imageSrc: '',
|
|
|
imageSrcList: [],
|
|
|
- nfcShow: true,//是否使用NFC
|
|
|
isDisabled: false,
|
|
|
isStatus: '',
|
|
|
deviceId: '',
|
|
|
@@ -282,25 +297,85 @@ export default {
|
|
|
//获取图片识别数据
|
|
|
getGasIdentify() {
|
|
|
let that = this
|
|
|
- const formData = new FormData();
|
|
|
- formData.append('img', that.imageSrcList[0]);
|
|
|
- formData.append('user', that.username);
|
|
|
- new Promise((resolve, reject) => {
|
|
|
- api
|
|
|
- .gasIdentify(formData)
|
|
|
- .then((response) => {
|
|
|
- if (response.data.code == 200) {
|
|
|
- let data = response.data.result
|
|
|
- console.log(data, '图片识别数据--------')
|
|
|
- } else {
|
|
|
- reject(response);
|
|
|
- }
|
|
|
- })
|
|
|
- .catch((error) => {
|
|
|
- console.log("catch===>response", response);
|
|
|
- reject(error);
|
|
|
- });
|
|
|
- });
|
|
|
+ // let formData = new FormData();
|
|
|
+ // formData.append('img', that.imageSrcList[0]);
|
|
|
+ // formData.append('user', that.username);
|
|
|
+ // console.log(that.imageSrcList,formData,'111')
|
|
|
+ // new Promise((resolve, reject) => {
|
|
|
+ // api
|
|
|
+ // .gasIdentify({img: that.imageSrcList[0],user:that.username})
|
|
|
+ // .then((response) => {
|
|
|
+ // if (response.data.code == 200) {
|
|
|
+ // let data = response.data.result
|
|
|
+ // console.log(data, '图片识别数据--------')
|
|
|
+ // } else {
|
|
|
+ // reject(response);
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // .catch((error) => {
|
|
|
+ // console.log("catch===>response", response);
|
|
|
+ // reject(error);
|
|
|
+ // });
|
|
|
+ // });
|
|
|
+ let apiUrl = configService.apiUrl;
|
|
|
+ uni.request({
|
|
|
+ url: `${apiUrl}/gasIdentify`,
|
|
|
+ data: {
|
|
|
+ img: that.imageSrcList[0].name,
|
|
|
+ user:that.username
|
|
|
+ },
|
|
|
+ method: 'POST', // 参数类型
|
|
|
+ header: {
|
|
|
+ "Content-Type": "application/x-www-form-urlencoded"
|
|
|
+ }, // 请求头
|
|
|
+ success: (res) => {
|
|
|
+ console.log(res, 'hhhhhhhhhhhhh')
|
|
|
+ },
|
|
|
+ complete: () => { },
|
|
|
+ fail: (res) => { }
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
+ // this.indexList = [
|
|
|
+ // {
|
|
|
+ // "日期": "2025年3月5日",
|
|
|
+ // "班次": "早班",
|
|
|
+ // "检查地点": "22106综采工作面设备列车",
|
|
|
+ // "检查时间": "0:04",
|
|
|
+ // "CH4%": "0.00",
|
|
|
+ // "CO2%": "0.04",
|
|
|
+ // "O2%": "20.9",
|
|
|
+ // "CO(ppm)": "1",
|
|
|
+ // "温度(℃)": "17",
|
|
|
+ // "检查人": "xxx"
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "日期": "2025年3月5日",
|
|
|
+ // "班次": "早班",
|
|
|
+ // "检查地点": "22106综采工作面设备列车",
|
|
|
+ // "检查时间": "8:13",
|
|
|
+ // "CH4%": "0.00",
|
|
|
+ // "CO2%": "0.04",
|
|
|
+ // "O2%": "20.9",
|
|
|
+ // "CO(ppm)": "1",
|
|
|
+ // "温度(℃)": "17",
|
|
|
+ // "检查人": "xxx"
|
|
|
+ // },
|
|
|
+ // {
|
|
|
+ // "日期": "2025年3月5日",
|
|
|
+ // "班次": "早班",
|
|
|
+ // "检查地点": "22106综采工作面设备列车",
|
|
|
+ // "检查时间": "16:15",
|
|
|
+ // "CH4%": "0.00",
|
|
|
+ // "CO2%": "0.04",
|
|
|
+ // "O2%": "20.9",
|
|
|
+ // "CO(ppm)": "1",
|
|
|
+ // "温度(℃)": "17",
|
|
|
+ // "检查人": "xxx"
|
|
|
+ // }
|
|
|
+
|
|
|
+
|
|
|
+ // ]
|
|
|
},
|
|
|
// 选择图片的方法
|
|
|
chooseImage() {
|
|
|
@@ -316,6 +391,17 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ //进行选择识别
|
|
|
+ choiceSb(item) {
|
|
|
+ console.log(item, '选择识别---')
|
|
|
+ this.indexParam = Object.assign({}, item)
|
|
|
+ this.indexList = []
|
|
|
+ },
|
|
|
+ //删除
|
|
|
+ delSb() {
|
|
|
+ this.indexList = []
|
|
|
+ this.indexParam = {}
|
|
|
+ },
|
|
|
//班次下拉选项切换
|
|
|
changeBc(e) {
|
|
|
let that = this
|
|
|
@@ -601,24 +687,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '早班' && that.formState.count == '第二次') {
|
|
|
@@ -643,24 +729,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '中班' && that.formState.count == '第一次') {
|
|
|
@@ -685,24 +771,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '中班' && that.formState.count == '第二次') {
|
|
|
@@ -727,24 +813,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '夜班' && that.formState.count == '第一次') {
|
|
|
@@ -769,24 +855,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '夜班' && that.formState.count == '第二次') {
|
|
|
@@ -811,24 +897,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
}
|
|
|
@@ -1171,24 +1257,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '早班' && that.formState.count == '第二次') {
|
|
|
@@ -1213,24 +1299,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '中班' && that.formState.count == '第一次') {
|
|
|
@@ -1255,24 +1341,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '中班' && that.formState.count == '第二次') {
|
|
|
@@ -1297,24 +1383,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '夜班' && that.formState.count == '第一次') {
|
|
|
@@ -1339,24 +1425,24 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
} else if (that.formState.bc == '夜班' && that.formState.count == '第二次') {
|
|
|
@@ -1381,48 +1467,48 @@ export default {
|
|
|
}
|
|
|
that.isDisabled = true
|
|
|
} else {
|
|
|
- that.formState = {
|
|
|
- id: that.formState.id,
|
|
|
- bc: that.formState.bc,
|
|
|
- count: that.formState.count,
|
|
|
- jcdd: that.formState.jcdd,
|
|
|
- jcy: that.formState.jcy,
|
|
|
- time: that.formState.time,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- temp: '',
|
|
|
- mcgzm: that.formState.mcgzm,
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: that.formState.id,
|
|
|
+ // bc: that.formState.bc,
|
|
|
+ // count: that.formState.count,
|
|
|
+ // jcdd: that.formState.jcdd,
|
|
|
+ // jcy: that.formState.jcy,
|
|
|
+ // time: that.formState.time,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // temp: '',
|
|
|
+ // mcgzm: that.formState.mcgzm,
|
|
|
+ // }
|
|
|
that.isDisabled = false
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
that.isDisabled = false
|
|
|
that.saveShowList = {}
|
|
|
- that.formState = {
|
|
|
- id: '',
|
|
|
- bc: that.formState.bc || '',
|
|
|
- count: that.formState.count || '',
|
|
|
- jcdd: that.formState.jcdd || '',
|
|
|
- mcgzm: that.formState.mcgzm || '',
|
|
|
- jcy: that.formState.jcy || '',
|
|
|
- time: that.formState.time,
|
|
|
- tbrq: that.formState.tbrq,
|
|
|
- ch4: '',
|
|
|
- co2: '',
|
|
|
- co: '',
|
|
|
- o2: '',
|
|
|
- jw: '',
|
|
|
- gw: '',
|
|
|
- bxy: '',
|
|
|
- temp: '',
|
|
|
- }
|
|
|
+ // that.formState = {
|
|
|
+ // id: '',
|
|
|
+ // bc: that.formState.bc || '',
|
|
|
+ // count: that.formState.count || '',
|
|
|
+ // jcdd: that.formState.jcdd || '',
|
|
|
+ // mcgzm: that.formState.mcgzm || '',
|
|
|
+ // jcy: that.formState.jcy || '',
|
|
|
+ // time: that.formState.time,
|
|
|
+ // tbrq: that.formState.tbrq,
|
|
|
+ // ch4: '',
|
|
|
+ // co2: '',
|
|
|
+ // co: '',
|
|
|
+ // o2: '',
|
|
|
+ // jw: '',
|
|
|
+ // gw: '',
|
|
|
+ // bxy: '',
|
|
|
+ // temp: '',
|
|
|
+ // }
|
|
|
}
|
|
|
} else {
|
|
|
reject(response);
|
|
|
@@ -1568,14 +1654,32 @@ export default {
|
|
|
//瓦斯新增
|
|
|
getAdd() {
|
|
|
let that = this
|
|
|
- that.isShowAdd = true
|
|
|
that.isStatus = 'add'
|
|
|
- that.formState.jcy = this.username
|
|
|
- if (that.nfcShow) {
|
|
|
- testNfc.listenNFCStatus()
|
|
|
- testNfc.readData();
|
|
|
- // //根据NFC读取数据获取监测地点信息
|
|
|
- // that.getCardLists(ids)
|
|
|
+ that.isShowAdd = true
|
|
|
+ // that.formState.jcy = this.username
|
|
|
+ // if (that.nfcShow) {
|
|
|
+ // testNfc.listenNFCStatus()
|
|
|
+ // testNfc.readData();
|
|
|
+ // // //根据NFC读取数据获取监测地点信息
|
|
|
+ // // that.getCardLists(ids)
|
|
|
+ // }
|
|
|
+ that.formState = {
|
|
|
+ id: '',
|
|
|
+ bc: that.indexParam['班次'],
|
|
|
+ count: '',
|
|
|
+ jcdd: '',
|
|
|
+ jcy: that.indexParam['检查人'],
|
|
|
+ time: '',
|
|
|
+ ch4: that.indexParam['CH4%'],
|
|
|
+ co2: that.indexParam['CO2% '],
|
|
|
+ co: that.indexParam['CO(ppm)'],
|
|
|
+ o2: that.indexParam['O2%'],
|
|
|
+ jw: '',
|
|
|
+ gw: '',
|
|
|
+ bxy: '',
|
|
|
+ tbrq: '',
|
|
|
+ temp: that.indexParam['温度(℃)'],
|
|
|
+ mcgzm: '',
|
|
|
}
|
|
|
},
|
|
|
getAddSave() {
|
|
|
@@ -2183,8 +2287,8 @@ export default {
|
|
|
count: '',
|
|
|
jcdd: '',
|
|
|
mcgzm: '',
|
|
|
- jcy: this.username,
|
|
|
- time: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
|
|
|
+ jcy: '',
|
|
|
+ time: '',
|
|
|
ch4: '',
|
|
|
co2: '',
|
|
|
co: '',
|
|
|
@@ -2192,7 +2296,7 @@ export default {
|
|
|
jw: '',
|
|
|
gw: '',
|
|
|
bxy: '',
|
|
|
- tbrq: moment(new Date()).format('YYYY-MM-DD'),
|
|
|
+ tbrq: '',
|
|
|
temp: '',
|
|
|
}
|
|
|
this.isRule = true
|
|
|
@@ -2377,6 +2481,16 @@ export default {
|
|
|
margin-bottom: 2px;
|
|
|
}
|
|
|
|
|
|
+ .sb-list {
|
|
|
+ width: 100%;
|
|
|
+ height: 150px;
|
|
|
+ padding: 10px;
|
|
|
+ box-sizing: border-box;
|
|
|
+ background-color: #FFF;
|
|
|
+ margin-bottom: 2px;
|
|
|
+ overflow-y: auto;
|
|
|
+ }
|
|
|
+
|
|
|
.bot-gas-list {
|
|
|
width: 100%;
|
|
|
height: calc(100% - 94px);
|
|
|
@@ -2387,6 +2501,16 @@ export default {
|
|
|
overflow-y: auto;
|
|
|
}
|
|
|
|
|
|
+ .bot-gas-list1 {
|
|
|
+ width: 100%;
|
|
|
+ height: calc(100% - 244px);
|
|
|
+ padding: 10px;
|
|
|
+ box-sizing: border-box;
|
|
|
+ background-color: #FFF;
|
|
|
+ margin-bottom: 2px;
|
|
|
+ overflow-y: auto;
|
|
|
+ }
|
|
|
+
|
|
|
.dialog-btn {
|
|
|
display: flex;
|
|
|
width: 100%;
|
