|
|
@@ -23,8 +23,7 @@
|
|
|
:style="'border:1rpx solid '+item.levelColor+';background:'+item.levelColorTow+';'">
|
|
|
<text
|
|
|
:style="'border-right:1rpx solid '+item.levelColor+';color:'+item.levelColor+';'">{{item.levelName?item.levelName:''}}</text>
|
|
|
- <text
|
|
|
- :style="'color:'+item.levelColor+';'">{{item.typeName?item.typeName:''}}</text>
|
|
|
+ <text :style="'color:'+item.levelColor+';'">{{item.typeName?item.typeName:''}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="lab-info-c-b">
|
|
|
@@ -34,7 +33,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
+
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
|
|
|
@@ -50,7 +49,10 @@
|
|
|
} from '@/api/commonality/permission.js'
|
|
|
import {
|
|
|
securityCheckOptionList,
|
|
|
- laboratorySubRelInfoGetRelList
|
|
|
+ laboratorySubRelInfoGetRelList,
|
|
|
+ securityAppCheckManageList,
|
|
|
+ securityAppCheckDangerReviewSubList,
|
|
|
+ securityAppCheckDangerGetCheckDangerSubList,
|
|
|
} from '@/pages_safetyCheck/api/index.js'
|
|
|
export default {
|
|
|
name: "hiddenDangerItemsSearch",
|
|
|
@@ -74,6 +76,7 @@
|
|
|
subId: '',
|
|
|
},
|
|
|
total: 0,
|
|
|
+ laboratoryStatus: 0, // 0检查任务1复查验证2隐患整改 3从随手拍页面进入
|
|
|
|
|
|
}
|
|
|
},
|
|
|
@@ -81,8 +84,11 @@
|
|
|
if (option.form) {
|
|
|
this.form = JSON.parse(decodeURIComponent(option.form));
|
|
|
console.log(this.form)
|
|
|
- if(this.form.subId){
|
|
|
- this.queryParams.subId=this.form.subId
|
|
|
+ if (this.form.subId) {
|
|
|
+ this.queryParams.subId = this.form.subId
|
|
|
+ }
|
|
|
+ if (this.form.laboratoryStatus) {
|
|
|
+ this.laboratoryStatus = this.form.laboratoryStatus
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -95,7 +101,6 @@
|
|
|
methods: {
|
|
|
//滚动事件
|
|
|
scrollGet() {
|
|
|
- console.log(1)
|
|
|
let self = this;
|
|
|
if (self.total / self.queryParams.pageSize <= self.queryParams.page) {
|
|
|
this.$set(this, 'getDataType', true);
|
|
|
@@ -113,7 +118,7 @@
|
|
|
},
|
|
|
//取消
|
|
|
cancelBtn() {
|
|
|
- let self=this;
|
|
|
+ let self = this;
|
|
|
self.queryParams.searchValue = '';
|
|
|
self.dataList = [];
|
|
|
self.getList();
|
|
|
@@ -129,39 +134,58 @@
|
|
|
return `RGB(${red}, ${green}, ${blue},${opacity})`;
|
|
|
},
|
|
|
listClick(item) {
|
|
|
- this.$set(this.form, "subId", item.subId)
|
|
|
- this.$set(this.form, "subName", item.subName)
|
|
|
- this.$set(this.form, "subRoom", item.roomNum)
|
|
|
- this.$set(this.form, "deptId", item.deptId)
|
|
|
- this.$set(this.form, "deptName", item.deptName)
|
|
|
- this.$set(this.form, "buildId", item.buildId)
|
|
|
- this.$set(this.form, "buildName", item.buildName)
|
|
|
- this.$set(this.form, "floorId", item.floorId)
|
|
|
- this.$set(this.form, "floorName", item.floorName)
|
|
|
- this.$set(this.form, "typeId", item.typeId)
|
|
|
- this.$set(this.form, "classTypeNames", item.classTypeNames)
|
|
|
- this.$set(this.form, "levelId", item.levelId)
|
|
|
- this.$set(this.form, "classLevelName", item.classLevelName)
|
|
|
- uni.redirectTo({
|
|
|
- url: '/pages_safetyCheck/views/snapshotManage/snapshotList?form=' +
|
|
|
- encodeURIComponent(JSON.stringify(this.form))
|
|
|
- });
|
|
|
+ if (this.form.laboratoryStatus == 0 || this.form.laboratoryStatus == 1 || this.form.laboratoryStatus ==
|
|
|
+ 2) {
|
|
|
+ let infoData = {
|
|
|
+ ...item,
|
|
|
+ ...this.form
|
|
|
+ };
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' +
|
|
|
+ encodeURIComponent(
|
|
|
+ JSON.stringify(infoData))
|
|
|
+ });
|
|
|
+ } else if (this.form.laboratoryStatus == 3) { //从计划实验室列表返回
|
|
|
+ this.$set(this.form, "subId", item.subId)
|
|
|
+ this.$set(this.form, "subName", item.subName)
|
|
|
+ this.$set(this.form, "subRoom", item.roomNum)
|
|
|
+ this.$set(this.form, "deptId", item.deptId)
|
|
|
+ this.$set(this.form, "deptName", item.deptName)
|
|
|
+ this.$set(this.form, "buildId", item.buildId)
|
|
|
+ this.$set(this.form, "buildName", item.buildName)
|
|
|
+ this.$set(this.form, "floorId", item.floorId)
|
|
|
+ this.$set(this.form, "floorName", item.floorName)
|
|
|
+ this.$set(this.form, "typeId", item.typeId)
|
|
|
+ this.$set(this.form, "classTypeNames", item.classTypeNames)
|
|
|
+ this.$set(this.form, "levelId", item.levelId)
|
|
|
+ this.$set(this.form, "classLevelName", item.classLevelName)
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages_safetyCheck/views/snapshotManage/snapshotList?form=' +
|
|
|
+ encodeURIComponent(JSON.stringify(this.form))
|
|
|
+ });
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
},
|
|
|
|
|
|
//搜索房间接口
|
|
|
async getList() {
|
|
|
let self = this;
|
|
|
- const {
|
|
|
- data
|
|
|
- } = await laboratorySubRelInfoSelectByPage(this.queryParams);
|
|
|
- if (data.code == 200) {
|
|
|
- if (data.data.records[0]) {
|
|
|
+ let obj = JSON.parse(JSON.stringify(this.queryParams));
|
|
|
+ if (this.laboratoryStatus == 0) {
|
|
|
+ obj.planSetId = this.form.checkPlanSetVoList.planSetId;
|
|
|
+ obj.planId = this.form.checkPlanSetVoList.planId;
|
|
|
+ //检查计划
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await securityAppCheckManageList(obj);
|
|
|
+ if (data.code == 200) {
|
|
|
+
|
|
|
data.data.records.forEach(function(item) {
|
|
|
- if(item.levelColor){
|
|
|
- item.levelColorTow = self.hexToRgb(item.levelColor, 0.2)
|
|
|
+ if (item.classLevelColor) {
|
|
|
+ item.classLevelColorTow = self.hexToRgb(item.classLevelColor, 0.2)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
})
|
|
|
if (self.queryParams.page == 1) {
|
|
|
this.dataList = data.data.records;
|
|
|
@@ -176,15 +200,64 @@
|
|
|
this.$set(this, 'getDataType', true);
|
|
|
}
|
|
|
}
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- title: '未找到相关实验室',
|
|
|
- icon: "none",
|
|
|
- mask: true,
|
|
|
- duration: 2000
|
|
|
- });
|
|
|
+
|
|
|
+ }
|
|
|
+ } else if (this.laboratoryStatus == 1) {
|
|
|
+ obj.planSetId = this.form.checkPlanSetVoList.planSetId;
|
|
|
+ obj.planId = this.form.checkPlanSetVoList.planId;
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await securityAppCheckDangerReviewSubList(obj);
|
|
|
+ if (data.code == 200) {
|
|
|
+ this.dataList = data.data;
|
|
|
+ this.$set(this, 'getDataType', true);
|
|
|
+ }
|
|
|
+ } else if (this.laboratoryStatus == 2) {
|
|
|
+ obj.planSetId = this.form.checkPlanSetVoList.planSetId;
|
|
|
+ obj.planId = this.form.checkPlanSetVoList.planId;
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await securityAppCheckDangerGetCheckDangerSubList(obj);
|
|
|
+ if (data.code == 200) {
|
|
|
+ this.dataList = data.data;
|
|
|
+ this.$set(this, 'getDataType', true);
|
|
|
+ }
|
|
|
+ } else if (this.laboratoryStatus == 3) {
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await laboratorySubRelInfoSelectByPage(this.queryParams);
|
|
|
+ if (data.code == 200) {
|
|
|
+ if (data.data.records[0]) {
|
|
|
+ data.data.records.forEach(function(item) {
|
|
|
+ if (item.levelColor) {
|
|
|
+ item.levelColorTow = self.hexToRgb(item.levelColor, 0.2)
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ if (self.queryParams.page == 1) {
|
|
|
+ this.dataList = data.data.records;
|
|
|
+ this.total = data.data.total;
|
|
|
+ if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
|
|
|
+ this.$set(this, 'getDataType', true);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.dataList = [...this.dataList, ...data.data.records]
|
|
|
+ this.total = data.data.total;
|
|
|
+ if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
|
|
|
+ this.$set(this, 'getDataType', true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ uni.showToast({
|
|
|
+ title: '未找到相关实验室',
|
|
|
+ icon: "none",
|
|
|
+ mask: true,
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
|
|
|
}
|
|
|
@@ -196,8 +269,8 @@
|
|
|
height: 100%;
|
|
|
display flex;
|
|
|
overflow: hidden;
|
|
|
- .info-max-box {
|
|
|
- }
|
|
|
+
|
|
|
+ .info-max-box {}
|
|
|
|
|
|
#totalColor-A {
|
|
|
color: #0183FA;
|
|
|
@@ -285,15 +358,17 @@
|
|
|
border-bottom: 1rpx solid #E0E0E0;
|
|
|
}
|
|
|
}
|
|
|
- .lab{
|
|
|
+
|
|
|
+ .lab {
|
|
|
margin-top: 120rpx;
|
|
|
+
|
|
|
.lab-info {
|
|
|
background: #FFFFFF;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
border: 2rpx dashed #D8D8D8;
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
.lab-info-l {
|
|
|
width: 80rpx;
|
|
|
height: 80rpx;
|
|
|
@@ -303,15 +378,15 @@
|
|
|
margin-top: 30rpx;
|
|
|
margin-bottom: 42rpx;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.lab-info-c {
|
|
|
margin: 24rpx 30rpx 0 20rpx;
|
|
|
flex: 1;
|
|
|
-
|
|
|
+
|
|
|
.lab-info-c-t {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
-
|
|
|
+
|
|
|
.lab-info-c-t-l {
|
|
|
font-size: 30rpx;
|
|
|
color: #333333;
|
|
|
@@ -321,7 +396,7 @@
|
|
|
text-overflow: ellipsis;
|
|
|
white-space: nowrap;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.lab-info-c-t-r {
|
|
|
display: flex;
|
|
|
justify-content: flex-start;
|
|
|
@@ -329,7 +404,7 @@
|
|
|
width: 180rpx;
|
|
|
height: 40rpx;
|
|
|
margin-left: 10rpx;
|
|
|
-
|
|
|
+
|
|
|
>text {
|
|
|
display: inline-block;
|
|
|
flex: 1;
|
|
|
@@ -340,19 +415,19 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.lab-info-c-b {
|
|
|
margin-top: 16rpx;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
-
|
|
|
+
|
|
|
>text:nth-of-type(1) {
|
|
|
font-size: 30rpx;
|
|
|
color: #666666;
|
|
|
line-height: 30rpx;
|
|
|
text-align: left;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
>text:nth-of-type(2) {
|
|
|
font-size: 30rpx;
|
|
|
color: #666666;
|
|
|
@@ -362,8 +437,8 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
</style>
|
heyang