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

Compare commits

base: wangpeng:968d04c22f992924c4a947ced0f27cec51085ad4
Branches Tags
wangpeng:dev
wangpeng:master
..
compare: wangpeng:4f1f2f3b620790ff9a2fb128aa3aaa4837fd0e7a
Branches Tags
wangpeng:dev
wangpeng:master

No commits in common. "968d04c22f992924c4a947ced0f27cec51085ad4" and "4f1f2f3b620790ff9a2fb128aa3aaa4837fd0e7a" have entirely different histories.
968d04c22f ... 4f1f2f3b62

7 changed files with 107 additions and 114 deletions
Show Stats Expand all files Collapse all files

4
pages/application/home.vue
View File

@ -116,7 +116,7 @@
</navigator> </navigator>
</view> </view>
</view> </view>
<!-- <view class="apps-row"> <view class="apps-row">
<view class="apps-title"> <view class="apps-title">
<text class="apps-title-line"></text> <text class="apps-title-line"></text>
<text>监测预警</text> <text>监测预警</text>
@ -129,7 +129,7 @@
<view class="text-semi">AI报警</view> <view class="text-semi">AI报警</view>
</navigator> </navigator>
</view> </view>
</view>--> </view>
<!-- 视频管理--> <!-- 视频管理-->
<!-- <view class="apps-row">--> <!-- <view class="apps-row">-->
<!-- <view class="apps-title">--> <!-- <view class="apps-title">-->

4
pages/basics/basic-info/home.vue
View File

@ -18,9 +18,9 @@
<view v-if="!loginCorpId && pd.APPLY_STATUS === ''" class="cu-item arrow"> <view v-if="!loginCorpId && pd.APPLY_STATUS === ''" class="cu-item arrow">
<navigator class="content" hover-class="none" url="/pages/basics/basic-info/entry" open-type="redirect"> <navigator class="content" hover-class="none" url="/pages/basics/basic-info/entry" open-type="redirect">
<text class="text-semi">入职申请</text> <text class="text-semi">入职申请</text>
</navigator> </navigator>·
</view> </view>
<view v-if="pd.APPLY_STATUS === '0' && (pd.APPLY_TYPE ==='2' || pd.APPLY_TYPE ==='4')" class="cu-item arrow"> <view v-if="!loginCorpId && pd.APPLY_STATUS === '0' && (pd.APPLY_TYPE ==='2' || pd.APPLY_TYPE ==='4')" class="cu-item arrow">
<navigator class="content" hover-class="none" url="/pages/basics/basic-info/confirm" open-type="redirect"> <navigator class="content" hover-class="none" url="/pages/basics/basic-info/confirm" open-type="redirect">
<text class="text-semi">信息确认</text> <text class="text-semi">信息确认</text>
</navigator> </navigator>

92
pages/basics/home.vue
View File

@ -72,7 +72,7 @@
<text>人员信息</text> <text>人员信息</text>
</view> </view>
</navigator> </navigator>
<navigator v-if="loginCorpId" class="home-apps-item" hover-class="none" url="/pages/basics/work-plan/work-plan"> <navigator class="home-apps-item" hover-class="none" url="/pages/basics/work-plan/work-plan">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
<image src="../../static/icon-apps/home-rili.png" mode=""></image> <image src="../../static/icon-apps/home-rili.png" mode=""></image>
</view> </view>
@ -81,7 +81,7 @@
</view> </view>
</navigator> </navigator>
<navigator v-if="loginCorpId" class="home-apps-item" hover-class="none" <navigator class="home-apps-item" hover-class="none"
url="/pages/basics/risk-distribution/risk-distribution"> url="/pages/basics/risk-distribution/risk-distribution">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
<image src="../../static/icon-apps/home-risk.png" mode=""></image> <image src="../../static/icon-apps/home-risk.png" mode=""></image>
@ -90,7 +90,7 @@
<text>风险分布</text> <text>风险分布</text>
</view> </view>
</navigator> </navigator>
<navigator v-if="loginCorpId" class="home-apps-item" hover-class="none" url="/pages/basics/study-files/study-files"> <navigator class="home-apps-item" hover-class="none" url="/pages/basics/study-files/study-files">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
<image src="../../static/icon-apps/home-fl.png" mode=""></image> <image src="../../static/icon-apps/home-fl.png" mode=""></image>
</view> </view>
@ -99,8 +99,8 @@
</view> </view>
</navigator> </navigator>
</view> </view>
<view v-if="loginCorpId" class="home-apps-list"> <view class="home-apps-list">
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/eight-assignments" <navigator class="home-apps-item" hover-class="none" url="/pages/application/eight-assignments"
v-show="premission.eightWork"> v-show="premission.eightWork">
<view class="home-apps-item-img" style="position: relative;"> <view class="home-apps-item-img" style="position: relative;">
<image src="../../static/icon-apps/home-gw.png" mode=""></image> <image src="../../static/icon-apps/home-gw.png" mode=""></image>
@ -109,8 +109,8 @@
<view class="text"> <view class="text">
<text>高危作业</text> <text>高危作业</text>
</view> </view>
</navigator>--> </navigator>
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/key-project-management/index/index"> <navigator class="home-apps-item" hover-class="none" url="/pages/application/key-project-management/index/index">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
<image src="../../static/icon-apps/home-zdgcgl.jpg" mode=""></image> <image src="../../static/icon-apps/home-zdgcgl.jpg" mode=""></image>
</view> </view>
@ -118,7 +118,7 @@
<text>重点工程管理</text> <text>重点工程管理</text>
</view> </view>
<view v-if="keyProjectManagement" class="cu-tag badge">{{ keyProjectManagement }}</view> <view v-if="keyProjectManagement" class="cu-tag badge">{{ keyProjectManagement }}</view>
</navigator>--> </navigator>
<navigator class="home-apps-item" hover-class="none" url="/pages/application/commitment"> <navigator class="home-apps-item" hover-class="none" url="/pages/application/commitment">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
<image src="../../static/icon-apps/home-cns.png" mode=""></image> <image src="../../static/icon-apps/home-cns.png" mode=""></image>
@ -127,6 +127,39 @@
<text>安全承诺</text> <text>安全承诺</text>
</view> </view>
</navigator> </navigator>
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/onlinexxks/home"-->
<!-- v-show="premission.education">-->
<navigator class="home-apps-item" hover-class="none" url="/pages/application/onlinexxks/home"
>
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-study.png" mode=""></image>
</view>
<view class="text">
<text>学习园地</text>
</view>
</navigator>
</view>
<view class="home-apps-list">
<navigator class="home-apps-item" hover-class="none" url="/pages/application/safety-environmental-inspection/home">
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-base.png" mode=""></image>
</view>
<view class="text">
<text>安全环保检查</text>
</view>
<view v-if="safetyEnvironmentalInspection>0" class="cu-tag badge">{{ safetyEnvironmentalInspection }}</view>
</navigator>
<navigator class="home-apps-item" hover-class="none" url="/pages/application/speEquip/index"
v-show="premission.speEquip">
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-speEquip.jpg" mode=""></image>
</view>
<view class="text">
<text>设备巡检</text>
</view>
</navigator>
<navigator class="home-apps-item" hover-class="none" <navigator class="home-apps-item" hover-class="none"
url="/pages/application/safetymeeting/home"> url="/pages/application/safetymeeting/home">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
@ -145,37 +178,6 @@
<text>行车三检</text> <text>行车三检</text>
</view> </view>
</navigator> </navigator>
<navigator class="home-apps-item" hover-class="none" url="/pages/application/onlinexxks/home"
>
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-study.png" mode=""></image>
</view>
<view class="text">
<text>学习园地</text>
</view>
</navigator>
</view>
<view v-if="loginCorpId" class="home-apps-list">
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/safety-environmental-inspection/home">
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-base.png" mode=""></image>
</view>
<view class="text">
<text>安全环保检查</text>
</view>
<view v-if="safetyEnvironmentalInspection>0" class="cu-tag badge">{{ safetyEnvironmentalInspection }}</view>
</navigator>-->
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/speEquip/index"
v-show="premission.speEquip">
<view class="home-apps-item-img">
<image src="../../static/icon-apps/home-speEquip.jpg" mode=""></image>
</view>
<view class="text">
<text>设备巡检</text>
</view>
</navigator>-->
<!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/onlinexxks/face/index"> <!-- <navigator class="home-apps-item" hover-class="none" url="/pages/application/onlinexxks/face/index">
<view class="home-apps-item-img"> <view class="home-apps-item-img">
<image src="../../static/icon-apps/home-study.png" mode=""></image> <image src="../../static/icon-apps/home-study.png" mode=""></image>
@ -187,7 +189,7 @@
</view> </view>
</view> </view>
<view v-if="loginCorpId" class="home-work"> <view class="home-work">
<view class="home-work-title"> <view class="home-work-title">
<view class="title"> <view class="title">
<view class="q_title"></view> <view class="q_title"></view>
@ -356,7 +358,7 @@
</view> </view>
<view v-if="loginCorpId" class="home-hidden"> <view class="home-hidden">
<view class="home-work-title"> <view class="home-work-title">
<view class="title"> <view class="title">
<view class="q_title"></view> <view class="q_title"></view>
@ -457,7 +459,7 @@
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<!-- </view>--> <!-- </view>-->
<view v-if="loginCorpId" class="home-date"> <view class="home-date">
<view class="home-work-title"> <view class="home-work-title">
<view class="title"> <view class="title">
<view class="q_title"></view> <view class="q_title"></view>
@ -648,8 +650,7 @@ import {
rollData: [], rollData: [],
eight_work_count: 0, eight_work_count: 0,
updataPd: {}, updataPd: {},
modalName: '', modalName: ''
loginCorpId: ''
}; };
}, },
mounted() { mounted() {
@ -658,12 +659,11 @@ import {
let now = new Date(); let now = new Date();
var today = formatDate(now, 'yyyy-MM-dd'); var today = formatDate(now, 'yyyy-MM-dd');
this.loginCorpId = loginUser.CORPINFO_ID
if (loginUser.CORPINFO_ID) { if (loginUser.CORPINFO_ID) {
this.getSafetyEnvironmentalInspectionCount(); this.getSafetyEnvironmentalInspectionCount();
this.getIsRest(); this.getIsRest();
this.getData(); this.getData();
// this.getSurveyData(); this.getSurveyData();
this.getListData(); this.getListData();
// 获取隐患播报滚动 // 获取隐患播报滚动
this.getHiddenRoll(); this.getHiddenRoll();

8
pages/index/index.vue
View File

@ -11,14 +11,14 @@
</view> </view>
<view :class="PageCur=='basics'?'text-blue':'text-gray'">首页</view> <view :class="PageCur=='basics'?'text-blue':'text-gray'">首页</view>
</view> </view>
<view v-if="loginCorpId" class="action" @click="NavChange" data-cur="application"> <view class="action" @click="NavChange" data-cur="application">
<view class='cuIcon-cu-image'> <view class='cuIcon-cu-image'>
<image :src="'/static/tabbar/application' + [PageCur == 'application'?'_cur':''] + '.png'"></image> <image :src="'/static/tabbar/application' + [PageCur == 'application'?'_cur':''] + '.png'"></image>
<view v-if="hidCount>0" class="cu-tag badge">{{hidCount}}</view> <view v-if="hidCount>0" class="cu-tag badge">{{hidCount}}</view>
</view> </view>
<view :class="PageCur=='application'?'text-blue':'text-gray'">应用</view> <view :class="PageCur=='application'?'text-blue':'text-gray'">应用</view>
</view> </view>
<view v-if="loginCorpId" class="action" @click="NavChange" data-cur="works"> <view class="action" @click="NavChange" data-cur="works">
<view class='cuIcon-cu-image'> <view class='cuIcon-cu-image'>
<image :src="'/static/tabbar/works' + [PageCur == 'works'?'_cur':''] + '.png'"></image> <image :src="'/static/tabbar/works' + [PageCur == 'works'?'_cur':''] + '.png'"></image>
<view v-if="mesCount>0" class="cu-tag badge">{{mesCount}}</view> <view v-if="mesCount>0" class="cu-tag badge">{{mesCount}}</view>
@ -77,8 +77,7 @@
hidCount:0, hidCount:0,
dys:0, dys:0,
dzg:0, dzg:0,
isShowTabBar:false, isShowTabBar:false
loginCorpId: ''
} }
}, },
onBackPress() { onBackPress() {
@ -139,7 +138,6 @@
this.getPromiseUnsigned() this.getPromiseUnsigned()
}, },
onLoad() { onLoad() {
this.loginCorpId = loginUser.CORPINFO_ID
this.plusReady(); this.plusReady();
// this.checkPlatform(); // this.checkPlatform();
// this.checkUpdate("android"); // this.checkUpdate("android");

68
pages/login/register/account.vue
View File

@ -51,43 +51,41 @@ import {
}, },
methods: { methods: {
//跳转事件 //跳转事件
async confirmAccount(e) { confirmAccount(e) {
if (this.validateData()) { if (this.validateData()) {
const flag = await this.checkIdCardData() this.checkIdCardData()
if (flag) { // const org_birthday = this.formData.USER_ID_CARD.substring(6, 14);
const org_birthday = this.formData.USER_ID_CARD.substring(6, 14); // const org_gender = this.formData.USER_ID_CARD.substring(16, 17);
const org_gender = this.formData.USER_ID_CARD.substring(16, 17); // const birthday =
const birthday = // org_birthday.substring(0, 4) +
org_birthday.substring(0, 4) + // "-" +
"-" + // org_birthday.substring(4, 6) +
org_birthday.substring(4, 6) + // "-" +
"-" + // org_birthday.substring(6, 8);
org_birthday.substring(6, 8); // const birthdays = new Date(birthday.replace(/-/g, "/"));
const birthdays = new Date(birthday.replace(/-/g, "/")); // const Month = birthdays.getMonth() + 1;
const Month = birthdays.getMonth() + 1; // let MonthDate;
let MonthDate; // const DayDate = birthdays.getDate();
const DayDate = birthdays.getDate(); // let Day;
let Day; // if (Month < 10) MonthDate = "0" + Month;
if (Month < 10) MonthDate = "0" + Month; // else MonthDate = Month;
else MonthDate = Month; // if (DayDate < 10) Day = "0" + DayDate;
if (DayDate < 10) Day = "0" + DayDate; // else Day = DayDate;
else Day = DayDate; // this.formData.SEX = org_gender % 2 === 1 ? "1" : "0";
this.formData.SEX = org_gender % 2 === 1 ? "1" : "0"; // this.formData.DATE_OF_BIRTH = birthdays.getFullYear() + "-" + MonthDate + "-" + Day;
this.formData.DATE_OF_BIRTH = birthdays.getFullYear() + "-" + MonthDate + "-" + Day; // this.formData.DRIVER_LICENSE_NO = this.formData.USER_ID_CARD
this.formData.DRIVER_LICENSE_NO = this.formData.USER_ID_CARD // this.formData.QUALIFICATION_CERTIFICATE_NO = this.formData.USER_ID_CARD
this.formData.QUALIFICATION_CERTIFICATE_NO = this.formData.USER_ID_CARD // // uni.navigateTo({
// uni.navigateTo({ // // url: '/pages/login/register/baseInfo?'
// url: '/pages/login/register/baseInfo?' // // +'NAME='+encodeURIComponent(JSON.stringify(this.formData.NAME.replace('%','%25')))
// +'NAME='+encodeURIComponent(JSON.stringify(this.formData.NAME.replace('%','%25'))) // // +'&USER_ID_CARD='+ encodeURIComponent(JSON.stringify(this.formData.USER_ID_CARD))
// +'&USER_ID_CARD='+ encodeURIComponent(JSON.stringify(this.formData.USER_ID_CARD)) // // +'&PHONE='+ encodeURIComponent(JSON.stringify(this.formData.PHONE))
// +'&PHONE='+ encodeURIComponent(JSON.stringify(this.formData.PHONE)) // // +'&DATE_OF_BIRTH='+ encodeURIComponent(JSON.stringify(this.formData.DATE_OF_BIRTH))
// +'&DATE_OF_BIRTH='+ encodeURIComponent(JSON.stringify(this.formData.DATE_OF_BIRTH)) // // +'&SEX='+ encodeURIComponent(JSON.stringify(this.formData.SEX))
// +'&SEX='+ encodeURIComponent(JSON.stringify(this.formData.SEX)) // // });
// }); // this.$emit("confirm", '');
this.$emit("confirm", '');
}
} }
}, },
goback(){ goback(){
var pages = getCurrentPages(); // 获取当前页面栈 var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上二级页面 var prePage = pages[pages.length - 2]; // 上二级页面

34
pages/login/register/index.vue
View File

@ -77,11 +77,11 @@
form: { form: {
USER_ID: '', USER_ID: '',
// 姓名 // 姓名
NAME: '', NAME: '王',
// 身份证号 // 身份证号
USER_ID_CARD: '', USER_ID_CARD: '130324198402060224',
// 手机号码 // 手机号码
PHONE: '', PHONE: '13091370001',
// 生日 // 生日
DATE_OF_BIRTH: '', DATE_OF_BIRTH: '',
// 性别 // 性别
@ -103,12 +103,12 @@
ID_CARD_FRONT: '', ID_CARD_FRONT: '',
ID_CARD_BACK: '', ID_CARD_BACK: '',
// 身份证有效期 // 身份证有效期
ID_CARD_VALIDITY_START: '', ID_CARD_VALIDITY_START: '2019-03-13',
ID_CARD_VALIDITY_END: '', ID_CARD_VALIDITY_END: '2039-03-13',
// 身份证住址 // 身份证住址
ID_CARD_ADDRESS: '', ID_CARD_ADDRESS: '住址',
// 身份证签发机关 // 身份证签发机关
ID_CARD_ORGAN: '', ID_CARD_ORGAN: '身份证签发机关',
// 民族 // 民族
NATION: '', NATION: '',
NATIONNAME: '', NATIONNAME: '',
@ -120,15 +120,15 @@
// 准驾车型 // 准驾车型
DRIVING_MODEL: [], DRIVING_MODEL: [],
// 国籍 // 国籍
DRIVING_NATIONALITY: '', DRIVING_NATIONALITY: '中国',
// 初次领证日期 // 初次领证日期
DRIVER_LICENSE_ISSUE_DATE: '', DRIVER_LICENSE_ISSUE_DATE: '2010-03-13',
// 驾驶证有效期（起始） // 驾驶证有效期（起始）
DRIVER_LICENSE_VALIDITY_START: '', DRIVER_LICENSE_VALIDITY_START: '2015-03-13',
// 驾驶证有效期（截止） // 驾驶证有效期（截止）
DRIVER_LICENSE_VALIDITY_END: '', DRIVER_LICENSE_VALIDITY_END: '2025-03-13',
// 驾驶证签发机关 // 驾驶证签发机关
DRIVER_LICENSE_ORGAN: '', DRIVER_LICENSE_ORGAN: '驾驶证签发机关',
// 道路运输从业人员从业资格证照片 // 道路运输从业人员从业资格证照片
QUALIFICATION_CERTIFICATE: '', QUALIFICATION_CERTIFICATE: '',
@ -137,15 +137,15 @@
// 从业资格类别 // 从业资格类别
QUALIFICATION_CERTIFICATE_CATEGORY: [], QUALIFICATION_CERTIFICATE_CATEGORY: [],
// 道路运输从业人员从业资格证号 // 道路运输从业人员从业资格证号
QUALIFICATION_CERTIFICATE_NATIONALITY: '', QUALIFICATION_CERTIFICATE_NATIONALITY: '中国',
// 初次领证日期 // 初次领证日期
QUALIFICATION_CERTIFICATE_ISSUE_DATE: '', QUALIFICATION_CERTIFICATE_ISSUE_DATE: '2011-03-13',
// 从业资格证有效期（起始） // 从业资格证有效期（起始）
QUALIFICATION_CERTIFICATE_VALIDITY_START: '', QUALIFICATION_CERTIFICATE_VALIDITY_START: '2023-03-13',
// 从业资格证有效期（截止） // 从业资格证有效期（截止）
QUALIFICATION_CERTIFICATE_VALIDITY_END: '', QUALIFICATION_CERTIFICATE_VALIDITY_END: '2029-03-13',
// 道路运输从业人员从业资格证签发机关 // 道路运输从业人员从业资格证签发机关
QUALIFICATION_CERTIFICATE_ORGAN: '', QUALIFICATION_CERTIFICATE_ORGAN: '从业资格证签发机关',
//申请入职企业 //申请入职企业
APPLY_CORP: '', APPLY_CORP: '',

11
pages/my/home.vue
View File

@ -14,8 +14,8 @@
</view> </view>
</view> </view>
<view class="cu-list menu margin-top"> <view class="cu-list menu margin-top">
<view v-if="loginCorpId" class="cu-item arrow"> <view class="cu-item arrow">
<navigator v-if="isRest==='1'" class="content" hover-class="none" url="../" @click="showRest()"> <navigator class="content" v-if="isRest=='1'" hover-class="none" url="../" @click="showRest()">
<text class="text-semi">离岗</text> <text class="text-semi">离岗</text>
</navigator> </navigator>
<navigator class="content" v-else hover-class="none" url="/pages/my/offduty/index"> <navigator class="content" v-else hover-class="none" url="/pages/my/offduty/index">
@ -69,19 +69,16 @@
export default { export default {
data() { data() {
return { return {
loginCorpId: '',
loginUser :'', loginUser :'',
userPhoto :'/static/avatar.png', userPhoto :'/static/avatar.png',
isRest :'' isRest :''
}; };
}, },
mounted() { mounted() {
this.getData();
this.loginUser = loginUser; this.loginUser = loginUser;
this.loginCorpId = loginUser.CORPINFO_ID
console.log('loginCorpId =>' + this.loginCorpId)
this.isRest = isRest; this.isRest = isRest;
if(this.loginCorpId && this.loginUser.USERNAME){ if(this.loginUser.USERNAME){
this.getData();
this.getUserInfo(); this.getUserInfo();
} }