|
|
@@ -69,7 +69,7 @@
|
|
|
<!--检查者------------- -->
|
|
|
<view class="tabTitle_tow" v-if="pageType==1">
|
|
|
<view class="tabTitle_tow_li" @tap="tabClickTow(index)" :key="index" v-for="(item,index) in tabTextTow">
|
|
|
- <view :class="{on:curTabTow==index}" class="tabTitle_tow_text">{{item}}<text>2</text></view>
|
|
|
+ <view :class="{on:curTabTow==index}" class="tabTitle_tow_text">{{item.name}}<text>{{item.num}}</text></view>
|
|
|
<view :class="{on:curTabTow==index}" class="tabTitle_tow_across"></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -80,8 +80,10 @@
|
|
|
<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
|
|
|
<text></text>
|
|
|
</view>
|
|
|
- <view class="list_tow_li_t_c">{{item.subjectName}}-{{item.roomNumber}}</view>
|
|
|
- <view class="list_tow_li_t_c2" v-if="item.isOverdue==1">已逾期</view>
|
|
|
+ <view class="list_tow_li_t_c" v-if="curTabTow==0 || curTabTow==1">{{item.subjectName}}-{{item.roomNumber}}</view>
|
|
|
+ <view class="list_tow_li_t_c" v-if="curTabTow==2 && item.rectifyStatus==3">{{item.subRoom}}</view>
|
|
|
+ <view class="list_tow_li_t_c2" v-if="(curTabTow==0 || curTabTow==1) && item.isOverdue==1">已逾期</view>
|
|
|
+ <view class="list_tow_li_t_c2" v-if="curTabTow==2 && item.overdueStatus==3">已逾期</view>
|
|
|
<view class="list_tow_li_t_r"></view>
|
|
|
</view>
|
|
|
<view class="list_tow_li_m">
|
|
|
@@ -90,17 +92,17 @@
|
|
|
<text class="blue_color" v-if="item.manageStatus==0">待检查</text>
|
|
|
<text class="red_color" v-if="item.manageStatus==1">检查中</text>
|
|
|
<text class="green_color" v-if="item.manageStatus==2">已检查</text>
|
|
|
- <text class="orange_color" v-if="item.rectifyStatus==3">待审核</text>
|
|
|
+ <text class="orange_color" v-if="curTabTow==2 && item.rectifyStatus==3">待审核</text>
|
|
|
<text>{{item.checkType==1?'校院巡查':'实验室自查'}}</text>
|
|
|
<text>{{item.collegeName}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 开始检查 -->
|
|
|
- <view v-if="item.rectifyStatus==3" class="list_tow_li_b" @click="handleTowClick(item,'check')">复核</view>
|
|
|
- <view v-if="item.manageStatus==0 && item.notStarted" class="list_tow_li_b" @click="handleTowClick(item,'add')">开始检查</view>
|
|
|
- <view v-if="item.manageStatus==1" class="list_tow_li_b" @click="handleTowClick(item,'edit')">编辑</view>
|
|
|
- <view v-if="!item.notStarted" class="list_tow_li_b_tow"><img src="@/images/Version3.3.3/icon_xyxcgl_jhwks.png"/>计划未开始</view>
|
|
|
- <view v-if="item.manageStatus==2" class="list_tow_li_b_three">
|
|
|
+ <view v-if="curTabTow==2 && item.rectifyStatus==3" class="list_tow_li_b" @click="handleTowClick(item,'check')">复核</view>
|
|
|
+ <view v-if="(curTabTow==0 || curTabTow==1) && item.manageStatus==0 && item.notStarted" class="list_tow_li_b" @click="handleTowClick(item,'add')">开始检查</view>
|
|
|
+ <view v-if="(curTabTow==0 || curTabTow==1) &&item.manageStatus==1" class="list_tow_li_b" @click="handleTowClick(item,'edit')">编辑</view>
|
|
|
+ <view v-if="(curTabTow==0 || curTabTow==1) &&!item.notStarted" class="list_tow_li_b_tow"><img src="@/images/Version3.3.3/icon_xyxcgl_jhwks.png"/>计划未开始</view>
|
|
|
+ <view v-if="(curTabTow==0 || curTabTow==1) &&item.manageStatus==2" class="list_tow_li_b_three">
|
|
|
<img src="@/images/Version3.3.3/icon_djcsys.png"/>
|
|
|
<text>整改进度：</text>
|
|
|
<text>{{item.rectifySchedule}}</text>
|
|
|
@@ -134,53 +136,91 @@
|
|
|
|
|
|
<view class="tabTitle_three" v-if="pageType==2">
|
|
|
<view class="tabTitle_three_li" @tap="tabClickThree(index)" :key="index" v-for="(item,index) in tabTextThree">
|
|
|
- <view :class="{on:curTabThree==index}" class="tabTitle_three_text">{{item}}<text>2</text></view>
|
|
|
+ <view :class="{on:curTabThree==index}" class="tabTitle_three_text">{{item.name}}<text>{{item.num}}</text></view>
|
|
|
<view :class="{on:curTabThree==index}" class="tabTitle_three_across"></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="list_three" v-if="pageType==2">
|
|
|
- <view class="list_three_li" v-for="(item,index) in dataList" :key="index" @click="handleClick(item,'edit')">
|
|
|
+ <view class="list_three_li" v-for="(item,index) in dataList3" :key="index" @click="handleThreeClick(item,'detail')">
|
|
|
<view class="list_three_li_t">
|
|
|
<view class="list_three_li_t_l">
|
|
|
<img src="@/images/Version3.3.3/icon_xyxc_qx.png"/>
|
|
|
<text></text>
|
|
|
</view>
|
|
|
- <view class="list_three_li_t_c">实验室名称-房间号</view>
|
|
|
- <view class="list_three_li_t_c2">已逾期</view>
|
|
|
+ <!-- 隐患 -->
|
|
|
+ <view class="list_three_li_t_c" v-if="curTabThree==0">{{item.subRoom}}</view>
|
|
|
+ <!-- 随手拍 -->
|
|
|
+ <view class="list_three_li_t_c" v-if="curTabThree==1">{{item.subName}}</view>
|
|
|
+ <view class="list_three_li_t_c2" v-if="item.overdueStatus==1">已逾期</view>
|
|
|
<view class="list_three_li_t_r"></view>
|
|
|
</view>
|
|
|
<view class="list_three_li_m">
|
|
|
- <view class="list_three_li_m_t">计划标题计划标题计划标题计划标题计划标题计划...</view>
|
|
|
+ <!-- 隐患 -->
|
|
|
+ <view class="list_three_li_m_t" v-if="curTabThree==0">{{item.hazardDescribe}}</view>
|
|
|
+ <!-- 随手拍 -->
|
|
|
+ <view class="list_three_li_m_t" v-if="curTabThree==1">{{item.hazardDescribe}}</view>
|
|
|
<view class="list_three_li_m_b">
|
|
|
- <text class="blue_color">未开始</text>
|
|
|
- <text>校院巡查</text>
|
|
|
- <text>环境与测绘学院</text>
|
|
|
+ <!-- 隐患 -->
|
|
|
+ <text class="green_color" v-if="curTabThree==0 && item.rectifyStatus==1">已完成</text>
|
|
|
+ <text class="blue_color" v-if="curTabThree==0 && item.rectifyStatus==2">待整改</text>
|
|
|
+ <text class="orange_color" v-if="curTabThree==0 && curTabThree==0 && item.rectifyStatus==3">待复核</text>
|
|
|
+ <text class="gray_color" v-if="curTabThree==0 && item.rectifyStatus==4">暂无法整改</text>
|
|
|
+ <text class="type" v-if="curTabThree==0">{{item.hazardType==1?'校院巡查':'实验室自查'}}</text>
|
|
|
+ <text class="college" v-if="curTabThree==0">{{item.collegeName}}</text>
|
|
|
+ <!-- 随手拍 -->
|
|
|
+ <text class="blue_color" v-if="curTabThree==1 && item.rectifyStatus==0">待整改</text>
|
|
|
+ <text class="green_color" v-if="curTabThree==1 && item.rectifyStatus==1">已整改</text>
|
|
|
+ <text class="orange_color" v-if="curTabThree==1 && item.rectifyStatus==2">暂无法整改</text>
|
|
|
+ <text class="college" v-if="curTabThree==1">{{item.deptName}}</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="list_three_li_b">
|
|
|
- <text>整改期限：2023-01-01</text>
|
|
|
+ <!-- 隐患 -->
|
|
|
+ <view class="list_three_li_b" v-if="curTabThree==0">
|
|
|
+ <text >整改期限：{{item.rectifyDeadline}}</text>
|
|
|
+ </view>
|
|
|
+ <!-- 随手拍 -->
|
|
|
+ <view class="list_three_li_b2" v-if="curTabThree==1">
|
|
|
+ <view class="list_three_li_b_l">
|
|
|
+ <img src="@/images/Version3.3.3/icon_ssp_ry.png"/>
|
|
|
+ <text>上报人：{{item.createName}}</text>
|
|
|
+ </view>
|
|
|
+ <view class="list_three_li_b_r">{{item.createTime}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</scroll-view>
|
|
|
- <view class="bottom_btn" @click="handleClick('','start')">开展检查</view>
|
|
|
- <img class="scan_btn" src="@/images/Version3.3.3/icon_xyxc_sm.png"/>
|
|
|
+ <!-- <view class="bottom_btn" v-if="pageType==1" @click="handleClick('','start')">开展检查</view> -->
|
|
|
+ <img class="scan_btn" @click.stop="saoCode" src="@/images/Version3.3.3/icon_xyxc_sm.png"/>
|
|
|
+ <!-- 选择学院-->
|
|
|
+ <view class="shade" v-if="dialogVisible">
|
|
|
+ <view class="null-box" @click="dialogClose()"></view>
|
|
|
+ <view class="shade_n">
|
|
|
+ <view class="shade_n_title"><text>选择该实验室隐患项</text><text @click="hiddenConfirm">确定</text></view>
|
|
|
+ <view class="shade_n_b">
|
|
|
+ <view class="shade_n_b_li" v-for="(item,index) in hiddenList" :key="index" @click="hiddenSelete(index)">
|
|
|
+ <text :class="item.type?'color_B':'color_A'">{{item.hazardDescribe}}</text>
|
|
|
+ <img v-if="item.type" src="@/images/Version3.3.3/icon_xzwt_xz.png">
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <tab-bar></tab-bar>
|
|
|
</view>
|
|
|
-
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import { config } from '@/api/request/config.js'
|
|
|
-import {checkPlanList,getCheckStatusCount,dataStatistics,checkManageList,checkHazardList} from '@/api/index.js'
|
|
|
+import { tabBar } from '@/component/tabBar.vue'
|
|
|
+import {checkPlanList,getCheckStatusCount,getManageStatusCount,dataStatistics,checkManageList,checkHazardAppList,getGentleIdentifier,checkClapList,getCheckPlanBySubId} from '@/api/index.js'
|
|
|
export default {
|
|
|
name: "rectifyList",
|
|
|
components: {
|
|
|
-
|
|
|
+ tabBar
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- pageType:1,
|
|
|
+ pageType:0,
|
|
|
//列表请求参数
|
|
|
getData:{
|
|
|
pageNum:1,
|
|
|
@@ -194,6 +234,12 @@ export default {
|
|
|
manageStatus:0,//管理状态(-1全部 0待检查，1检查中，2已检查)
|
|
|
rectifyStatus:'',
|
|
|
},
|
|
|
+ getData3:{
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:20,
|
|
|
+ hazardType:'',//1是院校巡查，2是实验室自查
|
|
|
+ rectifyStatus:'',//1已完成 2待整改 3待复核 4 暂无法整改
|
|
|
+ },
|
|
|
|
|
|
userType:1,//人员类型 3整改人 2检查人 1管理员
|
|
|
statisticsList:[
|
|
|
@@ -211,33 +257,44 @@ export default {
|
|
|
],
|
|
|
tabText:[{name:'未开始',num:0,},{name:'进行中',num:0}],
|
|
|
curTab:0,
|
|
|
- tabTextTow:['待检查','检查中','待复核'],
|
|
|
+ tabTextTow:[{name:'待检查',num:0,},{name:'检查中',num:0,},{name:'待复核',num:0,}],
|
|
|
curTabTow:0,
|
|
|
- tabTextThree:['隐患待整改','随手拍整改'],
|
|
|
+ tabTextThree:[{name:'隐患待整改',num:0,},{name:'随手拍整改',num:0,}],
|
|
|
curTabThree:0,
|
|
|
total:0,
|
|
|
dataList:[],//管理员
|
|
|
total2:0,
|
|
|
dataList2:[],//检查者
|
|
|
+ total3:0,
|
|
|
+ dataList3:[],//整改者
|
|
|
currentDate:'',
|
|
|
-
|
|
|
+ dangerAllNum:0,
|
|
|
+ snapshotAllNum:0,
|
|
|
+ isSubPlan:false,//判断管理员和检查者扫码的实验室是否有检查计划
|
|
|
+ dialogVisible:false,
|
|
|
+ hiddenList:[],
|
|
|
}
|
|
|
},
|
|
|
onLoad() {
|
|
|
-
|
|
|
+
|
|
|
},
|
|
|
onShow() {
|
|
|
- //获取当前日期
|
|
|
- this.currentDate=this.getNowFormatDate()
|
|
|
+
|
|
|
},
|
|
|
mounted(){
|
|
|
-
|
|
|
+ //获取当前日期
|
|
|
+ this.currentDate=this.getNowFormatDate()
|
|
|
+ //this.getGentleIdentifier();//查询身份标识
|
|
|
this.getCheckStatusCount();
|
|
|
+ this.getManageStatusCount();
|
|
|
this.dataStatistics();
|
|
|
+ this.checkClapListAllNum();//随手拍待整改总数
|
|
|
if(this.pageType==0){//管理员
|
|
|
this.getList();
|
|
|
}else if(this.pageType==1){//检查者
|
|
|
this.getList2();
|
|
|
+ }else if(this.pageType==2){//整改者
|
|
|
+ this.checkHazardAppList();
|
|
|
}
|
|
|
|
|
|
},
|
|
|
@@ -245,15 +302,46 @@ export default {
|
|
|
//滚动事件
|
|
|
scrollGet(){
|
|
|
let self=this;
|
|
|
- if(self.total/self.getData.pageSize<=self.getData.pageNum){
|
|
|
- console.log('没有更多数据!')
|
|
|
- }else{
|
|
|
- setTimeout(function(){
|
|
|
- self.getData.pageNum += 1;
|
|
|
- self.getList();
|
|
|
- },1000)
|
|
|
-
|
|
|
+ if(this.pageType==0){//管理员
|
|
|
+ if(self.total/self.getData.pageSize<=self.getData.pageNum){
|
|
|
+ console.log('没有更多数据!')
|
|
|
+ }else{
|
|
|
+ setTimeout(function(){
|
|
|
+ self.getData.pageNum += 1;
|
|
|
+ self.getList();
|
|
|
+ },1000)
|
|
|
+
|
|
|
+ }
|
|
|
+ }else if(this.pageType==1){//检查者
|
|
|
+ if(self.total2/self.getData2.pageSize<=self.getData2.pageNum){
|
|
|
+ console.log('没有更多数据!')
|
|
|
+ }else{
|
|
|
+ setTimeout(function(){
|
|
|
+ self.getData2.pageNum += 1;
|
|
|
+
|
|
|
+ if(self.curTabTow==2){//待复核
|
|
|
+ self.checkHazardAppList()
|
|
|
+ }else {
|
|
|
+ self.getList2();
|
|
|
+ }
|
|
|
+ },1000)
|
|
|
+ }
|
|
|
+ }else if(this.pageType==2){//整改者
|
|
|
+ if(self.total3/self.getData3.pageSize<=self.getData3.pageNum){
|
|
|
+ console.log('没有更多数据!')
|
|
|
+ }else{
|
|
|
+ setTimeout(function(){
|
|
|
+ self.getData3.pageNum += 1;
|
|
|
+ if(self.curTabThree==0){//隐患
|
|
|
+ self.checkHazardAppList()
|
|
|
+ }else {//随手拍
|
|
|
+ self.checkClapList()
|
|
|
+ }
|
|
|
+ },1000)
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
//管理员
|
|
|
tabClick(index) {
|
|
|
@@ -280,12 +368,20 @@ export default {
|
|
|
this.getList2()
|
|
|
}else if(index==2){//待复核
|
|
|
this.getData2.rectifyStatus=3
|
|
|
- this.checkHazardList()
|
|
|
+ this.checkHazardAppList()
|
|
|
}
|
|
|
|
|
|
},
|
|
|
- tabClickThree(index) {
|
|
|
+ tabClickThree(index) {//整改者
|
|
|
this.curTabThree = index;
|
|
|
+ this.getData3.pageNum=1;
|
|
|
+ this.dataList3=[];
|
|
|
+ if(index==0){//隐患待整改
|
|
|
+ this.getData3.rectifyStatus=2
|
|
|
+ this.checkHazardAppList()
|
|
|
+ }else if(index==1){//随手拍待整改
|
|
|
+ this.checkClapList();
|
|
|
+ }
|
|
|
},
|
|
|
handleClick(row,doType){
|
|
|
let self=this;
|
|
|
@@ -337,6 +433,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
},
|
|
|
+
|
|
|
//检查者
|
|
|
handleTowClick(row,doType){
|
|
|
if(doType=='add'){//开始检查
|
|
|
@@ -348,10 +445,137 @@ export default {
|
|
|
url: '/pages/pages_safetyExamine/examineManage/examineAdd?id='+row.id
|
|
|
});
|
|
|
}else if(doType=='check'){//复核
|
|
|
-
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
-
|
|
|
+ //整改者
|
|
|
+ handleThreeClick(row,doType){
|
|
|
+ if(doType=='detail'){
|
|
|
+ if(this.curTabThree==0){//隐患待整改详情
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(row))
|
|
|
+ })
|
|
|
+ }else if(this.curTabThree==1){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/pages_safetyExamine/snapshotManage/snapshotDetail?id='+row.id+'&rectifyStatus='+this.getData3.rectifyStatus
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ },
|
|
|
+ /* 扫一扫*/
|
|
|
+ saoCode(){
|
|
|
+ let self = this;
|
|
|
+ uni.scanCode({
|
|
|
+ onlyFromCamera: true,
|
|
|
+ success: function (res) {
|
|
|
+ console.log(res)
|
|
|
+ if(res.result.indexOf("code") != -1 && res.result.indexOf("-") != -1 && res.result.indexOf("&") != -1){
|
|
|
+ let subId = "";
|
|
|
+ let newList = res.result.split("?")[1].split("&")
|
|
|
+ let list = newList[0].split("=")[1].split("-")
|
|
|
+ subId = list[0];
|
|
|
+ if(subId){
|
|
|
+
|
|
|
+ if(self.pageType==0 || self.pageType==1){//管理员和检查者
|
|
|
+ self.getCheckPlanBySubId(subId)
|
|
|
+ }else if(self.pageType==2){//整改者
|
|
|
+ let obj={
|
|
|
+ pageNum:1,
|
|
|
+ pageSize:100,
|
|
|
+ subId:subId,
|
|
|
+ }
|
|
|
+ self.checkHazardAppList2(obj);
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }else{
|
|
|
+ uni.showToast({
|
|
|
+ title: '请扫描正确的二维码',
|
|
|
+ icon:"none",
|
|
|
+ mask:true,
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ uni.showToast({
|
|
|
+ title: '请扫描正确的二维码',
|
|
|
+ icon:"none",
|
|
|
+ mask:true,
|
|
|
+ duration: 2000
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ //根据实验室id查询该实验室有关计划
|
|
|
+ async getCheckPlanBySubId(subId){
|
|
|
+ let _this = this;
|
|
|
+ let id=subId;
|
|
|
+ const {data} = await getCheckPlanBySubId({'subId':id});
|
|
|
+ if(data.code == 200){
|
|
|
+ if(data.data){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/pages_safetyExamine/examineManage/examineAdd?subId='+id
|
|
|
+ });
|
|
|
+ }else{
|
|
|
+ let id = uni.setStorageSync('saoCodeId',id);
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages/pages_safetyExamine/inforSign'
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //根据实验室id查询隐患
|
|
|
+ async checkHazardAppList2(obj){
|
|
|
+ let self = this;
|
|
|
+ const {data} = await checkHazardAppList(obj);
|
|
|
+ if(data.code==200){
|
|
|
+ if(data.data.records){
|
|
|
+ data.data.records.forEach(function(item){
|
|
|
+ item.type=false;
|
|
|
+ })
|
|
|
+ this.hiddenList=data.data.records
|
|
|
+ this.dialogVisible=true;
|
|
|
+ }else{
|
|
|
+ let id = uni.setStorageSync('saoCodeId',id);
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages/pages_safetyExamine/inforSign'
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //选择学院弹窗关闭
|
|
|
+ dialogClose(){
|
|
|
+ this.dialogVisible=false;
|
|
|
+ },
|
|
|
+ //学院选择
|
|
|
+ hiddenSelete(index){
|
|
|
+ let _this=this;
|
|
|
+ this.hiddenList[index].type = !this.hiddenList[index].type
|
|
|
+ if (_this.hiddenList[index].type == true) {
|
|
|
+ _this.hiddenList.forEach(function(item2) {
|
|
|
+ if (item2.id == _this.hiddenList[index].id) {
|
|
|
+ item2.type = true
|
|
|
+ } else {
|
|
|
+ item2.type = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ hiddenConfirm(){
|
|
|
+ let _this=this;
|
|
|
+ _this.hiddenList.forEach(function(item){
|
|
|
+ if(item.type==true){
|
|
|
+ uni.redirectTo({
|
|
|
+ url: '/pages/pages_safetyExamine/dangerManage/dangerDetail?item='+encodeURIComponent(JSON.stringify(item))
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
//数据统计
|
|
|
async dataStatistics(){
|
|
|
let self = this;
|
|
|
@@ -402,6 +626,23 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
+ //获取用户身份标识"adminGentle": false, 管理员身份 "rectifyGentle": false, 整改身份"applyGentle": false 检查者身份
|
|
|
+ async getGentleIdentifier(){
|
|
|
+ let self = this;
|
|
|
+ const {data} = await getGentleIdentifier();
|
|
|
+ if(data.code==200){
|
|
|
+ if(data.data.rectifyGentle){//整改者
|
|
|
+ self.pageType==2
|
|
|
+ }else if(data.data.applyGentle){//检查者
|
|
|
+ self.pageType==1
|
|
|
+ }else if(data.data.adminGentle){//管理员
|
|
|
+ self.pageType==0
|
|
|
+ }else{
|
|
|
+ self.pageType==0
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
//检查计划各检查状态数据数量
|
|
|
async getCheckStatusCount(){
|
|
|
let self = this;
|
|
|
@@ -411,6 +652,17 @@ export default {
|
|
|
this.tabText[1].num=data.data.start;
|
|
|
}
|
|
|
},
|
|
|
+ //检查各检查状态数据数量
|
|
|
+ async getManageStatusCount(){
|
|
|
+ let self = this;
|
|
|
+ const {data} = await getManageStatusCount();
|
|
|
+ if(data.code==200){
|
|
|
+ this.tabTextTow[0].num=data.data.noCheck;
|
|
|
+ this.tabTextTow[1].num=data.data.checking;
|
|
|
+ this.tabTextTow[2].num=data.data.applyNum;
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
//管理员
|
|
|
async getList(){
|
|
|
let self = this;
|
|
|
@@ -429,23 +681,72 @@ export default {
|
|
|
data.data.records.forEach(function(item){
|
|
|
item.notStarted=self.compareTime(item.cycleStartTime)
|
|
|
})
|
|
|
- this.dataList2=[...this.dataList,...data.data.records]
|
|
|
+ this.dataList2=[...this.dataList2,...data.data.records]
|
|
|
this.total2=data.data.total;
|
|
|
+ console.log(this.dataList2)
|
|
|
}
|
|
|
},
|
|
|
//待复核列表
|
|
|
- async checkHazardList(){
|
|
|
+ async checkHazardAppList(){
|
|
|
let self = this;
|
|
|
- const {data} = await checkHazardList(this.getData2);
|
|
|
+ let obj={};
|
|
|
+ if(this.pageType==1){//检查者
|
|
|
+ obj={
|
|
|
+ pageNum:this.getData2.pageNum,
|
|
|
+ pageSize:this.getData2.pageSize,
|
|
|
+ hazardType:'',
|
|
|
+ rectifyStatus:'3',
|
|
|
+ };
|
|
|
+ }else if(this.pageType==2){//整改者
|
|
|
+ obj={
|
|
|
+ pageNum:this.getData3.pageNum,
|
|
|
+ pageSize:this.getData3.pageSize,
|
|
|
+ hazardType:'',
|
|
|
+ rectifyStatus:'2',
|
|
|
+ };
|
|
|
+ }
|
|
|
+ const {data} = await checkHazardAppList(obj);
|
|
|
if(data.code==200){
|
|
|
- //判断计划是否开始
|
|
|
- data.data.records.forEach(function(item){
|
|
|
- item.notStarted=self.compareTime(item.cycleStartTime)
|
|
|
- })
|
|
|
- this.dataList2=[...this.dataList,...data.data.records]
|
|
|
- this.total2=data.data.total;
|
|
|
+
|
|
|
+ if(self.pageType==1){//检查者
|
|
|
+ this.dataList2=[...this.dataList2,...data.data.records]
|
|
|
+ this.total2=data.data.total;
|
|
|
+ }else if(self.pageType==2){
|
|
|
+ this.dataList3=[...this.dataList3,...data.data.records]
|
|
|
+ this.total3=data.data.total;
|
|
|
+ this.tabTextThree[0].num=data.data.total;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
+ //随手拍待整改
|
|
|
+ async checkClapList(){
|
|
|
+ let self = this;
|
|
|
+ let obj={
|
|
|
+ pageNum:this.getData3.pageNum,
|
|
|
+ pageSize:this.getData3.pageSize,
|
|
|
+ rectifyStatus:0,
|
|
|
+ };
|
|
|
+ const {data} = await checkClapList(obj);
|
|
|
+ if(data.code==200){
|
|
|
+ this.dataList3=[...this.dataList3,...data.data.records]
|
|
|
+ this.total3=data.data.total;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //随手拍待整改总数
|
|
|
+ async checkClapListAllNum(){
|
|
|
+ let self = this;
|
|
|
+ let obj={
|
|
|
+ pageNum:this.getData3.pageNum,
|
|
|
+ pageSize:this.getData3.pageSize,
|
|
|
+ rectifyStatus:0,
|
|
|
+ };
|
|
|
+ const {data} = await checkClapList(obj);
|
|
|
+ if(data.code==200){
|
|
|
+ this.tabTextThree[1].num=data.data.total;
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -475,6 +776,10 @@ export default {
|
|
|
color: #FA8E1B;
|
|
|
border: 1rpx solid #FA8E1B;
|
|
|
}
|
|
|
+ .gray_color{
|
|
|
+ color: #A2A2A2;
|
|
|
+ border: 1rpx solid #A2A2A2;
|
|
|
+ }
|
|
|
|
|
|
.statistics{
|
|
|
background: #fff;
|
|
|
@@ -926,7 +1231,6 @@ export default {
|
|
|
left: 0;
|
|
|
width: 690rpx;
|
|
|
height: 168rpx;
|
|
|
- border-bottom: 1rpx solid #E0E0E0;
|
|
|
padding-left: 30rpx;
|
|
|
box-sizing: border-box;
|
|
|
.list_tow_li_m_t{
|
|
|
@@ -936,6 +1240,9 @@ export default {
|
|
|
color: #666666;
|
|
|
line-height: 40rpx;
|
|
|
margin-top:22rpx;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow:ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
}
|
|
|
.list_tow_li_m_b{
|
|
|
margin-top:26rpx;
|
|
|
@@ -1304,6 +1611,9 @@ export default {
|
|
|
color: #666666;
|
|
|
line-height: 40rpx;
|
|
|
margin-top:22rpx;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow:ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
}
|
|
|
.list_three_li_m_b{
|
|
|
margin-top:26rpx;
|
|
|
@@ -1316,7 +1626,7 @@ export default {
|
|
|
padding: 0 20rpx;
|
|
|
margin-right: 14rpx;
|
|
|
}
|
|
|
- >text:nth-of-type(2){
|
|
|
+ .type{
|
|
|
font-size: 26rpx;
|
|
|
font-family: PingFang SC-Medium, PingFang SC;
|
|
|
font-weight: 400;
|
|
|
@@ -1327,9 +1637,9 @@ export default {
|
|
|
background: rgba(1,131,250,0.1);
|
|
|
margin-right: 24rpx;
|
|
|
}
|
|
|
- >text:nth-of-type(3){
|
|
|
+ .college{
|
|
|
display: inline-block;
|
|
|
- width: 380rpx;
|
|
|
+ width: 280rpx;
|
|
|
font-size: 26rpx;
|
|
|
font-family: PingFang SC-Medium, PingFang SC;
|
|
|
font-weight: 400;
|
|
|
@@ -1359,6 +1669,44 @@ export default {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ .list_three_li_b2{
|
|
|
+ height: 76rpx;
|
|
|
+ width: 100%;
|
|
|
+ position: absolute;
|
|
|
+ top: 258rpx;
|
|
|
+ left: 0;
|
|
|
+ padding:0 30rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ .list_three_li_b_l{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+ >img{
|
|
|
+ width: 28rpx;
|
|
|
+ height: 30rpx;
|
|
|
+ margin-right: 14rpx;
|
|
|
+ }
|
|
|
+ >text{
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-family: PingFang SC-Medium, PingFang SC;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #666666;
|
|
|
+ line-height: 76rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .list_three_li_b_r{
|
|
|
+ font-size: 24rpx;
|
|
|
+ font-family: PingFang SC-Medium, PingFang SC;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #999999;
|
|
|
+ line-height: 76rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
.bottom_btn{
|
|
|
@@ -1384,5 +1732,85 @@ export default {
|
|
|
width: 130rpx;
|
|
|
height: 130rpx;
|
|
|
}
|
|
|
+ /* 根据实验室id查询隐患列表 */
|
|
|
+ .shade {
|
|
|
+ height: 100%;
|
|
|
+ width: 100%;
|
|
|
+ position: fixed;
|
|
|
+ display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ z-index: 100;
|
|
|
+ background: rgba(0, 0, 0, 0.2);
|
|
|
+ .null-box {
|
|
|
+ flex: 1;
|
|
|
+ }
|
|
|
+ .shade_n {
|
|
|
+ position: absolute;
|
|
|
+ bottom: 0;
|
|
|
+ left: 0;
|
|
|
+ width: 750rpx;
|
|
|
+ height: 560rpx;
|
|
|
+ background: #FFFFFF;
|
|
|
+ border-radius: 20rpx 20rpx 0rpx 0rpx;
|
|
|
+ .shade_n_title{
|
|
|
+ height: 100rpx;
|
|
|
+ padding: 0 30rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
+ display: flex;
|
|
|
+ justify-content:space-between;
|
|
|
+ border-bottom: 1rpx solid #E0E0E0;
|
|
|
+ >text:nth-of-type(1){
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-family: PingFang SC-Medium, PingFang SC;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #333333;
|
|
|
+ line-height: 100rpx;
|
|
|
+ }
|
|
|
+ >text:nth-of-type(2){
|
|
|
+ font-size: 30rpx;
|
|
|
+ font-family: PingFang SC-Medium, PingFang SC;
|
|
|
+ font-weight: 400;
|
|
|
+ color: #0183FA;
|
|
|
+ line-height: 100rpx;
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .shade_n_b{
|
|
|
+ height: 460rpx;
|
|
|
+ padding: 0 30rpx;
|
|
|
+ box-sizing: border-box;
|
|
|
+ overflow-y: auto;
|
|
|
+ .shade_n_b_li{
|
|
|
+ display: flex;
|
|
|
+ justify-content:space-between;
|
|
|
+ align-items: center;
|
|
|
+ height: 80rpx;
|
|
|
+ border-bottom: 1rpx solid #E0E0E0;
|
|
|
+ >text{
|
|
|
+ font-size: 28rpx;
|
|
|
+ font-family: PingFang SC-Medium, PingFang SC;
|
|
|
+ font-weight: 400;
|
|
|
+ line-height: 80rpx;
|
|
|
+ overflow: hidden;
|
|
|
+ text-overflow:ellipsis;
|
|
|
+ white-space: nowrap;
|
|
|
+ }
|
|
|
+ >img{
|
|
|
+ width: 24rpx;
|
|
|
+ height: 16rpx;
|
|
|
+ margin-right: 14rpx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .color_A{
|
|
|
+ color: #333333;
|
|
|
+ }
|
|
|
+ .color_B{
|
|
|
+ color: #0183FA;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
heyang