|
|
@@ -6,7 +6,7 @@
|
|
|
>
|
|
|
<image
|
|
|
src="../../static/ld.png"
|
|
|
- style="width: 70%; height: 40rpx"
|
|
|
+ style="width: 60%; height: 30rpx"
|
|
|
mode=""
|
|
|
></image>
|
|
|
<image
|
|
|
@@ -76,7 +76,11 @@
|
|
|
>
|
|
|
<view class="d-flex a-center">
|
|
|
<image
|
|
|
- :src="recordList(item.type)[1]"
|
|
|
+ :src="
|
|
|
+ role === 1
|
|
|
+ ? recordList(item.type)[1]
|
|
|
+ : recordList(item.type)[4]
|
|
|
+ "
|
|
|
style="width: 29rpx; height: 24rpx"
|
|
|
mode=""
|
|
|
></image>
|
|
|
@@ -109,13 +113,19 @@
|
|
|
>
|
|
|
<view
|
|
|
class="d-flex a-center u-m-b-10 f-22"
|
|
|
- @click.stop="showInfo(iten.versionId, item.type, iten.name)"
|
|
|
+ @click.stop="
|
|
|
+ showInfo(iten.versionId, item.type, iten.name, iten.creatTime)
|
|
|
+ "
|
|
|
v-for="(iten, indey) in item.recordList"
|
|
|
:key="indey"
|
|
|
>
|
|
|
<image
|
|
|
class="d-flex flex-shrink"
|
|
|
- :src="recordList(item.type)[2]"
|
|
|
+ :src="
|
|
|
+ role === 1
|
|
|
+ ? recordList(item.type)[2]
|
|
|
+ : recordList(item.type)[5]
|
|
|
+ "
|
|
|
style="width: 21rpx; height: 30rpx"
|
|
|
mode=""
|
|
|
></image>
|
|
|
@@ -516,8 +526,8 @@
|
|
|
<u-icon name="close-circle-fill" color="#A9A3D2" size="30"></u-icon>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view slot="default" class="u-p-b-10 f-25">
|
|
|
- <u-row class="u-m-b-20">
|
|
|
+ <view slot="default" class="u-p-b-10 f-20">
|
|
|
+ <u-row class="u-m-b-15">
|
|
|
<u-col :offset="1" :span="3">
|
|
|
<text>设备编号: {{ headerData.deviceNo }}</text>
|
|
|
</u-col>
|
|
|
@@ -528,17 +538,17 @@
|
|
|
<text>型号: {{ headerData.deviceType }}</text>
|
|
|
</u-col>
|
|
|
</u-row>
|
|
|
- <u-row class="u-m-b-20">
|
|
|
- <u-col :offset="1" :span="4">
|
|
|
+ <u-row class="u-m-b-15">
|
|
|
+ <u-col :offset="1" :span="3">
|
|
|
责任人: <text>{{ headerData.oneName }}</text
|
|
|
><text v-if="headerData.twoName">,{{ headerData.twoName }}</text>
|
|
|
</u-col>
|
|
|
<u-col :span="3">
|
|
|
- <text>日期: {{ headerData.month }}</text></u-col
|
|
|
+ <text>日期: {{ headerData.month + "月份" }}</text></u-col
|
|
|
>
|
|
|
</u-row>
|
|
|
- <u-row class="u-m-b-20">
|
|
|
- <u-col :offset="1" :span="4">
|
|
|
+ <u-row class="u-m-b-15">
|
|
|
+ <u-col :offset="1" :span="3">
|
|
|
<text>编号: {{ headerData.nos }}</text>
|
|
|
</u-col>
|
|
|
<u-col :span="7">
|
|
|
@@ -577,6 +587,9 @@ import gFile from "../../static/gFile.png";
|
|
|
import gItem from "../../static/g-item.png";
|
|
|
import yFile from "../../static/yFile.png";
|
|
|
import yItem from "../../static/y-item.png";
|
|
|
+import zFile from "../../static/zFile.png";
|
|
|
+import zItem from "../../static/zItem.png";
|
|
|
+
|
|
|
import djButton from "../../components/dj-button.vue";
|
|
|
import { mapMutations } from "vuex";
|
|
|
import {
|
|
|
@@ -604,6 +617,7 @@ import {
|
|
|
patrolScan,
|
|
|
dutyPatrolScan,
|
|
|
} from "@/common/api.js";
|
|
|
+import colorGradient from "../../uview-ui/libs/function/colorGradient";
|
|
|
export default {
|
|
|
components: {
|
|
|
djButton,
|
|
|
@@ -627,6 +641,8 @@ export default {
|
|
|
sjRecordId: "",
|
|
|
// 当前type
|
|
|
sjRecordType: 1,
|
|
|
+ // creatime
|
|
|
+ creatime: "",
|
|
|
// 当前频率id
|
|
|
sjRecordPlId: "",
|
|
|
// 当前评率名
|
|
|
@@ -726,11 +742,32 @@ export default {
|
|
|
recordList() {
|
|
|
return function (index) {
|
|
|
if (index === 1) {
|
|
|
- return ["待响应点检保养表", yFile, yItem, "待巡视点检保养表"];
|
|
|
+ return [
|
|
|
+ "待响应点检保养表",
|
|
|
+ yFile,
|
|
|
+ yItem,
|
|
|
+ "待巡视点检保养表",
|
|
|
+ yFile,
|
|
|
+ yItem,
|
|
|
+ ];
|
|
|
} else if (index === 2) {
|
|
|
- return ["处理中点检保养表", bFile, bItem, "已巡视点检保养表"];
|
|
|
+ return [
|
|
|
+ "处理中点检保养表",
|
|
|
+ bFile,
|
|
|
+ bItem,
|
|
|
+ "已巡视点检保养表",
|
|
|
+ gFile,
|
|
|
+ gItem,
|
|
|
+ ];
|
|
|
} else {
|
|
|
- return ["已完成点检保养表", gFile, gItem, "异常于停用点检保养表"];
|
|
|
+ return [
|
|
|
+ "已完成点检保养表",
|
|
|
+ gFile,
|
|
|
+ gItem,
|
|
|
+ "异常于停用点检保养表",
|
|
|
+ zFile,
|
|
|
+ zItem,
|
|
|
+ ];
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
@@ -830,13 +867,16 @@ export default {
|
|
|
this.rightData = info;
|
|
|
}
|
|
|
},
|
|
|
- showInfo(id, type, name) {
|
|
|
+ showInfo(id, type, name, creatTime) {
|
|
|
// 首件: 记录当前记录表id
|
|
|
this.sjRecordId = id;
|
|
|
// title名
|
|
|
this.recordName = name;
|
|
|
// 类型
|
|
|
this.fcType = type;
|
|
|
+ // 创建时间 (巡检人)
|
|
|
+ console.log(creatTime);
|
|
|
+ this.creatime = creatTime;
|
|
|
// 角色 1检查人 0巡检人
|
|
|
this.infoStatus = this.role ? 2 : 4;
|
|
|
if (this.role) {
|
|
|
@@ -847,12 +887,13 @@ export default {
|
|
|
},
|
|
|
// 巡检详情
|
|
|
patrolWaitInfo() {
|
|
|
- this.getPatrolWaitDetails(this.fcType, this.sjRecordId);
|
|
|
+ this.getPatrolWaitDetails(this.fcType, this.sjRecordId, this.creatime);
|
|
|
},
|
|
|
- getPatrolWaitDetails(type, id) {
|
|
|
+ getPatrolWaitDetails(type, id, creatime) {
|
|
|
patrolWaitDetails({
|
|
|
status: type,
|
|
|
versionId: id,
|
|
|
+ localDateTime: creatime,
|
|
|
}).then((res) => {
|
|
|
let data = res.data;
|
|
|
if (res.status === "20000") {
|
|
|
@@ -1343,39 +1384,49 @@ export default {
|
|
|
return platform;
|
|
|
},
|
|
|
sao() {
|
|
|
- uni.scanCode({
|
|
|
- onlyFromCamera: true,
|
|
|
- success: function (res) {
|
|
|
- console.log(res);
|
|
|
- let no = res
|
|
|
- if (!this.role) {
|
|
|
- patrolScan({ id: no }).then((res) => {
|
|
|
- if (res.status === "20000") {
|
|
|
- let data = res.data;
|
|
|
- this.getPatrolWaitDetails(data.status, data.versionId);
|
|
|
- } else {
|
|
|
- this.hintCase(res.message);
|
|
|
- }
|
|
|
- });
|
|
|
- } else {
|
|
|
- dutyPatrolScan(no).then((res) => {
|
|
|
- if (res.status === "20000") {
|
|
|
- let data = res.data;
|
|
|
- dutyPlanInfo({
|
|
|
- versionId: data.versionId,
|
|
|
- type: data.type,
|
|
|
- }).then((res) => {
|
|
|
- this.infoStatus = 2;
|
|
|
- this.procedureRes = res.data.procedureRes;
|
|
|
- this.everyId = res.data.everyId;
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.hintCase(res.message);
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- },
|
|
|
- });
|
|
|
+ try {
|
|
|
+ uni.scanCode({
|
|
|
+ onlyFromCamera: true,
|
|
|
+ success: function (res) {
|
|
|
+ let no = res;
|
|
|
+ if (!this.role) {
|
|
|
+ patrolScan({ id: no }).then((res) => {
|
|
|
+ if (res.status === "20000") {
|
|
|
+ let data = res.data;
|
|
|
+ this.getPatrolWaitDetails(
|
|
|
+ data.status,
|
|
|
+ data.versionId,
|
|
|
+ data.localDateTime
|
|
|
+ );
|
|
|
+ } else {
|
|
|
+ this.hintCase(res.message);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ dutyPatrolScan(no).then((res) => {
|
|
|
+ if (res.status === "20000") {
|
|
|
+ let data = res.data;
|
|
|
+ dutyPlanInfo({
|
|
|
+ versionId: data.versionId,
|
|
|
+ type: data.type,
|
|
|
+ }).then((res) => {
|
|
|
+ this.infoStatus = 2;
|
|
|
+ this.procedureRes = res.data.procedureRes;
|
|
|
+ this.everyId = res.data.everyId;
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ this.hintCase(res.message);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+ fail: function (res) {
|
|
|
+ this.hintCase("调用摄像头失败");
|
|
|
+ },
|
|
|
+ });
|
|
|
+ } catch {
|
|
|
+ this.hintCase("调用摄像头失败");
|
|
|
+ }
|
|
|
},
|
|
|
},
|
|
|
};
|
