wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/5/head
chenxinying 2024-02-29 08:43:58 +08:00
parent bed3447618 dd71531980
commit e8ee4b5d24
21 changed files with 139 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
View File

@ -20,7 +20,8 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text> <text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text> <text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>

4
pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-risk-detail.vue
View File

@ -20,8 +20,8 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text> <text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text> <text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>

6
pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-standard-detail.vue
View File

@ -15,8 +15,10 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>

8
pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check.vue
View File

@ -30,11 +30,9 @@
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text> <text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='1'">风险排查清单检查</text> <text v-if="item.SOURCE=='1'">隐患快报</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='2'">隐患排查清单检查</text> <text v-if="item.SOURCE=='2'">风险排查清单检查</text>
<text v-if="item.SOURCE=='1'">隐患来源：隐患快报</text> <text v-if="item.SOURCE=='3'">隐患排查清单检查</text>
<text v-else-if="item.SOURCE=='2'">隐患来源：隐患排查</text>
<text v-else-if="item.SOURCE=='3'">隐患来源：隐患排查</text>
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text> <text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text>

8
pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish-detail.vue
View File

@ -19,9 +19,11 @@
<text class="text-grey">隐患来源</text> <text class="text-grey">隐患来源</text>
</view> </view>
<view class="uni-flex-item text-right"> <view class="uni-flex-item text-right">
<text v-if="pd.SOURCE=='1'" class="text-semi">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'" class="text-semi">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'" class="text-semi">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>
<view class="de-item" v-if="pd.SOURCE==2"> <view class="de-item" v-if="pd.SOURCE==2">

8
pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue
View File

@ -28,11 +28,9 @@
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text> <text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='1'">风险排查清单检查</text> <text v-if="item.SOURCE=='1'">隐患快报</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='2'">隐患排查清单检查</text> <text v-if="item.SOURCE=='2'">风险排查清单检查</text>
<text v-if="item.SOURCE=='1'">隐患来源：隐患快报</text> <text v-if="item.SOURCE=='3'">隐患排查清单检查</text>
<text v-else-if="item.SOURCE=='2'">隐患来源：隐患排查</text>
<text v-else-if="item.SOURCE=='3'">隐患来源：隐患排查</text>
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">

3
pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue
View File

@ -20,7 +20,8 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text> <text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text> <text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>

4
pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-risk-detail.vue
View File

@ -20,8 +20,8 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">风险排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">风险排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text> <text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text> <text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>

6
pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-standard-detail.vue
View File

@ -15,8 +15,10 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>

8
pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue
View File

@ -33,11 +33,9 @@
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text> <text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='1'">风险排查清单检查</text> <text v-if="item.SOURCE=='1'">隐患快报</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='2'">隐患排查清单检查</text> <text v-if="item.SOURCE=='2'">风险排查清单检查</text>
<text v-if="item.SOURCE=='1'">隐患来源：隐患快报</text> <text v-if="item.SOURCE=='3'">隐患排查清单检查</text>
<text v-else-if="item.SOURCE=='2'">隐患来源：隐患排查</text>
<text v-else-if="item.SOURCE=='3'">隐患来源：隐患排查</text>
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text> <text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text>

6
pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-detail.vue
View File

@ -16,8 +16,10 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="pd.SOURCE==2"> <view class="cu-form-group" v-if="pd.SOURCE==2">

6
pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-risk-detail.vue
View File

@ -16,8 +16,10 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">风险排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">风险排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="pd.SOURCE==2"> <view class="cu-form-group" v-if="pd.SOURCE==2">

6
pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue-standard-detail.vue
View File

@ -16,8 +16,10 @@
</view> </view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>

8
pages/application/hidden-danger-management/hidden-danger-overdue/hidden-danger-overdue.vue
View File

@ -33,11 +33,9 @@
</view> </view>
<view class="dy-subtitle"> <view class="dy-subtitle">
<text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text> <text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='1'">风险排查清单检查</text> <text v-if="item.SOURCE=='1'">隐患快报</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='2'">隐患排查清单检查</text> <text v-if="item.SOURCE=='2'">风险排查清单检查</text>
<text v-if="item.SOURCE=='1'">隐患来源：隐患快报</text> <text v-if="item.SOURCE=='3'">隐患排查清单检查</text>
<text v-else-if="item.SOURCE=='2'">隐患来源：隐患排查</text>
<text v-else-if="item.SOURCE=='3'">隐患来源：隐患排查</text>
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text> <text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text>

68
pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail.vue
View File

@ -18,8 +18,8 @@
<view class="title">隐患来源</view> <view class="title">隐患来源</view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text> <text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text> <text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
@ -423,6 +423,68 @@
</view> </view>
</view> </view>
<view v-if="(pd.SOURCE === '4' || pd.SOURCE === '5') && pd.FINAL_CHECK" class="wui-form-list">
<view class="wui-sub-title">
<text>安全环保验收信息</text>
</view>
<view class="cu-form-group">
<view class="title">
<text>验收描述</text>
</view>
<view>
<text>{{pd.FINAL_CHECKDESCR}}</text>
</view>
</view>
<view class="cu-form-group">
<view class="title">
<text>是否合格</text>
</view>
<view>
<text v-if="pd.FINAL_CHECK">是</text>
<text v-else-if="pd.FINAL_CHECK=='2'">否</text>
</view>
</view>
<view class="cu-form-group">
<view class="title">
<text>验收部门</text>
</view>
<view>
<text>{{pd.FINAL_CHECKOR_NDEPTNAME}}</text>
</view>
</view>
<view class="cu-form-group">
<view class="title">
<text>验收人</text>
</view>
<view>
<text>{{pd.FINAL_CHECKOR_NAME}}</text>
</view>
</view>
<view class="cu-form-group">
<view class="title">
<text>验收时间</text>
</view>
<view>
<text>{{pd.FINAL_CHECKTIME}}</text>
</view>
</view>
<view class="cu-form-textarea">
<view class="title">
<text>整改后图片</text>
</view>
<view class="cu-form-p">
<scroll-view scroll-x class="bg-white nav" scroll-with-animation>
<view class="cu-item" v-for="(item,index) in files6" v-bind:key="index">
<view class="imgs">
<image :src="baseImgPath+item.FILEPATH" :data-index="index" @click="ViewShowImage2"
mode=""></image>
</view>
</view>
</scroll-view>
</view>
</view>
</view>
<view class="cu-tabbar-height"></view> <view class="cu-tabbar-height"></view>
</scroll-view> </scroll-view>
<view :class="['cu-modal',{'show':modalShow}]" v-if="modalShow"> <view :class="['cu-modal',{'show':modalShow}]" v-if="modalShow">
@ -466,6 +528,7 @@
files3: [], files3: [],
files4: [], files4: [],
files5: [], files5: [],
files6: [],
videoList: [], videoList: [],
checkList: [], checkList: [],
CHECKDESCR: '', CHECKDESCR: '',
@ -527,6 +590,7 @@
//_this.files3 = res.data.cImgs; //_this.files3 = res.data.cImgs;
_this.files4 = res.data.sImgs; _this.files4 = res.data.sImgs;
_this.files5 = res.data.pImgs; _this.files5 = res.data.pImgs;
_this.files6 = res.data.yImgs;
_this.checkList = res.data.checkList; _this.checkList = res.data.checkList;
} else if ("exception" == data.result) { } else if ("exception" == data.result) {
uni.showToast({ uni.showToast({

4
pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail.vue
View File

@ -16,8 +16,8 @@
<view class="title">隐患来源</view> <view class="title">隐患来源</view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">风险排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">风险排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text> <text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text> <text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>

6
pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-standard-detail.vue
View File

@ -13,8 +13,10 @@
<view class="title">隐患来源</view> <view class="title">隐患来源</view>
<view> <view>
<text v-if="pd.SOURCE=='1'">隐患快报</text> <text v-if="pd.SOURCE=='1'">隐患快报</text>
<text v-if="pd.SOURCE=='2'">隐患排查</text> <text v-if="pd.SOURCE=='2'">风险管控清单检查</text>
<text v-if="pd.SOURCE=='3'">隐患排查</text> <text v-if="pd.SOURCE=='3'">隐患排查清单检查</text>
<text v-if="pd.SOURCE=='4'">安全环保检查</text>
<text v-if="pd.SOURCE=='5'">安全环保检查</text>
</view> </view>
</view> </view>

8
pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record.vue
View File

@ -119,11 +119,9 @@
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text> <text v-if="item.SOURCE=='4' || item.SOURCE=='5'">安全环保检查</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='1'">风险排查清单检查</text> <text v-if="item.SOURCE=='1'">隐患快报</text>
<text v-else-if="item.HIDDEN_RISKSTANDARD=='2'">隐患排查清单检查</text> <text v-if="item.SOURCE=='2'">风险排查清单检查</text>
<text v-if="item.SOURCE=='1'">隐患来源：隐患快报</text> <text v-if="item.SOURCE=='3'">隐患排查清单检查</text>
<text v-else-if="item.SOURCE=='2'">隐患来源：隐患排查</text>
<text v-else-if="item.SOURCE=='3'">隐患来源：隐患排查</text>
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text> <text>整改人：{{item.RECTIFICATIONORNAME?item.RECTIFICATIONORNAME:'暂无'}}</text>

4
pages/application/key-project-management/index/index.vue
View File

@ -47,7 +47,7 @@
<view>处罚管理</view> <view>处罚管理</view>
</view> </view>
</navigator> </navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/key-project-management/AI-warning/list"> <!-- <navigator class="apps-item" hover-class="none" url="/pages/application/key-project-management/AI-warning/list">
<view class="imgs action"> <view class="imgs action">
<image src="../../../../static/icon-apps/icon-yxkj-1.png" mode=""></image> <image src="../../../../static/icon-apps/icon-yxkj-1.png" mode=""></image>
<view v-if="count.AI_COUNT" class="cu-tag badge">{{count.AI_COUNT}}</view> <view v-if="count.AI_COUNT" class="cu-tag badge">{{count.AI_COUNT}}</view>
@ -55,7 +55,7 @@
<view class="text-semi" style="text-align: center;"> <view class="text-semi" style="text-align: center;">
<view>AI报警处置</view> <view>AI报警处置</view>
</view> </view>
</navigator> </navigator> -->
</view> </view>
</view> </view>
<view class="cu-tabbar-height"></view> <view class="cu-tabbar-height"></view>

2
pages/application/safety-environmental-inspection/archive/detail-check.vue
View File

@ -435,7 +435,7 @@
<text>是</text> <text>是</text>
</view> </view>
<view class="group"> <view class="group">
<radio class='radio' value="0" :checked="form.FINAL_CHECK==='0'" @click="radioCheck('0')"></radio> <radio class='radio' value="2" :checked="form.FINAL_CHECK==='2'" @click="radioCheck('2')"></radio>
<text>否</text> <text>否</text>
</view> </view>
</radio-group> </radio-group>

2
pages/application/safety-environmental-inspection/archive/list-hidden.vue
View File

@ -79,7 +79,7 @@
{ ID: '', NAME: '请选择' }, { ID: '', NAME: '请选择' },
{ ID: '1', NAME: '待整改' }, { ID: '1', NAME: '待整改' },
{ ID: '2', NAME: '待验收' }, { ID: '2', NAME: '待验收' },
{ ID: '3', NAME: '已复查' }, { ID: '3', NAME: '已整改' },
{ ID: '4', NAME: '已验收' }, { ID: '4', NAME: '已验收' },
{ ID: '5', NAME: '忽略隐患' }, { ID: '5', NAME: '忽略隐患' },
{ ID: '6', NAME: '重大隐患' }, { ID: '6', NAME: '重大隐患' },