guoyuepeng
/
qa-prevention-gwj-first-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/liujun-2023-12-11-地图插件更新' into zy20231108

zy20231108
zhaoyu 2023-12-11 18:05:32 +08:00
parent a942769ef9 fbcb460ad1
commit c03f657beb
27 changed files with 295 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hybrid/html/js/uni.webview.1.5.4.js Normal file
View File

File diff suppressed because one or more lines are too long

60
hybrid/html/newMap.html Normal file
View File

@ -0,0 +1,60 @@
<!DOCTYPE html>
<html lang="zh">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
</head>
<script src="http://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce" type="text/javascript">
</script>
<script src="./js/uni.webview.1.5.4.js"></script>
<body onLoad="onLoad()">
<div id="mapDiv" style="position:absolute;width:100vw; height:100vh"></div>
</body>
<style>
* {
margin: 0;
padding: 0;
}
</style>
<script>
var map;
var zoom = 14;
function getUrlParam(name) {
const reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
const r = window.location.search.substr(1).match(reg);
if (r != null) return decodeURI(r[2]);
return "";
}
function onLoad() {
map = new T.Map('mapDiv');
var imageURL = "http://t0.tianditu.gov.cn/img_w/wmts?" +
"SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
"&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=e8a16137fd226a62a23cc7ba5c9c78ce";
lay = new T.TileLayer(imageURL, {minZoom: 1, maxZoom: 18});
var config = {layers: [lay]};
map = new T.Map("mapDiv", config);
map.centerAndZoom(new T.LngLat(getUrlParam('longitude'), getUrlParam('latitude')), zoom);
map.enableScrollWheelZoom();
addMapClick()
}
function addMapClick() {
map.addEventListener("click", MapClick);
}
function MapClick(event) {
var marker = new T.Marker(new T.LngLat(event.lnglat.getLng(), event.lnglat.getLat()));
map.clearOverLays();
map.addOverLay(marker);
console.log(event.lnglat.getLng(), event.lnglat.getLat());
uni.postMessage({
data: {
"longitue": event.lnglat.getLng(),
"latitude": event.lnglat.getLat(),
}
})
}
</script>
</html>

4
pages.json
View File

@ -331,6 +331,10 @@
"path" : "pages/map/map", "path" : "pages/map/map",
"style" : {} "style" : {}
}, },
{
"path" : "pages/map/mapPro",
"style" : {}
},
{ {
"path": "pages/application/high-risk-work/home", "path": "pages/application/high-risk-work/home",
"style": {} "style": {}

2
pages/application/accesscontrol/carmanage/deptapproval/detail.vue
View File

@ -312,7 +312,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/carmanage/depttoexamine/detail.vue
View File

@ -315,7 +315,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/carmanage/sceneconfirm/detail.vue
View File

@ -315,7 +315,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/outsidersmanage/deptapproval/detail.vue
View File

@ -263,7 +263,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/outsidersmanage/depttoexamine/detail.vue
View File

@ -265,7 +265,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/accesscontrol/outsidersmanage/sceneconfirm/detail.vue
View File

@ -290,7 +290,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/eight-assignments/hotwork/apply/detail.vue
View File

@ -1605,7 +1605,7 @@
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/eight-assignments/super-hotwork/detail.vue
View File

@ -1161,7 +1161,7 @@
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/fire-management/hidden-trouble-app/exclude-form.vue
View File

@ -1426,7 +1426,7 @@ export default {
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) { acceptDataFromOpenedPage: function(e) {

2
pages/application/fire-management/hidden-trouble-app/other-hidden-add.vue
View File

@ -1286,7 +1286,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-danger-management/hidden-danger-add/hidden-danger-add.vue
View File

@ -1220,7 +1220,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

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

@ -1212,7 +1212,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
View File

@ -1305,7 +1305,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
View File

@ -1190,7 +1190,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/high-risk-work/blind-work/apply/detail.vue
View File

@ -530,7 +530,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

7
pages/application/high-risk-work/electricity/apply/detail.vue
View File

@ -897,17 +897,12 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {
// console.log(e.data)
// console.info(e.data.longitue)
_this.$set( _this.pd, 'WORK_LONGITUDE', e.data.longitue ) _this.$set( _this.pd, 'WORK_LONGITUDE', e.data.longitue )
_this.$set( _this.pd, 'WORK_LATITUDE', e.data.latitude ) _this.$set( _this.pd, 'WORK_LATITUDE', e.data.latitude )
// _this.pd.WORK_LONGITUDE = e.data.longitue;
// _this.pd.WORK_LATITUDE = e.data.latitude;
// console.info(_this.pd)
} }
}, },
}) })

5
pages/application/high-risk-work/high-work/high-work-apply/high-work-apply-detail.vue
View File

@ -994,15 +994,12 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {
// console.log(e.data)
// console.info(e.data.longitue)
_this.pd.WORK_LONGITUDE = e.data.longitue; _this.pd.WORK_LONGITUDE = e.data.longitue;
_this.pd.WORK_LATITUDE = e.data.latitude; _this.pd.WORK_LATITUDE = e.data.latitude;
// console.info(_this.pd)
} }
}, },
}) })

2
pages/application/high-risk-work/lifting-safety-work/apply/detail.vue
View File

@ -716,7 +716,7 @@ export default {
chooseLocation() { chooseLocation() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/high-risk-work/limited-space/apply/detail.vue
View File

@ -742,7 +742,7 @@ export default {
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/application/key-project-management/AI-warning/detail.vue
View File

@ -1158,7 +1158,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) { acceptDataFromOpenedPage: function(e) {

407
pages/application/key-project-management/hidden-management/detail.vue
View File

@ -7,176 +7,176 @@
<view class="form"> <view class="form">
<view class="wui-form-list"> <view class="wui-form-list">
<view class="de-drawer"> <view class="de-drawer">
<view class="cu-bar bg-white" v-if="hiddenForm.hiddenImgs"> <view class="cu-bar bg-white" v-if="hiddenForm.hiddenImgs">
<view class="action"> <view class="action">
隐患照片 隐患照片
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="hiddenForm.hiddenImgs"> <view class="cu-form-group" v-if="hiddenForm.hiddenImgs">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in hiddenForm.hiddenImgs" :key="index" @tap="ViewImage" <view class="bg-img" v-for="(item,index) in hiddenForm.hiddenImgs" :key="index" @tap="ViewImage"
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.hiddenImgs[index].FILEPATH"> :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.hiddenImgs[index].FILEPATH">
<image :src="baseImgPath + hiddenForm.hiddenImgs[index].FILEPATH" mode="aspectFill"></image> <image :src="baseImgPath + hiddenForm.hiddenImgs[index].FILEPATH" mode="aspectFill"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-bar bg-white" v-if="hiddenForm.hiddenVideos"> <view class="cu-bar bg-white" v-if="hiddenForm.hiddenVideos">
<view class="action"> <view class="action">
隐患视频 隐患视频
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="hiddenForm.hiddenVideos"> <view class="cu-form-group" v-if="hiddenForm.hiddenVideos">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,vindex) in hiddenForm.hiddenVideos" :key="vindex" <view class="bg-img" v-for="(item,vindex) in hiddenForm.hiddenVideos" :key="vindex"
style="background-color: #000"> style="background-color: #000">
<image src="/static/icon-apps/video.png" mode="aspectFill" @click="playVideo" <image src="/static/icon-apps/video.png" mode="aspectFill" @click="playVideo"
:data-src="hiddenForm.hiddenVideos[vindex].FILEPATH"></image> :data-src="hiddenForm.hiddenVideos[vindex].FILEPATH"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-form-textarea"> <view class="cu-form-textarea">
<view class="cu-form-title text-hui">隐患描述</view> <view class="cu-form-title text-hui">隐患描述</view>
<textarea maxlength="-1" disabled v-model="hiddenForm.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea> <textarea maxlength="-1" disabled v-model="hiddenForm.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">隐患部位</view> <view class="title">隐患部位</view>
<view class="picker-tree-box"> <view class="picker-tree-box">
<view>{{ hiddenForm.HIDDENPART }}</view> <view>{{ hiddenForm.HIDDENPART }}</view>
</view> </view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">隐患级别</view> <view class="title">隐患级别</view>
<view class="picker-tree-box"> <view class="picker-tree-box">
<view>{{ hiddenForm.HIDDENLEVEL_NAME }}</view> <view>{{ hiddenForm.HIDDENLEVEL_NAME }}</view>
</view> </view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">隐患类型</view> <view class="title">隐患类型</view>
<view class="picker-tree-box"> <view class="picker-tree-box">
<view>{{ hiddenForm.HIDDENTYPE_NAME }}</view> <view>{{ hiddenForm.HIDDENTYPE_NAME }}</view>
</view> </view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">隐患处置：</view> <view class="title">隐患处置：</view>
<view>限期整改</view> <view>限期整改</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">整改期限：</view> <view class="title">整改期限：</view>
<view>{{ hiddenForm.RECTIFICATIONDEADLINE }}</view> <view>{{ hiddenForm.RECTIFICATIONDEADLINE }}</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title" style="height: auto;"> <view class="title" style="height: auto;">
<view>整改部门：</view> <view>整改部门：</view>
</view> </view>
<view class="picker-tree-box"> <view class="picker-tree-box">
{{ hiddenForm.RECTIFICATIONDEPT_NAME }} {{ hiddenForm.RECTIFICATIONDEPT_NAME }}
</view> </view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">整改人：</view> <view class="title">整改人：</view>
<view>{{ hiddenForm.RECTIFICATIONOR_NAME }}</view> <view>{{ hiddenForm.RECTIFICATIONOR_NAME }}</view>
</view> </view>
<view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'"> <view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
<view class="title">整改时间：</view> <view class="title">整改时间：</view>
<view>{{ hiddenForm.RECTIFICATIONTIME }}</view> <view>{{ hiddenForm.RECTIFICATIONTIME }}</view>
</view> </view>
<view class="cu-bar bg-white" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'"> <view class="cu-bar bg-white" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
<view class="action"> <view class="action">
整改照片 整改照片
</view> </view>
</view> </view>
<view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'"> <view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in hiddenForm.zgImgs" :key="index" @tap="ViewImage1" <view class="bg-img" v-for="(item,index) in hiddenForm.zgImgs" :key="index" @tap="ViewImage1"
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.zgImgs[index].FILEPATH"> :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.zgImgs[index].FILEPATH">
<image :src="baseImgPath + hiddenForm.zgImgs[index].FILEPATH" mode="aspectFill"></image> <image :src="baseImgPath + hiddenForm.zgImgs[index].FILEPATH" mode="aspectFill"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'"> <view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
<view class="title">验收时间：</view> <view class="title">验收时间：</view>
<ruiDatePicker v-if="TabCur == 1" :start="todayDate" fields="minute" :value="CHECKTIME || '请选择'" <ruiDatePicker v-if="TabCur == 1" :start="todayDate" fields="minute" :value="CHECKTIME || '请选择'"
@change="changeDiscoverDate"></ruiDatePicker> @change="changeDiscoverDate"></ruiDatePicker>
<view v-else>{{hiddenForm.CHECKTIME}}</view> <view v-else>{{hiddenForm.CHECKTIME}}</view>
</view> </view>
<view class="cu-bar bg-white" v-show="hiddenForm.STATE==='4'||TabCur==='1'"> <view class="cu-bar bg-white" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
<view class="action"> <view class="action">
验收照片 验收照片
</view> </view>
<view class="action"> <view class="action">
{{hiddenForm.ysImgs.length}}/4 {{hiddenForm.ysImgs.length}}/4
</view> </view>
</view> </view>
<view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'"> <view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in hiddenForm.ysImgs" :key="index" @tap="ViewImage2" :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.ysImgs[index].FILEPATH"> <view class="bg-img" v-for="(item,index) in hiddenForm.ysImgs" :key="index" @tap="ViewImage2" :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.ysImgs[index].FILEPATH">
<image v-if="item.IMGFILES_ID" :src="baseImgPath + hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image> <image v-if="item.IMGFILES_ID" :src="baseImgPath + hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image>
<image v-else :src="hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image> <image v-else :src="hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg" data-type="0" :data-index="index" v-if="TabCur == 1"> <view class="cu-tag bg-red" @tap.stop="DelImg" data-type="0" :data-index="index" v-if="TabCur == 1">
<text class='cuIcon-close'></text> <text class='cuIcon-close'></text>
</view> </view>
</view> </view>
<view class="solids" @tap="ChooseImage(0)" v-if="hiddenForm.ysImgs.length<4 && TabCur == 1"> <view class="solids" @tap="ChooseImage(0)" v-if="hiddenForm.ysImgs.length<4 && TabCur == 1">
<text class='cuIcon-cameraadd'></text> <text class='cuIcon-cameraadd'></text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view v-if="punishForm"> <view v-if="punishForm">
<view class="dy-list-item p20"> <view class="dy-list-item p20">
<view class="dy-title-flex align-center"> <view class="dy-title-flex align-center">
<text>处罚信息</text> <text>处罚信息</text>
</view> </view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">处罚原因：</view> <view class="title">处罚原因：</view>
<view>{{ punishForm.REASON }}</view> <view>{{ punishForm.REASON }}</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">处罚金额：</view> <view class="title">处罚金额：</view>
<view>{{ punishForm.AMOUT }}元</view> <view>{{ punishForm.AMOUT }}元</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">被处罚单位：</view> <view class="title">被处罚单位：</view>
<view>{{ punishForm.UNITS_NAME }}</view> <view>{{ punishForm.UNITS_NAME }}</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">被处罚人：</view> <view class="title">被处罚人：</view>
<view>{{ punishForm.PERSON_NAME }}</view> <view>{{ punishForm.PERSON_NAME }}</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">下发人：</view> <view class="title">下发人：</view>
<view>{{ punishForm.CREATOR_NAME }}</view> <view>{{ punishForm.CREATOR_NAME }}</view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">下发处罚时间：</view> <view class="title">下发处罚时间：</view>
<view>{{ punishForm.DATE }}</view> <view>{{ punishForm.DATE }}</view>
</view> </view>
<view class="cu-bar bg-white" v-if="punishForm.HANDLE_IMG"> <view class="cu-bar bg-white" v-if="punishForm.HANDLE_IMG">
<view class="action"> <view class="action">
罚款缴纳单 罚款缴纳单
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="punishForm.HANDLE_IMG"> <view class="cu-form-group" v-if="punishForm.HANDLE_IMG">
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
<view class="bg-img"> <view class="bg-img" @tap="viewImagePunish">
<image :src="baseImgPath + punishForm.HANDLE_IMG" mode="aspectFill"></image> <image :src="baseImgPath + punishForm.HANDLE_IMG" mode="aspectFill"></image>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">是否缴纳罚款：</view> <view class="title">是否缴纳罚款：</view>
<view>{{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}</view> <view>{{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}</view>
</view> </view>
<view class="cu-form-group" v-if="punishForm.HANDLED === '1'"> <view class="cu-form-group" v-if="punishForm.HANDLED === '1'">
<view class="title">处罚处理人：</view> <view class="title">处罚处理人：</view>
<view >{{punishForm.PERSON_NAME}}</view> <view >{{punishForm.PERSON_NAME}}</view>
</view> </view>
<view class="cu-form-group" v-if="punishForm.HANDLED === '1'"> <view class="cu-form-group" v-if="punishForm.HANDLED === '1'">
<view class="title" >处罚处理时间：</view> <view class="title" >处罚处理时间：</view>
<view >{{punishForm.HANLDE_TIME}}</view> <view >{{punishForm.HANLDE_TIME}}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-bar btn-group" style="margin-top: 30upx;"> <view class="cu-bar btn-group" style="margin-top: 30upx;">
<button v-if="TabCur == 1" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit)">验收</button> <button v-if="TabCur == 1" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit)">验收</button>
@ -223,7 +223,7 @@ export default {
ysImgs:[], ysImgs:[],
CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm') CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm')
}, },
punishForm:{}, punishForm:{},
videoSrc:'', videoSrc:'',
modalShow:false, modalShow:false,
todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'), todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
@ -256,15 +256,22 @@ export default {
uni.hideLoading();//结束加载中动画 uni.hideLoading();//结束加载中动画
if (res.data != null) { if (res.data != null) {
this.hiddenForm = res.data.pd this.hiddenForm = res.data.pd
if(res.data.pd.punishForm){ if(res.data.pd.punishForm){
this.punishForm = res.data.pd.punishForm this.punishForm = res.data.pd.punishForm
}else{ }else{
this.punishForm = null; this.punishForm = null;
} }
} }
} }
}) })
}, },
viewImagePunish(e) {
let files = [];
files.push(this.baseImgPath + this.punishForm.HANDLE_IMG)
uni.previewImage({
urls: files
});
},
ViewImage(e) { ViewImage(e) {
let files = []; let files = [];
for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) { for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) {
@ -294,18 +301,18 @@ export default {
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
ViewImage2(e) { ViewImage2(e) {
let files =[]; let files =[];
for(var i=0;i<this.hiddenForm.ysImgs.length;i++){ for(var i=0;i<this.hiddenForm.ysImgs.length;i++){
if(e.currentTarget.dataset.id){ if(e.currentTarget.dataset.id){
files.push(this.baseImgPath + this.hiddenForm.ysImgs[i].FILEPATH) files.push(this.baseImgPath + this.hiddenForm.ysImgs[i].FILEPATH)
}else { }else {
files.push(this.hiddenForm.ysImgs[i].FILEPATH) files.push(this.hiddenForm.ysImgs[i].FILEPATH)
}
} }
uni.previewImage({ }
urls: files, uni.previewImage({
current: e.currentTarget.dataset.id ? this.baseImgPath + e.currentTarget.dataset.url : e.currentTarget.dataset.url urls: files,
}); current: e.currentTarget.dataset.id ? this.baseImgPath + e.currentTarget.dataset.url : e.currentTarget.dataset.url
});
}, },
DelImg(e) { DelImg(e) {
var _this = this; var _this = this;
@ -347,17 +354,17 @@ export default {
} }
}); });
}, },
fnImagePreview(list, index) { fnImagePreview(list, index) {
const urls = []; const urls = [];
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
urls.push(list[i].url); urls.push(list[i].url);
} }
const current = urls[index]; const current = urls[index];
uni.previewImage({ uni.previewImage({
urls, urls,
current current
}) })
}, },
changeRadioGroup(e){ changeRadioGroup(e){
if(this.TabCur == 2) return if(this.TabCur == 2) return
this.hiddenForm.ISPUNISH = e.detail.value this.hiddenForm.ISPUNISH = e.detail.value
@ -450,7 +457,7 @@ export default {
<style scoped> <style scoped>
.dy-title-flex{ .dy-title-flex{
font-weight: bold; font-weight: bold;
font-size: 35upx; font-size: 35upx;
} }
</style> </style>

2
pages/application/key-project-management/safety-environmental-inspection/detail.vue
View File

@ -1409,7 +1409,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function(e) { acceptDataFromOpenedPage: function(e) {

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

@ -1240,7 +1240,7 @@ export default {
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {

2
pages/basics/risk-distribution/risk-distribution-detail.vue
View File

@ -212,7 +212,7 @@
showMapModal() { showMapModal() {
var _this = this var _this = this
uni.navigateTo({ uni.navigateTo({
url: '/pages/map/map', url: '/pages/map/mapPro',
events: { events: {
// 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据 // 为指定事件添加一个监听器，获取被打开页面传送到当前页面的数据
acceptDataFromOpenedPage: function (e) { acceptDataFromOpenedPage: function (e) {