Skip to content

G
GaoQuYingJiMiniPro
Commit 7754b8c7 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

登录修改 隐患管理修改

parent f54a04ac
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 135 deletions
app.js
View file @ 7754b8c7
// app.js // app.js
App({ // appBaseUrlAll:'https://whjqaqscxt.weihai.cn',
// appBaseUrl: 'https://whjqaqscxt.weihai.cn',
// appBaseUrlV2: 'https://whjqaqscxt.weihai.cn',
// appBaseUrlV3: 'https://whjqaqscxt.weihai.cn',
// appBaseUrlArea: 'https://www.tianhongzhijian.com:8888',
const baseURL = 'http://192.168.3.37:8036' //
App({
onLaunch() { onLaunch() {
// 展示本地存储能力 // 展示本地存储能力
const logs = wx.getStorageSync('logs') || [] const logs = wx.getStorageSync('logs') || []
...@@ -50,12 +56,13 @@ App({ ...@@ -50,12 +56,13 @@ App({
// appBaseUrlV3: 'http://192.168.3.37:8035', // appBaseUrlV3: 'http://192.168.3.37:8035',
appCounty:'威海经济技术开发区',//全局区域设定 appCounty:'威海经济技术开发区',//全局区域设定
appBaseUrlAll:'https://whjqaqscxt.weihai.cn', appBaseUrlAll: baseURL,
appBaseUrl: 'https://whjqaqscxt.weihai.cn', appBaseUrl: baseURL,
appBaseUrlV2: 'https://whjqaqscxt.weihai.cn', appBaseUrlV2: baseURL,
appBaseUrlV3: 'https://whjqaqscxt.weihai.cn', appBaseUrlV3: baseURL,
appBaseUrlArea: 'https://www.tianhongzhijian.com:8888', appBaseUrlArea: baseURL,
userInfo: null, userInfo: null,
Authorization: '', Authorization: '',
...@@ -75,4 +82,5 @@ App({ ...@@ -75,4 +82,5 @@ App({
justifyScore: 0, justifyScore: 0,
isNeedNavigateTo: false isNeedNavigateTo: false
} }
}) })
\ No newline at end of file
app.json
View file @ 7754b8c7
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
"scope.camera": {} "scope.camera": {}
}, },
"requiredPrivateInfos": [ "requiredPrivateInfos": [
"getFuzzyLocation",
"choosePoi", "choosePoi",
"chooseAddress" "chooseAddress"
], ],
......
pages/dangerlist/dangerlist.wxml
View file @ 7754b8c7
...@@ -11,31 +11,16 @@ ...@@ -11,31 +11,16 @@
<view wx:for="{{dglist}}" class="enterprise-dg-item" wx:key="hdId" > <view wx:for="{{dglist}}" class="enterprise-dg-item" wx:key="hdId" >
<view class="hd-name-expert"> <view class="hd-name-expert">
<span wx:if="{{item.comment}}">{{item.comment}}</span> <span wx:if="{{item.comment}}">{{item.comment}}</span>
<span wx:else>{{item.hdName}}</span> <span wx:else>{{item.hdName}}</span>
</view> </view>
<view > <view >
<span>超期未整改</span>
<span style="color:#fb0000;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{item.overtime === 1&&(item.hdstatus1!==2)&&(item.hdstatus1!==3)}}">超期未整改</span>
<span style="color:#E6A23C;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{item.overtime === 1&&(item.hdstatus1===2)}}">正在审核</span>
<span style="color:#F56C6C;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{(item.overtime !== 1)&&(item.hdstatus1===0)}}">未整改</span>
<span style="color:#67C23A;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{(item.overtime !== 1)&&(item.hdstatus1===1)}}">整改完成</span>
<span style="color:#E6A23C;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{(item.overtime !== 1)&&(item.hdstatus1===2)}}">正在审核</span>
<span bindtap="checkReason" data-word="{{item}}" style="color:#f59d9d;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{(item.hdstatus1===3)}}">审核未通过请重新整改</span>
<!-- <span bindtap="checkReason" data-word="{{item}}" style="color:#f59d9d;padding: 0 0 0.75em 0;;display: inline-block;line-height: 2;" wx:if="{{(item.overtime !== 1)&&(item.hdstatus1===3)}}">审核未通过请重新整改</span> -->
</view> </view>
<view wx:if="{{msgShow===true&&(item.overtime !== 1)&&(item.hdstatus1===3)}}"> <view style="float: right; margin-top: 20px;">
<span >{{newMsg}}</span> <button type="default" class="editBtn" size="mini" bindtap="editHD" data-index="{{index}}">查看</button>
</view> <button type="default" class="editBtn" size="mini" bindtap="editHD" data-index="{{index}}" >编辑</button>
<view> <button type="warn" class="delBtn" size="mini" data-index="{{index}}" bindtap="deleteHD">删除</button>
<button style="float:left;" type="default" class="editBtn" size="mini" bindtap="editHD" data-index="{{index}}" wx:if="{{!(item.overtime == 1)&&(item.hdstatus1===1)&&!(curRole=='企业员工')}}">查看</button>
<button wx:elif="{{!(item.hdstatus1==1)&&!(curRole=='企业员工')}} " style="float:left;" type="default" class="editBtn" size="mini" bindtap="editHD" data-index="{{index}}" >申请整改</button>
<button bindtap="checkReason" data-word="{{item}}" style="margin: 0;float: right;width: 362rpx;line-height:2;font-weight: 600;padding: 0;" type="default" class="editBtn" wx:if="{{(item.hdstatus1===3)}}">查看未通过原因</button>
</view> </view>
<!-- <button type="warn" class="delBtn" size="mini" data-index="{{index}}" bindtap="deleteHD" wx:if="{{ !(curRole == '企业管理' && curRole == '企业员工') }}">删除</button> -->
</view> </view>
<view wx:if="{{dglist.length === 0}}" class="no-hd">暂无隐患</view> <view wx:if="{{dglist.length === 0}}" class="no-hd">暂无隐患</view>
</scroll-view> </scroll-view>
......
pages/home/home.wxml
View file @ 7754b8c7
...@@ -10,28 +10,32 @@ ...@@ -10,28 +10,32 @@
</view> </view>
<view style="height:{{topNavHeight}}px;"></view> <view style="height:{{topNavHeight}}px;"></view>
<view class="row"> <view class="row">
<view class="info-card law-wrapper" <view class="info-card live-wrapper"
bindtap="linkToLaw"> bindtap="linkToLaw">
<view class="info-card-title">法律法规</view> <view class="info-card-title">法律法规</view>
<view class="info-card-icon law-icon"></view> <view class="info-card-icon law-icon"></view>
</view> </view>
<view class="info-card info-right advice-wrapper" bindtap="linkToAdvice"> <view class="info-card info-right live-wrapper" bindtap="linkToAdvice">
<view class="info-card-title">通知公告</view> <view class="info-card-title">通知公告</view>
<view class="info-card-icon advice-icon"></view> <view class="info-card-icon advice-icon"></view>
</view> </view>
</view> </view>
<view class="row"> <view class="row">
<view class="info-card info-wrapper" bindtap="linkToInfo"> <!-- <view class="info-card info-wrapper" bindtap="linkToInfo">
<view class="info-card-title">信息推送</view> <view class="info-card-title">信息推送</view>
<view class="info-card-icon info-icon"></view> <view class="info-card-icon info-icon"></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>
<view class="info-card info-right warn-wrapper" bindtap="LinkToWarn" > <view class="info-card info-right warn-wrapper" bindtap="LinkToWarn" >
<view class="info-card-title">警示教育</view> <view class="info-card-title">警示教育</view>
<view class="info-card-icon warn-icon"></view> <view class="info-card-icon warn-icon"></view>
</view> </view>
</view> </view>
<view class="row"> <!-- <view class="row">
<view class="info-card live-wrapper" bindtap="LinkToLive"> <view class="info-card live-wrapper" bindtap="LinkToLive">
<view class="info-card-title">在线直播</view> <view class="info-card-title">在线直播</view>
<view class="info-card-icon live-icon"></view> <view class="info-card-icon live-icon"></view>
...@@ -50,7 +54,7 @@ ...@@ -50,7 +54,7 @@
<view class="info-card-title">学习评价</view> <view class="info-card-title">学习评价</view>
<view class="info-card-icon evaluate-icon"></view> <view class="info-card-icon evaluate-icon"></view>
</view> </view>
</view> </view> -->
<view class="row"> <view class="row">
<view class="info-card hd-wrapper" bindtap="LinkToHD"> <view class="info-card hd-wrapper" bindtap="LinkToHD">
<view class="info-card-title">隐患管理</view> <view class="info-card-title">隐患管理</view>
...@@ -60,23 +64,23 @@ ...@@ -60,23 +64,23 @@
<view class="info-card-title">个人中心</view> <view class="info-card-title">个人中心</view>
<view class="info-card-icon person-icon"></view> <view class="info-card-icon person-icon"></view>
</view> --> </view> -->
<view class="info-card info-right danger-work-wrapper" bindtap="LinkToHWApproval"> <!-- <view class="info-card info-right danger-work-wrapper" bindtap="LinkToHWApproval">
<view class="info-card-title">危险作业备案</view> <view class="info-card-title">危险作业备案</view>
<view class="info-card-icon danger-work-icon"></view> <view class="info-card-icon danger-work-icon"></view>
</view> </view> -->
</view> </view>
<view class="row"> <view class="row">
<!-- <view class="info-card danger-work-wrapper" bindtap="LinkToHWApproval"> <!-- <view class="info-card danger-work-wrapper" bindtap="LinkToHWApproval">
<view class="info-card-title">危险作业审批</view> <view class="info-card-title">危险作业审批</view>
<view class="info-card-icon danger-work-icon"></view> <view class="info-card-icon danger-work-icon"></view>
</view> --> </view> -->
<view class="info-card person-wrapper" bindtap="LinkToCertify"> <!-- <view class="info-card person-wrapper" bindtap="LinkToCertify">
<view class="info-card-title">企业安全档案</view> <view class="info-card-title">企业安全档案</view>
<view class="info-card-icon certificate-icon"></view> <view class="info-card-icon certificate-icon"></view>
</view> </view>
<view class="info-card info-right person-wrapper" bindtap="LinkToPortrait"> <view class="info-card info-right person-wrapper" bindtap="LinkToPortrait">
<view class="info-card-title">培训影像管理</view> <view class="info-card-title">培训影像管理</view>
<view class="info-card-icon image-icon"></view> <view class="info-card-icon image-icon"></view>
</view> </view> -->
</view> </view>
</view> </view>
pages/loginv2/loginv2.wxml
View file @ 7754b8c7
...@@ -40,9 +40,9 @@ ...@@ -40,9 +40,9 @@
<input type="text" password="{{true}}" placeholder="请重复输入密码" bindinput="inputRepeatPassword" class="pass-word-wrapper"> <input type="text" password="{{true}}" placeholder="请重复输入密码" bindinput="inputRepeatPassword" class="pass-word-wrapper">
<image class="icon-pass-wrapper" src="{{passwordImgUrl}}"></image> <image class="icon-pass-wrapper" src="{{passwordImgUrl}}"></image>
</input> </input>
<input type="text" placeholder="请输入微信号" class="wx-number-wrapper" bindinput="inputWeChat"> <!-- <input type="text" placeholder="请输入微信号" class="wx-number-wrapper" bindinput="inputWeChat">
<image class="icon-wxnumber-wrapper" src="{{wxImgUrl}}"></image> <image class="icon-wxnumber-wrapper" src="{{wxImgUrl}}"></image>
</input> </input> -->
<input type="text" placeholder="请输入手机号" class="phone-number-wrapper" bindinput="inputPhoneNumber"> <input type="text" placeholder="请输入手机号" class="phone-number-wrapper" bindinput="inputPhoneNumber">
<image class="icon-phone-wrapper" src="{{phoneImgUrl}}"></image> <image class="icon-phone-wrapper" src="{{phoneImgUrl}}"></image>
</input> </input>
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
class="nick-name-wrapper" bindinput="inputNickName"> class="nick-name-wrapper" bindinput="inputNickName">
<image class="icon-user-wrapper" src="{{nickNameImgUrl}}"></image> <image class="icon-user-wrapper" src="{{nickNameImgUrl}}"></image>
</input> </input>
<view class="identity-wrapper"> <!-- <view class="identity-wrapper">
<text class="identity-title-wrapper">身份:</text> <text class="identity-title-wrapper">身份:</text>
<view class="icon-enter-manager" wx:if="{{curIdentity === '企业管理'}}">企业管理</view> <view class="icon-enter-manager" wx:if="{{curIdentity === '企业管理'}}">企业管理</view>
<view class="icon-enter-staff" wx:if="{{curIdentity === '企业管理'}}" bindtap="gotoStaff">企业员工</view> <view class="icon-enter-staff" wx:if="{{curIdentity === '企业管理'}}" bindtap="gotoStaff">企业员工</view>
<view class="icon2-enter-manager" wx:if="{{curIdentity === '企业员工'}}" bindtap="gotoManager">企业管理</view> <view class="icon2-enter-manager" wx:if="{{curIdentity === '企业员工'}}" bindtap="gotoManager">企业管理</view>
<view class="icon2-enter-staff" wx:if="{{curIdentity === '企业员工'}}">企业员工</view> <view class="icon2-enter-staff" wx:if="{{curIdentity === '企业员工'}}">企业员工</view>
</view> </view> -->
<button class="register-button" bindtap="registerToEntry" loading="{{isRegisterLoading}}">注册</button> <button class="register-button" bindtap="registerToEntry" loading="{{isRegisterLoading}}">注册</button>
</view> </view>
<view wx:else style="display: flex;flex-direction: column;justify-content: center;height: 100%;"> <view wx:else style="display: flex;flex-direction: column;justify-content: center;height: 100%;">
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</view> </view>
<button class="login2-btn-wrapper" bindtap="ClickToLogin1" loading="{{isLogin1Loading}}">登录</button> <button class="login2-btn-wrapper" bindtap="ClickToLogin1" loading="{{isLogin1Loading}}">登录</button>
<!--忘记密码 --> <!--忘记密码 -->
<view class="password" bindtap="changePage">忘记密码</view> <!-- <view class="password" bindtap="changePage">忘记密码</view> -->
</view> </view>
<view wx:else> <view wx:else>
<input type="text" placeholder="请输入手机号" class="login3-phone-wrapper"> <input type="text" placeholder="请输入手机号" class="login3-phone-wrapper">
......
project.config.json
View file @ 7754b8c7
{ {
"description": "项目配置文件", "description": "项目配置文件",
"packOptions": { "packOptions": {
"ignore": [] "ignore": [],
"include": []
}, },
"setting": { "setting": {
"urlCheck": true, "urlCheck": true,
...@@ -43,17 +44,8 @@ ...@@ -43,17 +44,8 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.18.0", "libVersion": "2.18.0",
"appid": "wxe009b5c8f819efb8", "appid": "wx6238adc0d70b28d6",
"projectname": "%E5%A4%A9%E5%BC%98%E8%B4%A8%E9%87%8F%E6%A3%80%E6%B5%8B", "projectname": "%E5%A4%A9%E5%BC%98%E8%B4%A8%E9%87%8F%E6%A3%80%E6%B5%8B",
"debugOptions": {
"hidedInDevtools": []
},
"scripts": {},
"staticServerOptions": {
"baseURL": "",
"servePath": ""
},
"isGameTourist": false,
"condition": { "condition": {
"search": { "search": {
"list": [] "list": []
...@@ -73,5 +65,9 @@ ...@@ -73,5 +65,9 @@
"miniprogram": { "miniprogram": {
"list": [] "list": []
} }
},
"editorSetting": {
"tabIndent": "insertSpaces",
"tabSize": 4
} }
} }
\ No newline at end of file
project.private.config.json
View file @ 7754b8c7
{ {
"setting": {}, "setting": {
"condition": { "compileHotReLoad": true,
"plugin": { "urlCheck": false
"list": []
},
"game": {
"list": []
},
"gamePlugin": {
"list": []
}, },
"condition": {
"miniprogram": { "miniprogram": {
"list": [ "list": [
{ {
"name": "", "name": "",
"pathName": "pages/loginv2/loginv2", "pathName": "pages/loginv2/loginv2",
"query": "", "query": "",
"scene": null, "launchMode": "default",
"launchMode": "default" "scene": null
} }
] ]
} }
} },
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "thxcx",
"libVersion": "3.3.4"
} }
\ No newline at end of file
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