|
|
@@ -109,7 +109,25 @@
|
|
|
<img v-if="tabIndexTow==0" class="saoCode" @click="saoCode()"
|
|
|
:src="imagesUrl('safetyCheck/icon_aqjc_saoma.png')">
|
|
|
</scroll-view>
|
|
|
- <scanCodeCheck v-if="securityCheck" :subjectData="subjectData"></scanCodeCheck>
|
|
|
+ <view class="shade-box" v-if="securityCheck">
|
|
|
+ <view class="null-box" @click="goPage('securityCheck',false)"></view>
|
|
|
+ <view class="shade_n">
|
|
|
+ <view class="title">
|
|
|
+ <view>请选择实验室</view>
|
|
|
+ </view>
|
|
|
+ <view class="batch">
|
|
|
+ <view class="batch-li" @click="batchClickTow(item)" v-for="(item,index) in subjectData">
|
|
|
+ <view class="batch-li-l">
|
|
|
+ <text>{{item.planTitle}}-{{item.checkName}}</text>
|
|
|
+ <text>{{item.subName}}{{item.roomNum?'('+item.roomNum+')':''}}</text>
|
|
|
+ </view>
|
|
|
+ <view class="batch-li-r">
|
|
|
+ <img :src="imagesUrl('commonality/icon_wd_gd@1x.png')">
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
@@ -128,15 +146,10 @@
|
|
|
securityAppCheckDangerReviewSubList,
|
|
|
securityAppCheckSetOptionList,
|
|
|
securityAppCheckDangerBuildAndFloorList,
|
|
|
+ securityAppCheckPlanScanCode,
|
|
|
} from '@/pages_safetyCheck/api/index.js'
|
|
|
- import {
|
|
|
- scanCodeCheck
|
|
|
- } from '@/pages_safetyCheck/views/scanCodeCheck.vue'
|
|
|
export default {
|
|
|
name: "snapshotList",
|
|
|
- components: {
|
|
|
- scanCodeCheck,
|
|
|
- },
|
|
|
data() {
|
|
|
return {
|
|
|
baseUrl: config.base_url,
|
|
|
@@ -174,7 +187,7 @@
|
|
|
getDataType: false,
|
|
|
manageStatus: null,
|
|
|
securityCheck:false,
|
|
|
- subjectData: {},
|
|
|
+ subjectData: [],
|
|
|
//楼栋楼层数据
|
|
|
dataListTow: [],
|
|
|
//楼栋楼层绑定数据
|
|
|
@@ -433,9 +446,10 @@
|
|
|
codeData[item.split("=")[0]] = item.split("=")[1];
|
|
|
})
|
|
|
if (codeData.code) {
|
|
|
- self.$set(self.subjectData, 'subId', codeData.subId);
|
|
|
- self.$set(self.subjectData, 'planSetId', self.planSetId);
|
|
|
- self.$set(self, "securityCheck", true)
|
|
|
+ self.securityAppCheckPlanScanCode(codeData.subId,self.planSetId);
|
|
|
+ // self.$set(self.subjectData, 'subId', codeData.subId);
|
|
|
+ // self.$set(self.subjectData, 'planSetId', self.planSetId);
|
|
|
+ // self.$set(self, "securityCheck", true)
|
|
|
} else {
|
|
|
uni.showToast({
|
|
|
title: '请扫描正确的二维码',
|
|
|
@@ -447,6 +461,61 @@
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ //查询计划
|
|
|
+ async securityAppCheckPlanScanCode(subId,planSetId) {
|
|
|
+ let self = this;
|
|
|
+ let checkCategory = null;
|
|
|
+ if(uni.getStorageSync('identityData')){
|
|
|
+ if(uni.getStorageSync('identityData').type=='collegeAdmin'){
|
|
|
+ checkCategory=2
|
|
|
+ }else if(uni.getStorageSync('identityData').type=='schoolAdmin'){
|
|
|
+ checkCategory=1
|
|
|
+ }
|
|
|
+ }
|
|
|
+ let obj = {
|
|
|
+ subId:subId,
|
|
|
+ checkCategory:checkCategory,
|
|
|
+ };
|
|
|
+ if(planSetId){
|
|
|
+ obj.planSetId = planSetId;
|
|
|
+ }
|
|
|
+ const {
|
|
|
+ data
|
|
|
+ } = await securityAppCheckPlanScanCode(obj);
|
|
|
+ if (data.code == 200) {
|
|
|
+ if(data.data[0]){
|
|
|
+ if(data.data[1]){
|
|
|
+ //多个
|
|
|
+ self.$set(self,'subjectData',data.data);
|
|
|
+ self.$set(self,'securityCheck',true);
|
|
|
+ }else{
|
|
|
+ //单个
|
|
|
+ let infoData = data.data[0];
|
|
|
+ infoData.pageType = 0;
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
|
|
|
+ JSON.stringify(infoData))
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ //没有
|
|
|
+ uni.showToast({
|
|
|
+ title: '该实验室暂无检查计划!',
|
|
|
+ icon: "none",
|
|
|
+ mask: true,
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ batchClickTow(row) {
|
|
|
+ let infoData = row;
|
|
|
+ infoData.pageType = 0;
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages_safetyCheck/views/itemsManage/hiddenDangerItems?infoData=' + encodeURIComponent(
|
|
|
+ JSON.stringify(infoData))
|
|
|
+ });
|
|
|
+ },
|
|
|
//扫一扫查询数据
|
|
|
async saoList(subId) {
|
|
|
let obj = {
|
|
|
@@ -1303,5 +1372,101 @@
|
|
|
width: 160rpx;
|
|
|
height: 160rpx;
|
|
|
}
|
|
|
+
|
|
|
+ .shade-box {
|
|
|
+ height: 100%;
|
|
|
+ width: 100%;
|
|
|
+ position: fixed;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ z-index: 200;
|
|
|
+ background: rgba(0, 0, 0, 0.2);
|
|
|
+ top: 0;
|
|
|
+
|
|
|
+ .null-box {
|
|
|
+ flex: 1;
|
|
|
+ }
|
|
|
+
|
|
|
+ .shade_n {
|
|
|
+ position: absolute;
|
|
|
+ bottom: 0;
|
|
|
+ left: 0;
|
|
|
+ width: 750rpx;
|
|
|
+ height: 466rpx;
|
|
|
+ background: #FFFFFF;
|
|
|
+ border-radius: 20rpx 20rpx 0rpx 0rpx;
|
|
|
+ overflow-y: auto;
|
|
|
+
|
|
|
+ .title {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ padding: 0 50rpx 0 284rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
+ border-bottom: 1rpx solid #E0E0E0;
|
|
|
+
|
|
|
+ >view {
|
|
|
+ font-size: 30rpx;
|
|
|
+ color: #3D3D3D;
|
|
|
+ line-height: 90rpx;
|
|
|
+ text-align: left;
|
|
|
+ }
|
|
|
+
|
|
|
+ >img {
|
|
|
+ width: 24rpx;
|
|
|
+ height: 12rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .batch {
|
|
|
+ padding: 0 30rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
+
|
|
|
+ .batch-li {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ border-bottom: 1rpx solid #E0E0E0;
|
|
|
+ padding: 20rpx 0 16rpx 0rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
+
|
|
|
+ .batch-li-l {
|
|
|
+ >text:nth-of-type(1) {
|
|
|
+ display: block;
|
|
|
+ font-size: 30rpx;
|
|
|
+ color: #333333;
|
|
|
+ line-height: 42rpx;
|
|
|
+ text-align: left;
|
|
|
+ }
|
|
|
+
|
|
|
+ >text:nth-of-type(2) {
|
|
|
+ display: block;
|
|
|
+ font-size: 28rpx;
|
|
|
+ color: #666666;
|
|
|
+ line-height: 39rpx;
|
|
|
+ text-align: left;
|
|
|
+ margin-top: 6rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .batch-li-r {
|
|
|
+ font-size: 28rpx;
|
|
|
+ color: #666666;
|
|
|
+ line-height: 39rpx;
|
|
|
+ text-align: left;
|
|
|
+ display: flex;
|
|
|
+ justify-content: flex-start;
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+ >img {
|
|
|
+ width: 24rpx;
|
|
|
+ height: 24rpx;
|
|
|
+ margin-left: 9rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
dedsudiyu