Skip to content

G
GaoQuYingJiMiniPro
Commit 6727dc0f authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

政府编辑图片好用

parent 7754b8c7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2275 additions and 446 deletions
app.json
View file @ 6727dc0f
{
"permission": {
"scope.userLocation": {
"desc": "您的位置将用于匹配企业信息与安全培训定位"
"permission": {
"scope.userLocation": {
"desc": "您的位置将用于匹配企业信息与安全培训定位"
},
"scope.camera": {}
},
"scope.camera": {}
},
"requiredPrivateInfos": [
"choosePoi",
"chooseAddress"
],
"pages": [
"pages/loginv2/loginv2",
"pages/home/home",
"pages/hwapprovallist/hwapprovallist",
"pages/enterprise/enterprise",
"pages/law/law",
"pages/lawlv1/lawlv1",
"pages/lawlv2/lawlv2",
"pages/warnIndex/warnIndex",
"pages/choiceCounty/choiceCounty",
"pages/person/person",
"pages/forgetPassword/forgetPassword",
"pages/lawItem/lawItem",
"pages/advice/advice",
"pages/adviceItem/adviceItem",
"pages/info/info",
"pages/exam/exam",
"pages/warn/warn",
"pages/evaluate/evaluate",
"pages/testpaper/testpaper",
"pages/teach/teach",
"pages/live/live",
"pages/course/course",
"pages/dangerregister/dangerregister",
"pages/dangeredit/dangeredit",
"pages/dangerlist/dangerlist",
"pages/login/login",
"pages/hwapproval/hwapproval",
"pages/sign/sign",
"pages/logs/logs",
"pages/index/index",
"pages/hwcatapproval/hwcatapproval",
"pages/addtrainimg/addtrainimg",
"pages/trainimg/trainimg",
"pages/trainimgitem/trainimgitem",
"pages/certify/certify",
"pages/trainimgenter/trainimgenter",
"pages/certifyenter/certifyenter",
"pages/hwapprovals/hwapprovals",
"pages/certifyitem/certifyitem",
"pages/addapproval/addapproval",
"pages/addcertify/addcertify"
],
"subpackages": [
{
"root": "packageA",
"pages": [
],
"independent": true
"requiredPrivateInfos": [
"choosePoi",
"chooseAddress"
],
"pages": [
"pages/loginv2/loginv2",
"pages/home/home",
"pages/hwapprovallist/hwapprovallist",
"pages/enterprise/enterprise",
"pages/law/law",
"pages/lawlv1/lawlv1",
"pages/lawlv2/lawlv2",
"pages/warnIndex/warnIndex",
"pages/choiceCounty/choiceCounty",
"pages/person/person",
"pages/forgetPassword/forgetPassword",
"pages/lawItem/lawItem",
"pages/advice/advice",
"pages/adviceItem/adviceItem",
"pages/info/info",
"pages/exam/exam",
"pages/warn/warn",
"pages/evaluate/evaluate",
"pages/testpaper/testpaper",
"pages/teach/teach",
"pages/live/live",
"pages/course/course",
"pages/dangerregister/dangerregister",
"pages/dangeredit/dangeredit",
"pages/dangereditcompany/dangereditcompany",
"pages/dangerlist/dangerlist",
"pages/dangerlistverify/dangerlistverify",
"pages/dangerlistverifydetail/dangerlistverifydetail",
"pages/login/login",
"pages/hwapproval/hwapproval",
"pages/sign/sign",
"pages/logs/logs",
"pages/index/index",
"pages/hwcatapproval/hwcatapproval",
"pages/addtrainimg/addtrainimg",
"pages/trainimg/trainimg",
"pages/trainimgitem/trainimgitem",
"pages/certify/certify",
"pages/trainimgenter/trainimgenter",
"pages/certifyenter/certifyenter",
"pages/hwapprovals/hwapprovals",
"pages/certifyitem/certifyitem",
"pages/addapproval/addapproval",
"pages/addcertify/addcertify",
"pages/dangerlistverifydetail"
],
"subpackages": [
{
"root": "packageA",
"pages": [],
"independent": true
},
{
"root": "packageB",
"pages": [],
"independent": true
},
{
"root": "packageC",
"pages": [],
"independent": true
},
{
"root": "packageD",
"pages": [],
"independent": true
},
{
"root": "packageE",
"pages": [],
"independent": true
},
{
"root": "packageF",
"pages": [],
"independent": true
}
],
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "安全生产管理平台",
"navigationBarTextStyle": "black"
},
{
"root": "packageB",
"pages": [
],
"independent": true
},
{
"root": "packageC",
"pages": [
],
"independent": true
},
{
"root": "packageD",
"pages": [
],
"independent": true
},
{
"root": "packageE",
"pages": [
],
"independent": true
},
{
"root": "packageF",
"pages": [
],
"independent": true
}
],
"window": {
"backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff",
"navigationBarTitleText": "安全生产管理平台",
"navigationBarTextStyle": "black"
},
"style": "v2",
"sitemapLocation": "sitemap.json"
"style": "v2",
"sitemapLocation": "sitemap.json"
}
\ No newline at end of file
pages/dangeredit/dangeredit.js
View file @ 6727dc0f
......@@ -6,6 +6,7 @@ Page({
* 页面的初始数据
*/
data: {
editAble: true,
checkImg:false,
showButton:false,
// 企业id
......@@ -181,36 +182,67 @@ Page({
inputEvaluation(event) {
this.data.recEvaluation = event.detail.value
},
/**
* 拍摄整改照片
/**
* 拍摄隐患图片
*/
takePhoto() {
// const ctx = wx.createCameraContext()
// ctx.takePhoto({
// quality: 'high',
// success: (res) => {
// this.setData({
// imgsrc: res.tempImagePath
// })
// }
// })
wx.chooseImage({
success: (res) => {
if(res.tempFilePaths[0]){
this.setData({
checkImg: true
})
}else{
this.setData({
checkImg: false
})
}
console.log(res.tempFilePaths[0],'res.tempFilePaths[0]',this.data.checkImg)
this.data.rectFilePath = res.tempFilePaths[0]
this.data.hdFilePath = res.tempFilePaths[0]
wx.getFileSystemManager().readFile({
filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
encoding: 'base64', // 编码格式
encoding: 'base64', //编码格式
success: res1 => { // 成功的回调
// console.log('data:image/png;base64, ' + res1.data)
// this.imgsrc = 'data:image/png;base64,' + res1.data
this.setData({
imgrecturl: 'data:image/png;base64,' + res1.data
imgsrcurl: 'data:image/png;base64,' + res1.data
})
}
})
// wx.uploadFile()
}
})
},
// /**
// * 拍摄整改照片
// */
// takePhoto() {
// wx.chooseImage({
// success: (res) => {
// if(res.tempFilePaths[0]){
// this.setData({
// checkImg: true
// })
// }else{
// this.setData({
// checkImg: false
// })
// }
// console.log(res.tempFilePaths[0],'res.tempFilePaths[0]',this.data.checkImg)
// this.data.rectFilePath = res.tempFilePaths[0]
// wx.getFileSystemManager().readFile({
// filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
// encoding: 'base64', // 编码格式
// success: res1 => { // 成功的回调
// this.setData({
// imgrecturl: 'data:image/png;base64,' + res1.data
// })
// }
// })
// }
// })
// },
/**
* 输入整改日期
*/
......@@ -256,15 +288,15 @@ Page({
* 提交修改
*/
submitEdit() {
if((this.data.imgrecturl=== "" || this.data.imgrecturl=== null||this.data.imgrecturl === 'null'||this.data.imgrecturl === undefined)&&this.data.hdStatus==1){
if(!this.data.imgsrcurl){
wx.showToast({
title: '没有整改照片',
title: '没有隐患照片',
icon: 'error',
duration: 1000
})
return
}
if (this.data.rectFilePath) {
if (this.data.hdFilePath) {
wx.showLoading({
title: '上传中',
})
......@@ -282,29 +314,15 @@ Page({
if (!formData.hdRectificationDate) {
delete formData.hdRectificationDate
}
if (
formData.recDeadLine === "" ||
formData.recDeadLine === null||formData.recDeadLine === 'null'
) {
if (!formData.recDeadLine) {
delete formData.recDeadLine;
}
if (
formData.recEvaluation === "" ||
formData.recEvaluation === null||formData.recDeadLine === 'null'
) {
if (!formData.recEvaluation) {
delete formData.recEvaluation;
}
if(formData.imgrecturl=== "" || formData.imgrecturl=== null||formData.imgrecturl === 'null'){
console.log(111,formData.imgrecturl)
}
// if (this.formInfo.typeId === "" || this.formInfo.typeId === null) {
// formData.delete("typeId");
// }
// console.log('整改日期:' + this.data.rectFilePath)
console.log('整改照片:' + this.data.imgrecturl)
wx.uploadFile({
filePath: this.data.rectFilePath,
name: 'hdRectificationPic',
filePath: this.data.hdFilePath,
name: 'hdPic',
url: app.globalData.appBaseUrl + '/api/thHiddenDanger/update',
formData: formData,
header: {
......@@ -313,13 +331,13 @@ Page({
success: (res) => {
console.log(res, '文件编辑上传')
wx.hideLoading()
if (res.statusCode === 204) {
if (res.status === 201) {
wx.showToast({
title: '编辑成功',
icon: 'success'
})
wx.navigateBack()
} else if (res.statusCode === 401) {
} else if (res.status === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
......@@ -357,30 +375,24 @@ Page({
delete formData.hdRectificationDate
}
// if(this.formInfo.recDeadLine)
if (
formData.recDeadLine === "" ||
formData.recDeadLine === null||formData.recDeadLine === 'null'
) {
if (!formData.recDeadLine) {
delete formData.recDeadLine;
}
if (
formData.recEvaluation === "" ||
formData.recEvaluation === null||formData.recDeadLine === 'null'
) {
if (!formData.recEvaluation) {
delete formData.recEvaluation;
}
let that = this
if((formData.imgrecturl=== "" || formData.imgrecturl=== null||formData.imgrecturl === 'null'||formData.imgrecturl === undefined)&&(that.data.imgrecturl=== "" || that.data.imgrecturl=== null||that.data.imgrecturl === 'null'||that.data.imgrecturl === undefined)&&this.data.hdStatus==1){
console.log('整改照片3:' + that.data.imgrecturl,formData.imgrecturl)
wx.showToast({
title: '选择整改照片',
icon: 'error',
duration: 1000
})
return
}else{
console.log('整改照片4:' + this.data.imgrecturl)
}
// if((formData.imgrecturl=== "" || formData.imgrecturl=== null||formData.imgrecturl === 'null'||formData.imgrecturl === undefined)&&(that.data.imgrecturl=== "" || that.data.imgrecturl=== null||that.data.imgrecturl === 'null'||that.data.imgrecturl === undefined)&&this.data.hdStatus==1){
// console.log('整改照片3:' + that.data.imgrecturl,formData.imgrecturl)
// wx.showToast({
// title: '选择整改照片',
// icon: 'error',
// duration: 1000
// })
// return
// }else{
// console.log('整改照片4:' + this.data.imgrecturl)
// }
// if (this.formInfo.typeId === "" || this.formInfo.typeId === null) {
// formData.delete("typeId");
// }
......
pages/dangeredit/dangeredit.wxml
View file @ 6727dc0f
......@@ -5,11 +5,11 @@
class="danger-form-wrapper">
<!-- <view class="danger-order">
<text>序号:</text>
<input type="text" disabled="true" />
<input type="text" disabled="{{!editAble}}" />
</view> -->
<view class="danger-check-date">
<text>检查日期:</text>
<picker class="danger-pick-date" disabled="true" mode="date" value="{{hdInspectDate}}" bindchange="">
<picker class="danger-pick-date" disabled="{{!editAble}}" mode="date" value="{{hdInspectDate}}" bindchange="">
<view class="current-picker">
当前选择: {{hdInspectDate}}
</view>
......@@ -18,45 +18,53 @@
<view class="danger-expert">
<text>检查人员:</text>
<input type="text" disabled="true" placeholder="请输入人员名称" value="{{hdInspectExpert}}" bindinput="" />
<input type="text" disabled="{{!editAble}}" placeholder="请输入人员名称" value="{{hdInspectExpert}}" bindinput="" />
</view>
<view class="danger-type">
<text>隐患类型:</text>
<radio-group bindchange="">
<radio color="#1d2089" disabled="true" checked="{{hdLevel===1}}" value="1" >一般隐患</radio>
<radio color="#1d2089" disabled="true" checked="{{hdLevel===2}}" value="2" >重大隐患</radio>
<radio color="#1d2089" disabled="{{!editAble}}" checked="{{hdLevel===1}}" value="1" >一般隐患</radio>
<radio color="#1d2089" disabled="{{!editAble}}" checked="{{hdLevel===2}}" value="2" >重大隐患</radio>
</radio-group>
</view>
<block wx:if="{{comment==''||comment==null}}">
<view class="danger-name">
<text style="width:200rpx ;">隐患名称:</text>
<textarea type="text" disabled="true" placeholder="请输入隐患名称" value="{{hdName}}" bindinput="" maxlength="-1" />
<textarea type="text" disabled="{{!editAble}}" placeholder="请输入隐患名称" value="{{hdName}}" bindinput="" maxlength="-1" />
</view>
</block>
<view class="danger-expert">
<text style="width:200rpx ;">隐患描述: </text>
<textarea type="text" disabled="true" placeholder="请输入隐患描述" value="{{comment}}" bindinput="" maxlength="-1" />
<textarea type="text" disabled="{{!editAble}}" placeholder="请输入隐患描述" value="{{comment}}" bindinput="" maxlength="-1" />
</view>
<view class="danger-expert">
<text style="width:200rpx ;">检查依据: </text>
<textarea type="text" disabled="false" placeholder="请输入检查依据" value="{{basis}}" bindinput="" maxlength="-1" />
<textarea type="text" disabled="{{!editAble}}" placeholder="请输入检查依据" value="{{basis}}" bindinput="" maxlength="-1" />
</view>
<view class="danger-rect">
<text>整改建议:</text>
<textarea wx:if="{{suggestion!=''}}" disabled="true" maxlength="-1" bindinput="" value="{{suggestion}}"></textarea>
<textarea wx:else="{{suggestion==''}}" disabled="true" maxlength="-1" bindinput="" value="{{hdRectificationSug}}"></textarea>
<textarea wx:if="{{suggestion!=''}}" disabled="{{!editAble}}" maxlength="-1" bindinput="" value="{{suggestion}}"></textarea>
<textarea wx:else="{{suggestion==''}}" disabled="{{!editAble}}" maxlength="-1" bindinput="" value="{{hdRectificationSug}}"></textarea>
</view>
<view class="hdPic-preview">
<!-- <view class="hdPic-preview">
<text>隐患照片预览:</text>
<image mode="aspectFit" src="{{imgsrcurl}}"
bindtap="toEnlargePicByHiddenPic"></image>
</view> -->
<view class="danger-img">
<text>隐患照片</text>
<!-- <camera device-position="back" flash="off" style="width:100%;height:300px;"></camera> -->
<image mode="aspectFit" src="{{imgsrcurl}}"></image>
<button wx:if="{{editAble}}" type="primary" bindtap="takePhoto" style="background-color: #1d2089;">拍照</button>
</view>
<view class="danger-img">
<text>整改照片</text>
<!-- <camera device-position="back" flash="off" style="width:100%;height:300px;"></camera> -->
<image mode="aspectFit" src="{{imgrecturl}}" bindtap="toEnlargePicByRectPic"></image>
<button wx:if="{{showButton}}" type="primary" bindtap="takePhoto" style="background-color: #1d2089;">拍照</button>
</view>
<view class="danger-rect-date" >
<text>整改期限:</text>
......@@ -79,16 +87,13 @@
</view>
</picker>
</view>
<view class="danger-recept-per" wx:if="{{!showButton}}">
<view class="danger-recept-per">
<text>复查人员:</text>
<input type="text" placeholder="请输入验收人" value="{{hdAcceptancePerson}}" disabled="true" bindinput="inputAcceptancePer" />
</view>
<view class="danger-rect" >
<text>复查记录:</text>
<textarea wx:if="{{(recEvaluation!='')&&((curRole=='企业管理'))}}" disabled="true" maxlength="-1" bindinput="" value="{{recEvaluation}}"></textarea>
<textarea wx:else="{{(recEvaluation=='')&&((curRole=='企业管理'))}}" disabled="true" maxlength="-1" bindinput="" value="{{hdRectificationSug}}"></textarea>
<textarea wx:if="{{(recEvaluation!='')&&(!(curRole=='企业管理'))}}" maxlength="-1" bindinput="" value="{{recEvaluation}}"></textarea>
<textarea wx:else="{{(recEvaluation=='')&&(!(curRole=='企业管理'))}}" maxlength="-1" bindinput="" value="{{hdRectificationSug}}"></textarea>
<textarea disabled="true" maxlength="-1" bindinput="" value="{{recEvaluation}}"></textarea>
</view>
<!-- <view class="rect-img">
<text>整改照片</text>
......@@ -99,14 +104,14 @@
<image mode="widthFix" src="{{imgrecturl}}"></image>
</view> -->
<!-- <view class="danger-status" wx:if="{{checkImg===true}}"> -->
<view class="danger-status" >
<!-- <view class="danger-status" >
<text>隐患状态:</text>
<radio-group bindchange="inputRectStatus">
<radio checked="{{hdStatus===0}}" value="0" color="#1d2089">未整改</radio>
<radio checked="{{hdStatus===1}}" value="1" color="#1d2089" >整改完成</radio>
</radio-group>
</view>
<view class="danger-submit" wx:if="{{showButton}}">
</view> -->
<view class="danger-submit" wx:if="{{editAble}}">
<button type="primary" bindtap="submitEdit" style="background-color: #1d2089;" >提交修改</button>
</view>
</scroll-view>
......
pages/dangereditcompany/dangereditcompany.js 0 → 100644
View file @ 6727dc0f
This diff is collapsed.
pages/dangereditcompany/dangereditcompany.json 0 → 100644
View file @ 6727dc0f
{
"usingComponents": {}
}
\ No newline at end of file
pages/dangereditcompany/dangereditcompany.wxml 0 → 100644
View file @ 6727dc0f
<!--pages/dangeredit/dangeredit.wxml-->
<view class="danger-edit-wrapper">
<scroll-view scroll-y="true" class="danger-form-wrapper">
<!-- <view class="danger-order">
<text>序号:</text>
<input type="text" disabled="{{!editAble}}" />
</view> -->
<view class="danger-check-date">
<text>检查日期:</text>
<picker class="danger-pick-date" disabled="{{!editAble}}" mode="date" value="{{hdInspectDate}}" bindchange="selectCheckDate">
<view class="current-picker">
当前选择: {{hdInspectDate}}
</view>
</picker>
</view>
<view class="danger-expert">
<text>检查人员:</text>
<input type="text" disabled="{{!editAble}}" placeholder="请输入人员名称" value="{{hdInspectExpert}}" bindinput="inputHdInspectExpert" />
</view>
<view class="danger-type">
<text>隐患等级:</text>
<radio-group bindchange="inputHDType">
<radio color="#1d2089" disabled="{{!editAble}}" checked="{{hdLevel===1}}" value="1">一般隐患</radio>
<radio color="#1d2089" disabled="{{!editAble}}" checked="{{hdLevel===2}}" value="2">重大隐患</radio>
</radio-group>
</view>
<view class="c11-1">
<text>安全类别:</text>
<view>
<picker
header-text="安全类别"
mode="selector"
range="{{secType}}"
range-key="name"
bindchange="chooseSecType"
>
当前选择: {{curSelectSecType}}
</picker>
</view>
</view>
<view class="c11-1">
<text>安全检查类别</text>
<view>
<picker
header-text="安全检查类别"
mode="selector"
range="{{secCheckTypeReplace}}"
range-key="name"
bindchange="chooseSecCheckType"
>
当前选择: {{curSelectSecCheckTypeReplace}}
</picker>
</view>
</view>
<view class="c11-1">
<text>安全检查内容</text>
<view>
<picker
header-text="安全检查内容"
mode="selector"
range="{{secCheckContent}}"
range-key="name"
bindchange="chooseSecCheckContent"
>当前选择: {{curSelectCheckContent}}</picker>
</view>
</view>
<view class="c11-1">
<text>发现问题</text>
<view>
<picker
header-text="发现问题"
mode="selector"
range="{{secCheckDiscover}}"
range-key="name"
bindchange="chooseSecCheckDiscover"
>当前选择:{{hdName}}</picker>
</view>
</view>
<view class="danger-expert">
<text style="width:200rpx ;">隐患描述: </text>
<input type="text" disabled="{{!editAble}}" placeholder="请输入隐患描述" value="{{comment}}" bindinput="inputHdComment" maxlength="-1" />
</view>
<view class="danger-expert">
<text style="width:200rpx ;">检查依据: </text>
<textarea type="text" disabled="false" placeholder="请输入检查依据" value="{{basis}}" bindinput="" maxlength="-1" />
</view>
<view class="danger-rect">
<text>整改建议:</text>
<textarea wx:if="{{suggestion!=''}}" disabled="{{!editAble}}" maxlength="-1" bindinput="" value="{{suggestion}}"></textarea>
<textarea wx:else="{{suggestion==''}}" disabled="{{!editAble}}" maxlength="-1" bindinput="" value="{{hdRectificationSug}}"></textarea>
</view>
<view class="hdPic-preview">
<text>隐患照片:</text>
<image mode="aspectFit" src="{{imgsrcurl}}" bindtap="toEnlargePicByHiddenPic"></image>
<button wx:if="{{editAble}}" type="primary" bindtap="takePhoto" style="background-color: #1d2089;">拍照</button>
</view>
<view class="danger-img">
<text>整改照片</text>
<!-- <camera device-position="back" flash="off" style="width:100%;height:300px;"></camera> -->
<image mode="aspectFit" src="{{imgrecturl}}" bindtap="toEnlargePicByRectPic"></image>
</view>
<view class="danger-rect-date">
<text>整改期限:</text>
<picker class="danger-pick-date" mode="date" bindchange="inputRectification" value="{{recDeadLine}}">
<view class="current-picker">
当前选择: {{recDeadLine ? recDeadLine : ''}}
</view>
</picker>
</view>
<view class="danger-rect-date">
<text>复查日期:</text>
<picker class="danger-pick-date" disabled="true" mode="date" bindchange="inputRectDate" value="{{hdRectificationDate}}">
<view class="current-picker">
当前选择: {{hdRectificationDate ? hdRectificationDate : ''}}
</view>
</picker>
</view>
<view class="danger-recept-per">
<text>复查人员:</text>
<input type="text" placeholder="请输入验收人" value="{{hdAcceptancePerson}}" disabled="true" bindinput="inputAcceptancePer" />
</view>
<view class="danger-rect">
<text>复查记录:</text>
<textarea disabled="true" maxlength="-1" bindinput="" value="{{recEvaluation}}"></textarea>
</view>
<view class="danger-submit" wx:if="{{editAble}}">
<button type="primary" bindtap="submitEdit" style="background-color: #1d2089;">提交修改</button>
</view>
</scroll-view>
<view class="enlarge-pic-wrapper {{isToEnLarge? 'enlarge-pic-show': ''}}">
<image src="{{enlargeUrl}}" mode="aspectFit" class="enlarge-pic" bindtap="toCancelEnlargePic"></image>
</view>
</view>
\ No newline at end of file
pages/dangereditcompany/dangereditcompany.wxss 0 → 100644
View file @ 6727dc0f
/* pages/dangeredit/dangeredit.wxss */
/* pages/dangerregister/dangerregister.wxss */
.danger-edit-wrapper {
width: 100vw;
height: 100vh;
position: relative;
box-sizing: border-box;
}
.danger-form-wrapper {
position: absolute;
height: 100vh;
width: 100vw;
margin: 0 auto;
padding-top: 2vh;
padding-bottom: 2vh;
}
.danger-order {
display: flex;
margin: 3vh 2vw;
background-color: white;
padding: 1vh 1vw;
}
.danger-order text {
flex-grow: 0;
flex-shrink: 0;
}
.danger-order input {
flex-grow: 1;
flex-shrink: 0;
}
.danger-check-date {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-check-date .danger-pick-date {
flex: 1;
text-align: right;
}
.danger-expert {
/* display: flex; */
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-name {
/* display: flex; */
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-type {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
}
.danger-rect {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.hdPic-preview {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.hdPic-preview image {
width: 100%;
}
.danger-img {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-preview {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-preview image {
width: 100%;
}
.danger-rect-date {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-recept-per {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.rect-img {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
}
.rect-preview {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
}
.danger-status {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.enlarge-pic-wrapper {
position: fixed;
display: none;
z-index: 999;
left: 0;
top: 0;
bottom: 0;
right: 0;
background-color: black;
align-items: center;
justify-content: center;
}
.enlarge-pic-show {
display: flex;
}
.enlarge-pic {
width: 100vw;
height: 100vh;
}
\ No newline at end of file
pages/dangerlist/dangerlist.js
View file @ 6727dc0f
......@@ -128,20 +128,14 @@ Page({
})
arr = newarr;
console.log(arr, '获取当前企业的隐患arr2')
if (res.statusCode === 200) {
if (res.status === 200) {
this.setData({
dglist: [...res.data.content]
})
} else if (res.statusCode === 401) {
} else if (res.status === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
} else {
wx.showToast({
title: '获取失败',
icon: 'error',
duration: 2000
})
}
wx.hideLoading()
},
......@@ -185,83 +179,6 @@ Page({
onShareAppMessage: function () {
// console.log('dgonshareappmessage')
},
// 查询未通过原因
checkReason(e){
wx.request({
url: app.globalData.appBaseUrl + '/api/hiddenDangerToVerify',
method: 'GET',
header: {
Authorization: app.globalData.Authorization
},
data: {
enName:this.data.curEnterName,
hd_id:e.currentTarget.dataset.word.hdId,
page: 0,
size: 99999
},
header: {
Authorization: app.globalData.Authorization
},
success: (res) => {
if (res.statusCode === 200) {
console.log(res.data.content,'...')
let list = res.data.content
let newMsgArr=[]
for(let i=0;i<list.length;i++){
if(e.currentTarget.dataset.word.hdId===list[i].hdId){
newMsgArr.push(list[i])
}
}
let compare = function (obj1, obj2) {
var val1 = obj1.id;
var val2 = obj2.id;
if (val1 < val2) {
return -1;
} else if (val1 > val2) {
return 1;
} else {
return 0;
}
}
console.log(newMsgArr)
let sortMsg=newMsgArr.sort(compare)
let len=sortMsg.length
let newMsg = sortMsg[len-1].refuseReason
console.log(newMsg)
this.setData({
newMsg: newMsg,
// msgShow:!this.data.msgShow
})
wx.showModal({
title: '未通过原因',
content: this.data.newMsg,
success: function (res) {
if (res.confirm) {
console.log('用户点击确定')
}else{
console.log('用户点击取消')
}
}
})
} else if (res.statusCode === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
} else {
wx.showToast({
title: '获取失败',
icon: 'error',
duration: 2000
})
}
wx.hideLoading()
},
fail: () => {
wx.hideLoading()
}
})
},
/**
* 新增隐患
*/
......
pages/dangerlist/dangerlist.wxml
View file @ 6727dc0f
......@@ -14,7 +14,7 @@
<span wx:else>{{item.hdName}}</span>
</view>
<view >
<span>超期未整改</span>
<span>整改中</span>
</view>
<view style="float: right; margin-top: 20px;">
<button type="default" class="editBtn" size="mini" bindtap="editHD" data-index="{{index}}">查看</button>
......
pages/dangerlistverify/dangerlistverify.js 0 → 100644
View file @ 6727dc0f
const app = getApp()
// pages/dangerlist/dangerlist.js
Page({
/**
* 页面的初始数据
*/
data: {
enterImgUrl: 'http://39.102.232.151:8030/cover/企业搜索icon.png',
verifyStatus: [{
name: '整合中',
value: 0
},
{
name: '待审核',
value: 3
},
{
name: '审核通过',
value: 1
},
{
name: '审核未通过',
value: 2
},
],
selectedStatus: '',
selectedstatus: '',
msgShow: false,
dglist: [],
curEnterName: '',
leftMove: {},
topAnimation: {},
curRole: ''
},
/**
* 生命周期函数--监听页面加载
*/
// onLoad: function (options) {
// this.setData({
// curRole: app.globalData.curRole
// })
// const animation = wx.createAnimation({
// delay: 20,
// timingFunction: 'linear'
// })
// this.animation = animation
// this.setData({
// curEnterName: app.globalData.currentEnter.companyName
// })
// // console.log('dgonload')
// wx.showLoading({
// title: '正在加载隐患列表',
// })
// wx.request({
// url: app.globalData.appBaseUrl + '/api/hiddenDangerToVerify',
// method: 'GET',
// header: {
// Authorization: app.globalData.Authorization
// },
// data: {
// county:app.globalData.appCounty,
// companyId: app.globalData.currentEnter.companyId,
// sort: 'hdId,asc',
// page: 0,
// size: 99999
// },
// header: {
// Authorization: app.globalData.Authorization
// },
// success: (res) => {
// let arr= [...res.data.content]
// let newarr = [];
// arr.map((item,index)=>{
// newarr.push(Object.assign(item,{msgShow:false}))
// })
// arr = newarr;
// console.log(arr, '获取当前企业的隐患arr3')
// if (res.status === 200) {
// this.setData({
// dglist: [...res.data.content]
// })
// return;
// } else if (res.status === 401) {
// wx.redirectTo({
// url: '/pages/login/login',
// })
// } else {
// wx.showToast({
// title: '获取失败',
// icon: 'error',
// duration: 2000
// })
// }
// wx.hideLoading()
// },
// fail: () => {
// wx.hideLoading()
// }
// })
// console.log(this.data.curRole,'sssssssssss-----------------------')
// },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
// console.log('dgonready')
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
// console.log('dgonshow')
wx.setNavigationBarTitle({
title: app.globalData.currentEnter.companyName,
})
wx.setNavigationBarColor({
backgroundColor: '#090D9C',
frontColor: '#ffffff'
})
wx.showLoading({
title: '正在加载',
})
this.getDataList()
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
// console.log('dgonhide')
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
// console.log('dgonupload')
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
// console.log('dgonpulldown')
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
// console.log('dgonreachBottom')
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
// console.log('dgonshareappmessage')
},
getDataList() {
wx.request({
url: app.globalData.appBaseUrl + '/api/hiddenDangerToVerify',
method: 'GET',
header: {
Authorization: app.globalData.Authorization
},
data: {
county: app.globalData.appCounty,
// companyId: app.globalData.currentEnter.companyId,
// enName: '',
// verifyState: this.selectedstatus,
sort: 'verify_status,asc',
page: 0,
size: 99999
},
header: {
Authorization: app.globalData.Authorization
},
success: (res) => {
if (res.status === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
}
this.setData({
dglist: [...res.data.content]
})
wx.hideLoading()
},
fail: () => {
wx.hideLoading()
}
})
},
chooseCounty(e) {
let that = this;
this.setData({
selectedStatus: that.data.verifyStatus[e.detail.value].name,
selectedstatus: that.data.verifyStatus[e.detail.value].value
})
},
/**
* 审核通过
*/
confirmPass(id) {
wx.request({
url: app.globalData.appBaseUrl + '/api/hiddenDangerToVerify/verify',
method: 'get',
header: {
Authorization: app.globalData.Authorization
},
data: {
id,
status: 1,
},
success: (res) => {
if (res.status === 204) {
wx.showToast({
title: '编辑成功',
icon: 'success',
duration: 2000
})
setTimeout(() => {
this.getDataList()
}, 2000);
} else if (res.status === 400) {
wx.showToast({
title: res.data.message,
icon: 'error',
duration: 2000
})
}
},
fail: () => {},
complete: () => {
wx.hideLoading()
}
})
},
pass(event) {
let that = this
let id = this.data.dglist[event.target.dataset.index]['id']
wx.showModal({
title: '提示',
content: '确定要进行通过该审核吗？',
success(res) {
if (res.confirm) {
console.log('用户点击确定')
that.confirmPass(id)
} else if (res.cancel) {
console.log('用户点击取消')
}
}
})
},
/**
* 审核不通过
*/
confirmRefuse(id, refuseReason) {
wx.request({
url: app.globalData.appBaseUrl + '/api/hiddenDangerToVerify/verify',
method: 'get',
header: {
Authorization: app.globalData.Authorization
},
data: {
id,
status: 2,
refuseReason,
},
success: (res) => {
if (res.status === 204) {
wx.showToast({
title: '操作成功',
icon: 'success',
duration: 2000
})
setTimeout(() => {
this.getDataList()
}, 2000);
} else if (res.status === 400) {
wx.showToast({
title: res.data.message,
icon: 'error',
duration: 2000
})
}
},
fail: () => {},
complete: () => {
wx.hideLoading()
}
})
},
refuse(event) {
let id = this.data.dglist[event.target.dataset.index]['id']
let that = this
wx.showModal({
title: '提示',
// content: '确定要进行通过该审核吗？',
editable: true,
placeholderText: '请输入审核拒绝原因',
success(res) {
if (res.confirm) {
if(!res.content){
wx.showToast({
title: '原因不能为空',
icon: 'error',
duration: 2000
})
return
}
that.confirmRefuse(id, res.content)
}
}
})
},
/**
*/
detail(event) {
console.log(event.target.dataset.index)
// event.target.dateset.index
app.globalData.currentHDVerify = {
...this.data.dglist[event.target.dataset.index]
}
// console.log(app.globalData.currentHD)
wx.navigateTo({
url: '/pages/dangerlistverifydetail/dangerlistverifydetail',
})
},
})
\ No newline at end of file
pages/dangerlistverify/dangerlistverify.json 0 → 100644
View file @ 6727dc0f
{
"usingComponents": {}
}
\ No newline at end of file
pages/dangerlistverify/dangerlistverify.wxml 0 → 100644
View file @ 6727dc0f
<!--pages/dangerlist/dangerlist.wxml-->
<!-- bindtap="addNewHD" wx:if="{{!(curRole=='政府')}}">新增</button> -->
<view class="search-wrapper">
<input type="text" class="enter-name-input" placeholder="请输入企业名称" value="{{inputEnterName}}" confirm-type="search" bindconfirm="enterNameConfirm" bindinput="enterNameInput" bindfocus="focusInputName" bindblur="blurInputName" animation="{{animationSearch}}" bindfocus="searchInputFocus">
<image class="enter-img" src="{{enterImgUrl}}" alt="error"></image>
</input>
</view>
<view class="choose-county">
<picker header-text="选择状态" mode="selector" range="{{verifyStatus}}" range-key="name" bindchange="chooseCounty">
审核状态:
<span> {{selectedStatus}}</span>
</picker>
</view>
<view class="dangerlist-wrapper">
<scroll-view scroll-y="true" class="com-danger-list-scroll">
<view wx:for="{{dglist}}" class="enterprise-dg-item" wx:key="hdId">
<view class="hd-name-expert">
<span wx:if="{{item.comment}}">{{item.comment}}</span>
<span wx:else>{{item.hdName}}</span>
</view>
<view>
<span>整改中</span>
</view>
<view style="float: right; margin-top: 20px;">
<button type="default" class="editBtn" size="mini" bindtap="detail" data-index="{{index}}">查看</button>
<button type="default" class="editBtn" size="mini" bindtap="pass" data-index="{{index}}">通过</button>
<button type="default" class="editBtn" size="mini" bindtap="refuse" data-index="{{index}}">拒绝</button>
</view>
</view>
<view wx:if="{{dglist.length === 0}}" class="no-hd">暂无数据</view>
</scroll-view>
</view>
\ No newline at end of file
pages/dangerlistverify/dangerlistverify.wxss 0 → 100644
View file @ 6727dc0f
/* pages/dangerlist/dangerlist.wxss */
.enterprises-wrapper {
width: 100vw;
height: 100vh;
overflow: hidden;
position: relative;
}
.search-wrapper {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
width: 710rpx;
height: 68rpx;
background-color: #F4F4F5;
border-radius: 34rpx;
overflow: hidden;
position: absolute;
left: 20rpx;
/* top: 50%; */
top: 70rpx;
transform: translateY(-50%);
}
.search-wrapper .enter-name-input {
/* width: 100%; */
width: 230rpx;
border-radius: 34rpx;
height: 100%;
position: relative;
padding-left: 70rpx;
background-color: #F4F4F5;
}
.search-wrapper .enter-name-input::placeholder {
color: red;
}
.search-wrapper .enter-img {
position: absolute;
left: 6rpx;
bottom: 4rpx;
width: 60rpx;
height: 60rpx;
}
.search-wrapper .btn-search {
background-color: #1d2089;
}
.dangerlist-wrapper {
width: 100vw;
height: 100vh;
position: relative;
padding-top: 120rpx;
box-sizing: border-box;
overflow: hidden;
}
.btn-to-confirm {
position: absolute;
width: 100%;
height: 100%;
bottom: -100%;
background: #eee;
display: flex;
align-items: center;
justify-content: center;
}
.btn-to-confirm-center {
font-size: 20rpx;
border-radius: 30rpx;
display: flex;
flex-direction: column;
align-items: center;
background-color: white;
padding: 20rpx 0 0 0;
}
.btn-to-confirm-title {
font-size: 45rpx;
color: red;
display: flex;
justify-content: center;
line-height: 45rpx;
padding: 5rpx;
margin: 50rpx auto;
}
.change-password-btns-wrapper {
/* position: absolute;
bottom: 0; */
height: 110rpx;
width: 100%;
background-color: #B3B3B3;
border-radius: 0 0 30rpx 30rpx;
display: flex;
}
.cancel-change-password {
flex-basis: 50%;
display: flex;
justify-content: center;
align-items: center;
font-size: 46rpx;
background-color: #C1C1C1;
border-radius: 0 0 0 30rpx;
}
.confirm-change-password {
flex-basis: 50%;
display: flex;
justify-content: center;
align-items: center;
font-size: 46rpx;
border-left: 2rpx solid #000000;
}
button.add-btn {
position: absolute;
right: 35rpx;
top: 20rpx;
width: 180rpx!important;
height: 80rpx!important;
border-radius: 16rpx;
background-color: #090D9C!important;
color: #fff;
display: flex;
justify-content: center;
align-items: center;
padding: 0!important;
transition: all 1s linear;
}
.com-danger-list-scroll {
width: 700rpx;
height: 85vh;
padding: 3rpx;
padding-left: 30rpx;
}
.cur-enter-name {
/* margin: 5vh auto; */
padding: 5vw 5vh;
font-size: 22px;
font-weight: bold;
}
.danger-tools-wrapper {
width: 70vw;
height: 10vh;
margin: 5vh auto;
border: 1px dashed black;
display: flex;
justify-content: flex-start;
align-items: center;
border-radius: 5px;
}
.danger-tools-wrapper button {
background-color: #1d2089!important;
}
.enterprise-dg-item {
width: 600rpx;
overflow: hidden;
/* height: 300rpx; */
/* display: flex;
justify-content: space-around;
align-items: center; */
padding: 10rpx;
background-color: white;
margin: 20rpx auto;
border-radius: 5px;
box-shadow: 2rpx 2rpx 2rpx 2rpx #eee, -1rpx -1rpx 1rpx 1rpx #eee;
}
.hd-name-expert {
/* width: 350rpx; */
line-height: 80rpx;
overflow: hidden;
/* text-overflow: ellipsis;
white-space: nowrap; */
}
.hd-name-expoer-to-green {
width: 350rpx;
line-height: 80rpx;
overflow: hidden;
/* text-overflow: ellipsis;
white-space: nowrap; */
color:#67C23A;
}
.hd-name-expoer-to-yellow {
width: 350rpx;
line-height: 80rpx;
overflow: hidden;
/* text-overflow: ellipsis;
white-space: nowrap; */
color: #E6A23C;
}
.hd-tools {
width: 30vw;
display: flex;
flex-direction: column;
justify-content: space-between;
/* align-items: flex-start; */
}
.hd-tools-edit {
text-align: right;
}
.hd-tools-edit button {
color: #1d2089!important;
}
.hd-tools-delete button {
/* background-color: ; */
}
.hd-tools-delete {
text-align: right;
}
.no-hd {
text-align: center;
}
.editBtn {
color: #1d2089!important;
}
\ No newline at end of file
pages/dangerlistverifydetail.js 0 → 100644
View file @ 6727dc0f
// pages/dangerlistverifydetail.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})
\ No newline at end of file
pages/dangerlistverifydetail.json 0 → 100644
View file @ 6727dc0f
{
"usingComponents": {}
}
\ No newline at end of file
pages/dangerlistverifydetail.wxml 0 → 100644
View file @ 6727dc0f
<!--pages/dangerlistverifydetail.wxml-->
<text>pages/dangerlistverifydetail.wxml</text>
\ No newline at end of file
pages/dangerlistverifydetail.wxss 0 → 100644
View file @ 6727dc0f
/* pages/dangerlistverifydetail.wxss */
\ No newline at end of file
pages/dangerlistverifydetail/dangerlistverifydetail.js 0 → 100644
View file @ 6727dc0f
// pages/dangeredit/dangeredit.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
editAble: false,
checkImg:false,
showButton:false,
// 企业id
companyId: app.globalData.currentEnter.companyId,
// 隐患验收人
hdAcceptancePerson: "",
// 隐患描述
comment: '',
// 隐患id
hdId: -1,
// 隐患描述
hdDesc: "",
// 检查日期
hdInspectDate: '',
// 检查专家
hdInspectExpert: '',
// 隐患级别 1 2
hdLevel: 1,
// 隐患名称
hdName: '',
// 隐患图片
hdPic: null,
// 隐患整改日期
hdRectificationDate: '',
// 隐患整改图片
hdRectificationPic: null,
// 隐患整改建议
suggestion:'',
hdRectificationSug: '',
// 隐患状态 0 正在整改 1 整改完毕
hdStatus: 1,
// 隐患预览图片
imgsrcurl: '',
// 整改预览照片
imgrecturl: '',
// 隐患图片文件路径
hdFilePath: '',
// 整改图片文件路径
rectFilePath: '',
// 放大图片的路径
enlargeUrl: '',
topAnimation: {},
curRole:'',
isToEnLarge: false,
xcx:'xcx'
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
wx.setNavigationBarTitle({
title: '隐患审核详情',
})
wx.setNavigationBarColor({
backgroundColor: '#090D9C',
frontColor: '#ffffff',
})
this.setData(
app.globalData.currentHDVerify
)
},
loadDetail(){
}
})
\ No newline at end of file
pages/dangerlistverifydetail/dangerlistverifydetail.json 0 → 100644
View file @ 6727dc0f
{
"usingComponents": {}
}
\ No newline at end of file
pages/dangerlistverifydetail/dangerlistverifydetail.wxml 0 → 100644
View file @ 6727dc0f
<!--pages/dangerlistverifydetail.wxml-->
<view class="danger-edit-wrapper">
<scroll-view scroll-y="true" class="danger-form-wrapper">
<!-- <view class="danger-order">
<text>序号:</text>
<input type="text" disabled="{{!editAble}}" />
</view> -->
<view class="danger-check-date">
<text>企业名称:</text>
<input type="text" disabled="{{!editAble}}" value="{{enterpriseName}}" bindinput="" />
</view>
<view class="danger-expert">
<text>检查专家:</text>
<input type="text" disabled="{{!editAble}}" value="{{hdInspectExpert}}" bindinput="" />
</view>
<!-- <view class="danger-type">
<text>隐患类型:</text>
<radio-group bindchange="">
<radio color="#1d2089" disabled="{{!editAble}}" checked="{{hdLevel===1}}" value="1">一般隐患</radio>
<radio color="#1d2089" disabled="{{!editAble}}" checked="{{hdLevel===2}}" value="2">重大隐患</radio>
</radio-group>
</view> -->
<block wx:if="{{comment==''||comment==null}}">
<view class="danger-name">
<text style="width:200rpx ;">发现问题:</text>
<input type="text" disabled="{{!editAble}}" value="{{hdName}}" bindinput="" maxlength="-1" />
</view>
<view class="hdPic-preview">
<text>隐患照片:</text>
<image mode="aspectFit" src="{{imgsrcurl}}" bindtap="toEnlargePicByHiddenPic"></image>
</view>
</block>
<view class="danger-rect">
<text>企业提交整改日期:</text>
<input type="text" disabled="{{!editAble}}" value="{{enterpriseSubmitsTheRectificationDate}}" bindinput="" maxlength="-1" />
</view>
<view class="danger-img">
<text>整改后照片</text>
<image mode="aspectFit" src="{{imgrecturl}}" bindtap="toEnlargePicByRectPic"></image>
</view>
<view class="danger-rect-date">
<text>审核整改期限:</text>
<input type="text" value="{{hdRectificationDate}}" disabled="{{!editAble}}" />
</view>
<view class="danger-rect-date">
<text>审核状态:</text>
<input type="text" value="{{hdStatus}}" disabled="{{!editAble}}" />
</view>
<view class="danger-recept-per" wx:if="{{!showButton}}">
<text>复查人员:</text>
<input type="text" value="{{hdAcceptancePerson}}" disabled="{{!editAble}}" />
</view>
<view class="danger-rect">
<text>整改未过审原因:</text>
<textarea disabled="{{!editAble}}" maxlength="-1" bindinput="" value="{{recEvaluation}}"></textarea>
</view>
</scroll-view>
<view class="enlarge-pic-wrapper {{isToEnLarge? 'enlarge-pic-show': ''}}">
<image src="{{enlargeUrl}}" mode="aspectFit" class="enlarge-pic" bindtap="toCancelEnlargePic"></image>
</view>
</view>
\ No newline at end of file
pages/dangerlistverifydetail/dangerlistverifydetail.wxss 0 → 100644
View file @ 6727dc0f
/* pages/dangeredit/dangeredit.wxss */
/* pages/dangerregister/dangerregister.wxss */
.danger-edit-wrapper {
width: 100vw;
height: 100vh;
position: relative;
box-sizing: border-box;
}
.danger-form-wrapper {
position: absolute;
height: 100vh;
width: 100vw;
margin: 0 auto;
padding-top: 2vh;
padding-bottom: 2vh;
}
.danger-order {
display: flex;
margin: 3vh 2vw;
background-color: white;
padding: 1vh 1vw;
}
.danger-order text {
flex-grow: 0;
flex-shrink: 0;
}
.danger-order input {
flex-grow: 1;
flex-shrink: 0;
}
.danger-check-date {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-check-date .danger-pick-date {
flex: 1;
text-align: right;
}
.danger-expert {
/* display: flex; */
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-name {
/* display: flex; */
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-type {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
}
.danger-rect {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.hdPic-preview {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.hdPic-preview image {
width: 100%;
}
.danger-img {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-preview {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-preview image {
width: 100%;
}
.danger-rect-date {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.danger-recept-per {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.rect-img {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
}
.rect-preview {
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
}
.danger-status {
display: flex;
background-color: white;
margin: 3vh 5vw;
justify-content: space-between;
padding: 1vh 1vw;
box-shadow: 1rpx 1rpx 0.5rpx 0.5rpx #eee, -1rpx -1rpx 0.5rpx 0.5rpx #eee;
border-radius: 5rpx;
}
.enlarge-pic-wrapper {
position: fixed;
display: none;
z-index: 999;
left: 0;
top: 0;
bottom: 0;
right: 0;
background-color: black;
align-items: center;
justify-content: center;
}
.enlarge-pic-show {
display: flex;
}
.enlarge-pic {
width: 100vw;
height: 100vh;
}
\ No newline at end of file
pages/dangerregister/dangerregister.js
View file @ 6727dc0f
......@@ -304,25 +304,6 @@ Page({
}
})
},
takePhoto2() {
wx.chooseImage({
success: (res) => {
this.data.rectFilePath = res.tempFilePaths[0]
wx.getFileSystemManager().readFile({
filePath: res.tempFilePaths[0], // 选择图片返回的相对路径
encoding: 'base64', //编码格式
success: res1 => { // 成功的回调
// console.log('data:image/png;base64, ' + res1.data)
// this.imgsrc = 'data:image/png;base64,' + res1.data
this.setData({
imgrecturl: 'data:image/png;base64,' + res1.data
})
}
})
// wx.uploadFile()
}
})
},
// 选择检查日期
selectCheckDate(event) {
this.setData({
......@@ -381,25 +362,11 @@ Page({
inputHdAcceptancePerson(event) {
this.data.hdAcceptancePerson = event.detail.value
},
// 隐患状态
inputHDStatus(event) {
if((this.data.imgrecturl=== "" || this.data.imgrecturl=== null||this.data.imgrecturl === 'null'||this.data.imgrecturl === undefined)&&event.detail.value==1){
wx.showToast({
title: '没有整改照片',
icon: 'error',
duration: 1000
})
this.data.hdStatus = event.detail.value
return
}else{
this.data.hdStatus = event.detail.value
}
},
// 提交隐患
submitDanger() {
if((this.data.imgrecturl=== "" || this.data.imgrecturl=== null||this.data.imgrecturl === 'null'||this.data.imgrecturl === undefined)&&this.data.hdStatus==1){
if(!this.data.imgsrcurl){
wx.showToast({
title: '没有整改照片',
title: '没有隐患照片',
icon: 'error',
duration: 1000
})
......@@ -421,7 +388,7 @@ Page({
delete formData.imgrecturl
delete formData.hdFilePath
delete formData.rectFilePath
if(this.data.comment==''||this.data.comment==null){
if(!this.data.comment){
delete formData.comment
}
if (formData.hdInspectDate) {
......@@ -429,14 +396,9 @@ Page({
} else {
delete formData.hdInspectDate
}
if (formData.hdRectificationDate) {
formData.hdRectificationDate
// formData.hdRectificationDate += ' 00:00:00'
} else {
if (!formData.hdRectificationDate) {
delete formData.hdRectificationDate
}
wx.uploadFile({
filePath: this.data.hdFilePath,
name: 'hdPic',
......@@ -448,30 +410,13 @@ Page({
success: (res) => {
console.log(res, '文件上传')
wx.hideLoading()
if (res.statusCode === 201) {
if (res.status === 201) {
wx.showToast({
title: '上传成功',
icon: 'success'
})
wx.navigateBack()
// const hdId = JSON.parse(res.data).hdId
// 进行 整改图片编辑
// if (this.data.rectFilePath) {
// wx.uploadFile({
// filePath: this.data.rectFilePath,
// name: 'hdRectificationPic',
// url: app.globalData.appBaseUrl + '/api/thHiddenDanger',
// formData: {
// hdId: hdId,
// companyId: this.data.companyId
// },
// success: (res) => {
// console.log(res, '文件整改')
// }
// })
// }
} else if (res.statusCode === 401) {
} else if (res.status === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
......
pages/dangerregister/dangerregister.wxml
View file @ 6727dc0f
......@@ -16,7 +16,7 @@
</view>
<view class="danger-type">
<text>隐患等级:</text>
<text>隐患类型:</text>
<radio-group bindchange="inputHDType">
<radio checked="{{true}}" value="1" color="#1d2089">一般隐患</radio>
<radio checked="{{false}}" value="2" color="#1d2089">重大隐患</radio>
......@@ -123,10 +123,10 @@
<text>复查人员:</text>
<input type="text" placeholder="请输入验收人" value="{{}}" bindinput="inputHdAcceptancePerson" />
</view> -->
<view class="danger-rect">
<!-- <view class="danger-rect">
<text>复查记录:</text>
<textarea maxlength="-1" bindinput="inputEvaluation" value="{{recEvaluation}}"></textarea>
</view>
</view> -->
<!-- <view class="rect-img">
<text>整改照片</text>
<button type="primary" bindtap="takePhoto2">拍照</button>
......@@ -135,13 +135,6 @@
<text>整改照片预览:</text>
<image mode="widthFix" src="{{imgrecturl}}"></image>
</view> -->
<view class="danger-status">
<text>隐患状态:</text>
<radio-group bindchange="inputHDStatus">
<radio checked="{{true}}" value="0" color="#1d2089">未整改</radio>
<radio checked="{{false}}" value="1" color="#1d2089">整改完毕</radio>
</radio-group>
</view>
<view class="danger-submit">
<button type="primary" bindtap="submitDanger">提交</button>
</view>
......
pages/enterprise/enterprise.js
View file @ 6727dc0f
......@@ -38,6 +38,7 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.inputEnterName = ''
wx.hideHomeButton({
complete:()=>{
console.log(99999)
......@@ -50,44 +51,46 @@ Page({
backgroundColor: '#090D9C',
frontColor: '#ffffff',
})
wx.showLoading({
title: '正在获取企业信息',
})
this.getCompanyList()
// wx.showLoading({
// title: '正在获取企业信息',
// })
// 验证获取企业信息
wx.request({
url: app.globalData.appBaseUrl + '/api/thHiddenDanger/pageEnterprise',
method: 'GET',
header: {
Authorization: app.globalData.Authorization
},
data: {
page: 0,
size: 99999,
enterpriseName: '威海',
county:app.globalData.appCounty
},
header: {
Authorization: app.globalData.Authorization
},
success: (res) => {
if (res.statusCode === 200) {
console.log(res.data.content)
this.setData({
enterprises: [...res.data.content]
})
} else if (res.statusCode === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
} else {
// wx.request({
// url: app.globalData.appBaseUrl + '/api/thHiddenDanger/pageEnterprise',
// method: 'GET',
// header: {
// Authorization: app.globalData.Authorization
// },
// data: {
// page: 0,
// size: 99999,
// enterpriseName: '威海',
// county:app.globalData.appCounty
// },
// header: {
// Authorization: app.globalData.Authorization
// },
// success: (res) => {
// if (res.statusCode === 200) {
// console.log(res.data.content)
// this.setData({
// enterprises: [...res.data.content]
// })
// } else if (res.statusCode === 401) {
// wx.redirectTo({
// url: '/pages/login/login',
// })
// } else {
}
wx.hideLoading()
},
fail: () => {
wx.hideLoading()
}
})
// }
// wx.hideLoading()
// },
// fail: () => {
// wx.hideLoading()
// }
// })
},
/**
......@@ -135,49 +138,52 @@ Page({
enterNameInput(event) {
this.inputEnterName = event.detail.value
},
getCompanyList(){
console.log('this.inputEnterName', this.inputEnterName, typeof this.inputEnterName)
wx.showLoading({
title: '正在获取企业信息',
})
// 验证获取企业信息
wx.request({
url: app.globalData.appBaseUrl + '/api/thCompany',
method: 'GET',
header: {
Authorization: app.globalData.Authorization
},
data: {
page: 0,
size: 99999,
companyName: (this.inputEnterName && this.inputEnterName !== 'undefined') ? this.inputEnterName : '',
sort: 'companyId,desc',
companyCounty:app.globalData.appCounty,
},
header: {
Authorization: app.globalData.Authorization
},
success: (res) => {
if (res.statusCode === 200) {
this.setData({
enterprises: [...res.data.content]
})
} else if (res.statusCode === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
}
wx.hideLoading()
},
fail: () => {
wx.hideLoading()
}
})
},
/**
* 触摸面板 搜索企业信息
*/
enterNameConfirm(event) {
wx.showLoading({
title: '正在获取企业信息',
})
// 验证获取企业信息
wx.request({
url: app.globalData.appBaseUrl + '/api/thCompany',
method: 'GET',
header: {
Authorization: app.globalData.Authorization
},
data: {
page: 0,
size: 99999,
companyName: this.inputEnterName,
sort: 'companyId,desc',
companyCounty:app.globalData.appCounty,
},
header: {
Authorization: app.globalData.Authorization
},
success: (res) => {
if (res.statusCode === 200) {
this.setData({
enterprises: [...res.data.content]
})
} else if (res.statusCode === 401) {
wx.redirectTo({
url: '/pages/login/login',
})
} else {
}
wx.hideLoading()
},
fail: () => {
wx.hideLoading()
}
})
this.inputEnterName = event.detail.value
this.getCompanyList()
},
focusInputName(event) {
let repheight = 0
......
pages/enterprise/enterprise.wxml
View file @ 6727dc0f
......@@ -21,8 +21,9 @@
</view> -->
</view>
</scroll-view>
<view class="search-wrapper" wx:if="{{ curRole !== '企业管理' && curRole!== '企业员工' }}">
<input type="text" class="enter-name-input" placeholder="请输入企业名称"
<view class="search-wrapper">
<input type="text" class="enter-name-input" placeholder="请输入企业名称"
value="{{inputEnterName}}"
confirm-type="search"
bindconfirm="enterNameConfirm"
bindinput="enterNameInput"
......
pages/home/home.js
View file @ 6727dc0f
......@@ -251,6 +251,16 @@ Page({
success: function(event) {}
})
},
/**
* 跳转到隐患审核
*/
LinkToHDVerify() {
wx.navigateTo({
url: '/pages/dangerlistverify/dangerlistverify',
success: function(event) {}
})
},
/**
* 跳转到危险作业审批
*/
......
pages/home/home.wxml
View file @ 6727dc0f
......@@ -10,6 +10,24 @@
</view>
<view style="height:{{topNavHeight}}px;"></view>
<view class="row">
<view class="info-card hd-wrapper" bindtap="LinkToHD">
<view class="info-card-title">隐患管理</view>
<view class="info-card-icon hd-icon"></view>
</view>
<view class="info-card evaluate-wrapper" bindtap="LinkToHDVerify">
<view class="info-card-title">隐患审核</view>
<view class="info-card-icon hd-icon"></view>
</view>
<!-- <view class="info-card info-right person-wrapper" bindtap="LinkToPersonCenter">
<view class="info-card-title">个人中心</view>
<view class="info-card-icon person-icon"></view>
</view> -->
<!-- <view class="info-card info-right danger-work-wrapper" bindtap="LinkToHWApproval">
<view class="info-card-title">危险作业备案</view>
<view class="info-card-icon danger-work-icon"></view>
</view> -->
</view>
<!-- <view class="row">
<view class="info-card live-wrapper"
bindtap="linkToLaw">
......@@ -20,12 +38,9 @@
<view class="info-card-title">通知公告</view>
<view class="info-card-icon advice-icon"></view>
</view>
</view>
<view class="row">
<!-- <view class="info-card info-wrapper" bindtap="linkToInfo">
<view class="info-card-title">信息推送</view>
<view class="info-card-icon info-icon"></view>
</view> -->
</view> -->
<!-- <view class="row"> -->
<!--
<view class="info-card info-wrapper" bindtap="linkToInfo">
<view class="info-card-title">应急演练</view>
<view class="info-card-icon info-icon"></view>
......@@ -34,8 +49,13 @@
<view class="info-card-title">警示教育</view>
<view class="info-card-icon warn-icon"></view>
</view>
</view>
</view> -->
<!-- <view class="info-card info-wrapper" bindtap="linkToInfo">
<view class="info-card-title">信息推送</view>
<view class="info-card-icon info-icon"></view>
</view> -->
<!-- <view class="row">
<view class="info-card live-wrapper" bindtap="LinkToLive">
<view class="info-card-title">在线直播</view>
<view class="info-card-icon live-icon"></view>
......@@ -55,20 +75,7 @@
<view class="info-card-icon evaluate-icon"></view>
</view>
</view> -->
<view class="row">
<view class="info-card hd-wrapper" bindtap="LinkToHD">
<view class="info-card-title">隐患管理</view>
<view class="info-card-icon hd-icon"></view>
</view>
<!-- <view class="info-card info-right person-wrapper" bindtap="LinkToPersonCenter">
<view class="info-card-title">个人中心</view>
<view class="info-card-icon person-icon"></view>
</view> -->
<!-- <view class="info-card info-right danger-work-wrapper" bindtap="LinkToHWApproval">
<view class="info-card-title">危险作业备案</view>
<view class="info-card-icon danger-work-icon"></view>
</view> -->
</view>
<view class="row">
<!-- <view class="info-card danger-work-wrapper" bindtap="LinkToHWApproval">
<view class="info-card-title">危险作业审批</view>
......
pages/loginv2/loginv2.js
View file @ 6727dc0f
......@@ -55,8 +55,8 @@ Page({
userpassorphone: true,
enterpriseId: '',
username: '',
password: '',
username: 'admin',
password: '123456',
repeatPassword: '',
wechat: '',
phone: '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment