suojin
/
jonhon-mes-PDA
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PDA-安环管理-废水/废气巡检-页面对接

Browse Source
test
ysn 2 weeks ago
parent 06b8886855
commit 2b16285384
2 changed files with 515 additions and 458 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 177
      pages/sanitation/gasInspection.vue
  2. 204
      pages/sanitation/waterInspection.vue

177
pages/sanitation/gasInspection.vue
Unescape View File

@ -2,27 +2,41 @@
<ifrm ref="ifrm">
<!-- 安全巡检-->
<uni-forms ref="form" err-show-type="toast">
<uni-forms-item><input type="text" v-model="deviceRepairValue" @confirm="deviceRepairConfirm"
class="uni-input-border" placeholder="巡检点编码" /></uni-forms-item>
<uni-forms-item>
<input type="text" v-model="code" @confirm="deviceRepairConfirm" class="uni-input-border" placeholder="巡检点编码" />
</uni-forms-item>
</uni-forms>
<t-table>
<t-tr>
<t-td>巡检点编码</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.patrolRegister }}</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.insNum }}</t-td>
</t-tr>
<t-tr>
<t-td>巡检点位置</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.insSpot }}</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.insSite }}</t-td>
</t-tr>
<t-tr>
<t-td>状态</t-td>
<t-td>{{ deviceRepairObj.taskStatusText }}</t-td>
<t-td>
{{
deviceRepairObj.epInspectionPoint.taskStatus == 1
? "待检"
: deviceRepairObj.epInspectionPoint.taskStatus == 2
? "未检"
: deviceRepairObj.epInspectionPoint.taskStatus == 3
? "已检"
: ""
}}
</t-td>
</t-tr>
</t-table>
<view style="font-size: 36rpx;">巡检备注：</view>
<view style="font-size: 36rpx">巡检备注：</view>
<uni-forms ref="form" err-show-type="toast">
<uni-forms-item><uni-easyinput type="textarea" autoHeight v-model="deviceRepairObj.parMemo"
placeholder="请输入内容"></uni-easyinput></uni-forms-item>
<uni-forms-item>
<uni-easyinput type="textarea" autoHeight v-model="deviceRepairObj.epInspectionPoint.parMemo"
placeholder="请输入内容">
</uni-easyinput>
</uni-forms-item>
</uni-forms>
<view class="photoTitleSize">{{ uploader.length }}/9</view>
<view class="showImage">
@ -31,25 +45,31 @@
<image :src="item.imageUrl" @tap="previewImage(i)" />
</view>
<view class="view-icon">
<uni-icons type='trash' size="14" color='gray' @click="removeScene(item, i)"></uni-icons>
<uni-icons type="trash" size="14" color="gray" @click="removeScene(item, i)" />
</view>
</view>
<view class="view-center" v-if="uploader.length < 9">
<image src="../../static/images/photo.png" @click="chooseImage()"></image>
<image src="../../static/images/photo.png" @click="chooseImage()" />
</view>
</view>
<view class="buttonBox"><button class="button" type="primary"
:disabled="!(Object.keys(deviceRepairObj).length > 2)" @click="submitClick">提交</button></view>
<view class="buttonBox">
<button class="button" type="primary" :disabled="!(Object.keys(deviceRepairObj.epInspectionPoint).length > 2)"
@click="submitClick">
提交
</button>
</view>
</ifrm>
</template>
<script>
import ifrm from '@/pages/index/ifrm';
import tTable from '@/components/t-table/t-table.vue';
import tTh from '@/components/t-table/t-th.vue';
import tTr from '@/components/t-table/t-tr.vue';
import tTd from '@/components/t-table/t-td.vue';
import scan from '../../mixin/scan.js';
import ifrm from "@/pages/index/ifrm";
import tTable from "@/components/t-table/t-table.vue";
import tTh from "@/components/t-table/t-th.vue";
import tTr from "@/components/t-table/t-tr.vue";
import tTd from "@/components/t-table/t-td.vue";
import scan from "../../mixin/scan.js";
import {
options
} from '@/http/config.js';
export default {
mixins: [scan],
components: {
@ -57,67 +77,71 @@
tTable,
tTh,
tTr,
tTd
tTd,
},
data() {
return {
deviceRepairValue: '',
code: "",
deviceRepairObj: {
epInspectionPoint: {},
parMemo: ''
epInspectionPoint: {
parMemo: "",
},
},
uploader: []
uploader: [],
};
},
methods: {
chooseImage: async function () {
if (!this.deviceRepairObj.epiId) {
if (!this.deviceRepairObj.epInspectionPoint.epcId) {
return uni.showToast({
title: '请先查询巡检点',
icon: 'none'
});
}
uni.chooseImage({
// sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
count: 9,
// sizeType: ['compressed'],
// sourceType: ['album', 'camera'],
success: (res) => {
uni.showLoading({
title: '上传中，请稍候'
});
var tempFilePaths = res.tempFilePaths;
for (var i = 0; i < tempFilePaths.length; i++) {
const file = res.tempFiles[i];
this.$uploadUtil.upload(file, {
theId: this.deviceRepairObj.epiId,
theTag: 'EpPatrolInspection',
subTag: 'appDoc'
}, tempFilePaths[i]).then((upId) => {
res.tempFilePaths.forEach(filePath => {
uni.uploadFile({
url: options.baseURL + '/blade-resource/oss/endpoint/put-file-attach',
filePath: filePath,
name: 'file',
header: {
'token': 'bearer ' + uni.getStorageSync('accessToken'),
'Blade-Auth': 'bearer ' + uni.getStorageSync('accessToken'),
'Blade-Requested-With': 'BladeHttpRequest'
},
success: (uploadRes) => {
uni.hideLoading();
//展示图片
uni.showToast({ title: '上传成功' });
this.uploader.push({
upId: upId,
imageUrl: file.path
upId: JSON.parse(uploadRes.data).data.attachId,
imageUrl: JSON.parse(uploadRes.data).data.link
});
})
}
},
complete() {
uni.hideLoading();
fail: (err) => {
console.error('❌ 上传失败', err);
uni.showToast({ title: '上传失败', icon: 'none' });
}
})
});
});
},
});
},
previewImage: function (index) {
var imags = [];
this.uploader.forEach(item => {
this.uploader.forEach((item) => {
imags.push(item.imageUrl);
})
});
uni.previewImage({
current: index,
urls: imags
})
urls: imags,
});
},
removeScene(item, i) {
@ -126,10 +150,10 @@
// //删除附件记录
this.$uploadUtil.asyncDelete(item.upId).then((data) => {
uni.showToast({
title: '删除成功',
icon: 'none'
title: "删除成功",
icon: "none",
});
});
})
// this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
},
@ -140,52 +164,48 @@
this.getBarCode(e.target.value);
},
getData(code) {
this.deviceRepairValue = code;
this.$ajax.request({
url: 'pdaLoad/getInspectionBySan',
method: 'POST',
data: {
this.code = code;
this.$u.api
.getInspectionBySan({
code: code,
eipType: 2
},
success: data => {
if (data == null) {
eipType: 2,
})
.then((res) => {
if (res.data == null) {
return uni.showToast({
icon: "none",
title: '此巡检位置暂无任务'
title: "此巡检位置暂无任务",
});
}
this.deviceRepairValue = '';
this.deviceRepairObj = data;
this.code = "";
this.deviceRepairObj.epInspectionPoint = res.data;
uni.showToast({
title: '数据获取成功'
title: "数据获取成功",
});
}
});
},
submitClick() {
this.$ajax.request({
url: 'pdaSave/savePatrolIns',
method: 'POST',
data: this.deviceRepairObj,
success: data => {
this.$u.api
.savePatrolIns({
...this.deviceRepairObj.epInspectionPoint,
path: this.uploader.map((item) => item.imageUrl).join(','),
})
.then((data) => {
uni.showToast({
title: '保存成功'
title: "保存成功",
});
this.deviceRepairValue = '';
this.code = "";
this.deviceRepairObj = {
epInspectionPoint: {},
parMemo: ''
};
this.uploader = []
}
this.uploader = [];
});
}
},
},
onNavigationBarButtonTap(btn) {
this.$refs.ifrm.topMenuClick(btn);
},
onShow() {}
onShow() { },
};
</script>
@ -209,7 +229,6 @@
margin-left: -20rpx;
.showImage-for {
display: flex;
flex-direction: column;
width: 200rpx;

204
pages/sanitation/waterInspection.vue
Unescape View File

@ -2,27 +2,51 @@
<ifrm ref="ifrm">
<!-- 安全巡检-->
<uni-forms ref="form" err-show-type="toast">
<uni-forms-item><input type="text" v-model="deviceRepairValue" @confirm="deviceRepairConfirm"
class="uni-input-border" placeholder="巡检点编码" /></uni-forms-item>
<uni-forms-item>
<input
type="text"
v-model="code"
@confirm="deviceRepairConfirm"
class="uni-input-border"
placeholder="巡检点编码"
/>
</uni-forms-item>
</uni-forms>
<t-table>
<t-tr>
<t-td>巡检点编码</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.patrolRegister }}</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.insNum }}</t-td>
</t-tr>
<t-tr>
<t-td>巡检点位置</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.insSpot }}</t-td>
<t-td>{{ deviceRepairObj.epInspectionPoint.insSite }}</t-td>
</t-tr>
<t-tr>
<t-td>状态</t-td>
<t-td>{{ deviceRepairObj.taskStatusText }}</t-td>
<t-td>
{{
deviceRepairObj.epInspectionPoint.taskStatus == 1
? "待检"
: deviceRepairObj.epInspectionPoint.taskStatus == 2
? "未检"
: deviceRepairObj.epInspectionPoint.taskStatus == 3
? "已检"
: ""
}}
</t-td>
</t-tr>
</t-table>
<view style="font-size: 36rpx;">巡检备注：</view>
<view style="font-size: 36rpx">巡检备注：</view>
<uni-forms ref="form" err-show-type="toast">
<uni-forms-item><uni-easyinput type="textarea" autoHeight v-model="deviceRepairObj.parMemo"
placeholder="请输入内容"></uni-easyinput></uni-forms-item>
<uni-forms-item>
<uni-easyinput
type="textarea"
autoHeight
v-model="deviceRepairObj.epInspectionPoint.parMemo"
placeholder="请输入内容"
>
</uni-easyinput>
</uni-forms-item>
</uni-forms>
<view class="photoTitleSize">{{ uploader.length }}/9</view>
<view class="showImage">
@ -31,25 +55,38 @@
<image :src="item.imageUrl" @tap="previewImage(i)" />
</view>
<view class="view-icon">
<uni-icons type='trash' size="14" color='gray' @click="removeScene(item, i)"></uni-icons>
<uni-icons
type="trash"
size="14"
color="gray"
@click="removeScene(item, i)"
/>
</view>
</view>
<view class="view-center" v-if="uploader.length < 9">
<image src="../../static/images/photo.png" @click="chooseImage()"></image>
<image src="../../static/images/photo.png" @click="chooseImage()" />
</view>
</view>
<view class="buttonBox"><button class="button" type="primary"
:disabled="!(Object.keys(deviceRepairObj).length > 2)" @click="submitClick">提交</button></view>
<view class="buttonBox">
<button
class="button"
type="primary"
:disabled="!(Object.keys(deviceRepairObj.epInspectionPoint).length > 2)"
@click="submitClick"
>
提交
</button>
</view>
</ifrm>
</template>
<script>
import ifrm from '@/pages/index/ifrm';
import tTable from '@/components/t-table/t-table.vue';
import tTh from '@/components/t-table/t-th.vue';
import tTr from '@/components/t-table/t-tr.vue';
import tTd from '@/components/t-table/t-td.vue';
import scan from '../../mixin/scan.js';
import ifrm from "@/pages/index/ifrm";
import tTable from "@/components/t-table/t-table.vue";
import tTh from "@/components/t-table/t-th.vue";
import tTr from "@/components/t-table/t-tr.vue";
import tTd from "@/components/t-table/t-td.vue";
import scan from "../../mixin/scan.js";
import { options } from "@/http/config.js";
export default {
mixins: [scan],
components: {
@ -57,67 +94,73 @@
tTable,
tTh,
tTr,
tTd
tTd,
},
data() {
return {
deviceRepairValue: '',
code: "",
deviceRepairObj: {
epInspectionPoint: {},
parMemo: ''
epInspectionPoint: {
parMemo: "",
},
uploader: []
},
uploader: [],
};
},
methods: {
chooseImage: async function () {
if (!this.deviceRepairObj.epiId) {
if (!this.deviceRepairObj.epInspectionPoint.epcId) {
return uni.showToast({
title: '请先查询巡检点',
icon: 'none'
title: "请先查询巡检点",
icon: "none",
});
}
uni.chooseImage({
// sourceType: ['album','camera'], //album 从相册选图，camera 使用相机，默认二者都有
// sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
count: 9,
// sizeType: ['compressed'],
// sourceType: ['album', 'camera'],
success: (res) => {
uni.showLoading({
title: '上传中，请稍候'
title: "上传中，请稍候",
});
var tempFilePaths = res.tempFilePaths;
for (var i = 0; i < tempFilePaths.length; i++) {
const file = res.tempFiles[i];
this.$uploadUtil.upload(file, {
theId: this.deviceRepairObj.epiId,
theTag: 'EpPatrolInspection',
subTag: 'appDoc'
}, tempFilePaths[i]).then((upId) => {
res.tempFilePaths.forEach((filePath) => {
uni.uploadFile({
url:
options.baseURL +
"/blade-resource/oss/endpoint/put-file-attach",
filePath: filePath,
name: "file",
header: {
token: "bearer " + uni.getStorageSync("accessToken"),
"Blade-Auth": "bearer " + uni.getStorageSync("accessToken"),
"Blade-Requested-With": "BladeHttpRequest",
},
success: (uploadRes) => {
uni.hideLoading();
//展示图片
uni.showToast({ title: "上传成功" });
this.uploader.push({
upId: upId,
imageUrl: file.path
upId: JSON.parse(uploadRes.data).data.attachId,
imageUrl: JSON.parse(uploadRes.data).data.link,
});
})
}
},
complete() {
uni.hideLoading();
}
})
fail: (err) => {
console.error("❌ 上传失败", err);
uni.showToast({ title: "上传失败", icon: "none" });
},
});
});
},
});
},
previewImage: function (index) {
var imags = [];
this.uploader.forEach(item => {
this.uploader.forEach((item) => {
imags.push(item.imageUrl);
})
});
uni.previewImage({
current: index,
urls: imags
})
urls: imags,
});
},
removeScene(item, i) {
@ -126,10 +169,10 @@
// //删除附件记录
this.$uploadUtil.asyncDelete(item.upId).then((data) => {
uni.showToast({
title: '删除成功',
icon: 'none'
title: "删除成功",
icon: "none",
});
});
})
// this.upIdList.splice(this.upIdList.findIndex((upId) => (upId === item.upId)), 1);
},
@ -140,52 +183,48 @@
this.getBarCode(e.target.value);
},
getData(code) {
this.deviceRepairValue = code;
this.$ajax.request({
url: 'pdaLoad/getInspectionBySan',
method: 'POST',
data: {
this.code = code;
this.$u.api
.getInspectionBySan({
code: code,
eipType: 1
},
success: data => {
if (data == null) {
eipType: 1,
})
.then((res) => {
if (res.data == null) {
return uni.showToast({
icon: "none",
title: '此巡检位置暂无任务'
title: "此巡检位置暂无任务",
});
}
this.deviceRepairValue = '';
this.deviceRepairObj = data;
this.code = "";
this.deviceRepairObj.epInspectionPoint = res.data;
uni.showToast({
title: '数据获取成功'
title: "数据获取成功",
});
}
});
},
submitClick() {
this.$ajax.request({
url: 'pdaSave/savePatrolIns',
method: 'POST',
data: this.deviceRepairObj,
success: data => {
this.$u.api
.savePatrolIns({
...this.deviceRepairObj.epInspectionPoint,
path: this.uploader.map((item) => item.imageUrl).join(","),
})
.then((data) => {
uni.showToast({
title: '保存成功'
title: "保存成功",
});
this.deviceRepairValue = '';
this.code = "";
this.deviceRepairObj = {
epInspectionPoint: {},
parMemo: ''
};
this.uploader = []
}
this.uploader = [];
});
}
},
},
onNavigationBarButtonTap(btn) {
this.$refs.ifrm.topMenuClick(btn);
},
onShow() {}
onShow() {},
};
</script>
@ -209,7 +248,6 @@
margin-left: -20rpx;
.showImage-for {
display: flex;
flex-direction: column;
width: 200rpx;

Write Preview
Loading…
Cancel
Save