admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

冲突

Browse Source
This commit is contained in:
”Rain“ 2024-06-07 17:43:51 +08:00
commit d1560cdaa1
13 changed files with 498032 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

187
components/footers/footers.vue
View File

@ -3,7 +3,7 @@
<!--
:class="userInfo.accountType==5||userInfo.accountType==6 || userInfo.accountType==10?'footerBox2':''" -->
<view @click="tabClick(item.plugin)" class="footerItem" :class="activeTab==item.plugin?'active':''"
v-for="(item,index) in tabList" v-if="item.appShow==1" :key="index">
v-for="(item,index) in tabList" v-show="item.appShow==1 && item.isShow" :key="index">
<image class="tabIcon tabIcon1" mode="heightFix" :src="'/static/'+item.moduleIcon2+'.png'"></image>
<image class="tabIcon tabIcon2" mode="heightFix" :src="'/static/'+item.moduleIcon+'.png'"></image>
<view class="desc">
@ -18,105 +18,138 @@
props: ['activeTab'],
data() {
return {
tabList: [],
userInfo: {
accountType: 1
}
// activeTab: 0
};
},
mounted() {
this.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
if (this.userInfo.accountType == 5 || this.userInfo.accountType == 6 || this.userInfo.accountType == 10) {
this.tabList.push(
{
tabList: [{
appName: '消息',
moduleIcon2: 'footerIcon1',
moduleIcon: 'footerIcon2',
plugin: 'mssage',
appShow: 1
},
{
appShow: 1,
isShow: false
}, {
appName: '首页',
moduleIcon2: 'tabIcon-index',
moduleIcon: 'tabIcon-index-active',
plugin: 'projectEnd',
appShow: 1
},
{
appShow: 1,
isShow: true
},{
appName: '发起审批',
moduleIcon2: 'submit-n',
moduleIcon: 'submit',
plugin: 'submit',
appShow: 1
},
{
appShow: 1,
isShow: false
}, {
appName: '工作台',
moduleIcon2: 'workspace-n',
moduleIcon: 'workspace',
plugin: 'workspace',
appShow: 1
},
{
appShow: 1,
isShow: false
}, {
appName: '我的',
moduleIcon2: 'tabIcon-my2',
moduleIcon: 'tabIcon-my2-active',
plugin: 'my',
appShow: 1
}, )
} else if (this.COMPANY == 'sanjiang') {
this.tabList.push({
appName: '首页总览',
moduleIcon2: 'sjjt_syzl',
moduleIcon: 'sjjt_syzl-tab',
plugin: 'projectManage',
appShow: 1
}, {
appName: '我的',
moduleIcon2: 'tabIcon-my',
moduleIcon: 'tabIcon-my-select',
plugin: 'my',
appShow: 1
})
} else if (this.userInfo.accountType == 11) {
// 供应商
this.tabList.push({
appName: '首页总览',
moduleIcon2: 'sjjt_syzl',
moduleIcon: 'sjjt_syzl-tab',
plugin: 'supplierHome',
appShow: 1
}, {
appName: '我的',
moduleIcon2: 'tabIcon-my',
moduleIcon: 'tabIcon-my-select',
plugin: 'supplierMy',
appShow: 1
})
} else {
try{
var moduleList = this.userInfo.menuAuthority.moduleList
for (let i = 0; i < moduleList.length; i++) {
if (moduleList[i].moduleType == 1) {
this.tabList.push(moduleList[i])
}
}
}catch(e){
//TODO handle the exception
}
this.tabList.push({
appName: '我的',
moduleIcon2: 'tabIcon-my',
moduleIcon: 'tabIcon-my-select',
plugin: 'my',
appShow: 1
})
}
appShow: 1,
isShow: true
}],
userInfo: {
accountType: 1
},
haveModuleList: []
// activeTab: 0
};
},
mounted() {
// console.log(this.tabList)
this.$forceUpdate()
},
created() {
this.getModuleList();
},
methods: {
getModuleList() {
var that = this
this.sendRequest({
url: "xmgl/baseModule/getModuleAndMenuList",
data: {
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn,
moduleType: 7,
userId: JSON.parse(uni.getStorageSync('userInfo')).userId,
},
method: "post",
success(result) {
if (result.success) {
that.haveModuleList = result.result.moduleList
that.userInfo = JSON.parse(uni.getStorageSync('userInfo'))
if (that.userInfo.accountType == 5 || that.userInfo.accountType == 6 || that
.userInfo
.accountType == 10) {
let findInfo = that.haveModuleList.find(item => item.modulePath ==
"/infoCenter/allInfo")
if (findInfo) {
that.tabList[0].isShow = true
}
let findWorkSpace = that.haveModuleList.find(item => item.modulePath ==
"/workSpace")
if (findWorkSpace) {
that.tabList[2].isShow = true
that.tabList[3].isShow = true
}
} else if (that.COMPANY == 'sanjiang') {
that.tabList.push({
appName: '首页总览',
moduleIcon2: 'sjjt_syzl',
moduleIcon: 'sjjt_syzl-tab',
plugin: 'projectManage',
appShow: 1
}, {
appName: '我的',
moduleIcon2: 'tabIcon-my',
moduleIcon: 'tabIcon-my-select',
plugin: 'my',
appShow: 1
})
} else if (that.userInfo.accountType == 11) {
// 供应商
that.tabList.push({
appName: '首页总览',
moduleIcon2: 'sjjt_syzl',
moduleIcon: 'sjjt_syzl-tab',
plugin: 'supplierHome',
appShow: 1
}, {
appName: '我的',
moduleIcon2: 'tabIcon-my',
moduleIcon: 'tabIcon-my-select',
plugin: 'supplierMy',
appShow: 1
})
} else {
try {
var moduleList = that.userInfo.menuAuthority.moduleList
for (let i = 0; i < moduleList.length; i++) {
if (moduleList[i].moduleType == 1) {
that.tabList.push(moduleList[i])
}
}
} catch (e) {
//TODO handle the exception
}
that.tabList.push({
appName: '我的',
moduleIcon2: 'tabIcon-my',
moduleIcon: 'tabIcon-my-select',
plugin: 'my',
appShow: 1
})
}
}
}
})
},
tabClick(plugin) {
console.log(plugin)
switch (plugin) {
@ -171,7 +204,7 @@
url: '/pages/projectEnd/projectIndex/projectIndex'
})
break;
case 'mssage':
case 'mssage':
uni.redirectTo({
url: '/pages/messageCenter/messageCenter'
})

20
main.js
View File

@ -31,17 +31,19 @@ Vue.component('uni-icons2', uniIcons2)
// Vue.prototype.COMPANY = "sanjiang" //（部署三江h5需要打开/pages/projectManage/projectManage，页面onload内容）
// Vue.prototype.COMPANY = "zjwj"
// Vue.prototype.COMPANY = "sccr"
Vue.prototype.COMPANY = ""
Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境
// Vue.prototype.COMPANY = "" // 标准版
if (process.env.NODE_ENV === 'development') {
// 开发环境
console.log('开发环境')
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// Vue.prototype.url_config = ' http://192.168.34.221:28888/' //郭圣雄本地
Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
// Vue.prototype.url_config = ' http://192.168.34.221:9111/' //郭圣雄本地
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
@ -81,6 +83,8 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://182.90.224.147:15551'//成润线上
// Vue.prototype.url_config = 'http://118.121.198.147:23232'//成润正式
// Vue.prototype.url_config = 'http://huli.zjzhiliao.com/jxjgdapi'//金林湾测试
// Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信
} else {
// 生产环境
@ -88,13 +92,13 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南
@ -129,7 +133,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:30250/#/'// 演示平台H5
// Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段
// Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信
}
Vue.prototype.$formatDates = formatDates;

2
pages/login/login.vue
View File

@ -11,7 +11,7 @@
</view>
<view class="btns">
<view class="user feedback" @click="goto('user')">用户登录</view>
<view class="feedback personLocation" @click="gotoPersonLocation()">施工人员登录</view>
<view class="feedback personLocation" @click="gotoPersonLocation()" v-if="COMPANY == 'agjt'">施工人员登录</view>
<!-- <view class="user feedback" @click="goto('user')">我是用户</view> -->
<!-- <view class="supplier feedback black" @click="goto('supplier')">我是供应商</view> -->
</view>

19
pages/personLocation/exam/beginexam/beginexam.vue
View File

@ -74,14 +74,14 @@
console.log(options, 123456)
this.pageData = JSON.parse(options.transportData)
console.log(this.pageData.examDuration)
},
onShow() {
this.totalTime = +this.pageData.examDuration * 60;
this.startTimer();
},
onHide() {
this.stopTimer();
},
// onShow() {
// },
// onHide() {
// this.stopTimer();
// },
onUnload() {
this.stopTimer();
},
@ -128,6 +128,15 @@
url: '../studydetails/studydetails?transportData=' +
JSON.stringify(transportData)
})
},
complete(){
let transportData = {
...that.pageData
}
uni.redirectTo({
url: '../studydetails/studydetails?transportData=' +
JSON.stringify(transportData)
})
}
})
} else if (res.cancel) {

110
pages/projectEnd/carManage/addCar.vue
View File

@ -103,7 +103,8 @@
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.carPhotosUrl" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(1,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
<uni-icons2 @click="deleteImg(1,index)" class="deleteImg" type="clear"
size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(1)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -117,7 +118,8 @@
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.jsz" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(2,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
<uni-icons2 @click="deleteImg(2,index)" class="deleteImg" type="clear"
size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(2)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -131,7 +133,8 @@
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.xsz" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(3,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
<uni-icons2 @click="deleteImg(3,index)" class="deleteImg" type="clear"
size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(3)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -145,7 +148,8 @@
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.jqx" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(4,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
<uni-icons2 @click="deleteImg(4,index)" class="deleteImg" type="clear"
size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(4)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -159,7 +163,8 @@
<view class="uni-form-input" style="display: flex;align-items: center;flex-wrap: wrap;">
<view class="imgBox" v-for="(item,index) in form.otherProve" :key="index">
<image :src="url_config+'image/'+item.url" class="img"></image>
<uni-icons2 @click="deleteImg(5,index)" class="deleteImg" type="clear" size="24"></uni-icons2>
<uni-icons2 @click="deleteImg(5,index)" class="deleteImg" type="clear"
size="24"></uni-icons2>
</view>
<view class="addImgBox" @click="selectImg(5)">
<image src="/static/icon-add.png" class="icon-add"></image>
@ -312,6 +317,11 @@
</scroll-view>
</view>
</uni-popup>
<!--选择器搜索组件-->
<!-- <pickerHospital v-model="isNation" :dataSource='driverNameList' :pickerValues="[5]" @recload='confirmHospital'>
</pickerHospital> -->
</view>
</template>
@ -361,7 +371,8 @@
key: '',
selectIndexQy: null,
qyList: [],
cityIdArr: []
cityIdArr: [],
isNation: false,
}
},
computed: {
@ -406,6 +417,13 @@
},
methods: {
// getHospital() {
// //打开选择器
// this.isNation = true
// },
// confirmHospital(data) {
// console.log(data, '选择的数据')
// },
checkChange(e) {
console.log(e.detail.value)
this.cityIdArr = e.detail.value
@ -468,35 +486,50 @@
success: (uploadFileRes) => {
console.log(uploadFileRes.data);
if (type == 1) {
that.form.carPhotosUrl.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
that.form.carPhotosUrl.push({
name: "",
url: JSON.parse(uploadFileRes.data).data[0].imageUrl
})
// that.form.carPhotosUrl = JSON.parse(uploadFileRes.data).data[0]
// .imageUrl
} else if (type == 2) {
that.form.jsz.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
that.form.jsz.push({
name: "",
url: JSON.parse(uploadFileRes.data).data[0].imageUrl
})
} else if (type == 3) {
that.form.xsz.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
that.form.xsz.push({
name: "",
url: JSON.parse(uploadFileRes.data).data[0].imageUrl
})
} else if (type == 4) {
that.form.jqx.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
that.form.jqx.push({
name: "",
url: JSON.parse(uploadFileRes.data).data[0].imageUrl
})
} else if (type == 5) {
that.form.otherProve.push({name: "",url: JSON.parse(uploadFileRes.data).data[0].imageUrl})
that.form.otherProve.push({
name: "",
url: JSON.parse(uploadFileRes.data).data[0].imageUrl
})
}
}
});
}
})
},
deleteImg(type,index) {
deleteImg(type, index) {
if (type == 1) {
this.form.carPhotosUrl.splice(index,1)
this.form.carPhotosUrl.splice(index, 1)
// this.form.carPhotosUrl = ''
} else if (type == 2) {
this.form.jsz.splice(index,1)
this.form.jsz.splice(index, 1)
} else if (type == 3) {
this.form.xsz.splice(index,1)
this.form.xsz.splice(index, 1)
} else if (type == 4) {
this.form.jqx.splice(index,1)
this.form.jqx.splice(index, 1)
} else if (type == 5) {
this.form.otherProve.splice(index,1)
this.form.otherProve.splice(index, 1)
}
},
radioChange(e) {
@ -573,7 +606,7 @@
// that.bjIndex = bjIndex >= 0 ? bjIndex : null;
// alarmPushWorkerId
if(this.form.alarmPushWorkerId){
if (this.form.alarmPushWorkerId) {
let idArr = this.form.alarmPushWorkerId.split(',');
console.log(idArr, "idArridArridArr")
that.cityIdArr = that.baoList.filter(item => {
@ -597,43 +630,43 @@
if (that.form.jsz) {
var arr = JSON.parse(that.form.jsz)
if (arr.length > 0) {
that.form.jsz = arr
} else {
that.form.jsz = []
}
that.form.jsz = arr
} else {
that.form.jsz = []
}
} else {
that.form.jsz = []
}
if (that.form.xsz) {
var arr = JSON.parse(that.form.xsz)
if (arr.length > 0) {
that.form.xsz = arr
} else {
that.form.xsz = []
}
that.form.xsz = arr
} else {
that.form.xsz = []
}
} else {
that.form.xsz = []
}
if (that.form.jqx) {
var arr = JSON.parse(that.form.jqx)
if (arr.length > 0) {
that.form.jqx = arr
} else {
that.form.jqx = []
}
that.form.jqx = arr
} else {
that.form.jqx = []
}
} else {
that.form.jqx = []
}
if (that.form.otherProve) {
var arr = JSON.parse(that.form.otherProve)
if (arr.length > 0) {
that.form.otherProve = arr
} else {
that.form.otherProve = []
}
that.form.otherProve = arr
} else {
that.form.otherProve = []
}
} else {
that.form.otherProve = []
}
}
})
},
@ -708,7 +741,7 @@
})
return false;
}
if([1,2].includes(this.form.carModuleType)){
if ([1, 2].includes(this.form.carModuleType)) {
delete params.driverWorkerName;
if (this.driverNameIndex == null) {
uni.showToast({
@ -718,7 +751,7 @@
return false;
}
}
if([3].includes(this.form.carModuleType)){
if ([3].includes(this.form.carModuleType)) {
if (params.driverWorkerName == '') {
uni.showToast({
title: '请输入司机姓名',
@ -728,7 +761,7 @@
}
}
let idCardReg = /^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/i
if([3].includes(this.form.carModuleType)){
if ([3].includes(this.form.carModuleType)) {
if (!idCardReg.test(params.outsideDriverIdCard)) {
uni.showToast({
title: '请输入正确的身份证格式',
@ -801,7 +834,7 @@
params.enterpriseId = this.qyList[this.selectIndexQy].enterpriseId
}
if ([2,3].includes(this.form.carModuleType)) {
if ([2, 3].includes(this.form.carModuleType)) {
// params.isBlack = '0';
if (this.form.reserveStartTime) {
params.reserveStartTime = this.form.reserveStartTime
@ -888,6 +921,7 @@
position: relative;
margin-right: 15px;
margin-bottom: 15rpx;
.img {
width: 100%;
height: 100%;

42
pages/projectEnd/carManage/index.vue
View File

@ -55,7 +55,8 @@
</view>
<view class="alarmItem">
<text class="label">车辆类型：</text>
<text class="value">{{ item.carModuleType == "1" ? "固定" : item.carModuleType == "2" ? "长期" : item.carModuleType == "3" ? "临时": "外来" }}车</text>
<text
class="value">{{ item.carModuleType == "1" ? "固定" : item.carModuleType == "2" ? "长期" : item.carModuleType == "3" ? "临时": "外来" }}车</text>
</view>
<view class="alarmItem">
<text class="label">进出场图片：</text>
@ -121,7 +122,8 @@
</view>
<view class="alarmItem">
<text class="label">车辆类型：</text>
<text class="value">{{ item.carModuleType == "1" ? "固定" : item.carModuleType == "2" ? "长期" : "临时" }}车</text>
<text
class="value">{{ item.carModuleType == "1" ? "固定" : item.carModuleType == "2" ? "长期" : "临时" }}车</text>
</view>
<view class="alarmItem">
<text class="label">预约时间：</text>
@ -129,11 +131,13 @@
</view>
<view class="alarmItem">
<text class="label">允许进出次数：</text>
<text class="value">{{ item.entryAndExitPermit === 0?'单次':item.entryAndExitPermit === 1?'多次':'' }}</text>
<text
class="value">{{ item.entryAndExitPermit === 0?'单次':item.entryAndExitPermit === 1?'多次':'' }}</text>
</view>
<view class="alarmItem">
<view class="alarmItem" v-if="isIscDevice">
<text class="label">车辆下发状态：</text>
<text class="value">{{ item.sendSuccessStatus === 1?'成功':item.sendSuccessStatus === 2?'失败':item.sendSuccessStatus === 3?'部分成功':'' }}</text>
<text
class="value">{{ item.sendSuccessStatus === 1?'成功':item.sendSuccessStatus === 2?'失败':item.sendSuccessStatus === 3?'部分成功':'' }}</text>
</view>
<!-- <view class="alarmItem">
<text class="label">车辆图片：</text>
@ -189,8 +193,9 @@
</view>
</view>
</view>
<image v-if="type !== 'supplier' && checkBtnPermission({key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'})" v-show="tabIndex==1" src="/static/addImg.png" class="addImg"
@click="goAdd('')"></image>
<image
v-if="type !== 'supplier' && checkBtnPermission({key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'})"
v-show="tabIndex==1" src="/static/addImg.png" class="addImg" @click="goAdd('')"></image>
<levitatedsphere :x="100" :y="80"></levitatedsphere>
</view>
</template>
@ -234,7 +239,8 @@
],
isBlack: 0,
type: "",
carType: undefined
carType: undefined,
isIscDevice: false
};
},
onShow() {
@ -251,13 +257,14 @@
// 判断默认选择哪个列表
this.tabIndex = option.listType
}
if (option.carType){
if (option.carType) {
// 判断默认选择哪种车辆类型的数据
this.carType = option.carType
}
this.projectDetail = JSON.parse(uni.getStorageSync('projectDetail'))
this.searchDate = GetDateStr(0, '-')
this.loadData()
this.getConfig()
},
onReachBottom() {
if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
@ -273,6 +280,23 @@
this.loadData()
},
methods: {
getConfig() {
var that = this
this.sendRequest({
url: "xmgl/projectCarCameraConfig/list",
data: {
projectSn: this.projectDetail.projectSn
},
method: "get",
success(result) {
if (result.success) {
if (result.result && result.result.length) {
that.isIscDevice = result.result[0].supplierType == 9 ? true : false;
}
}
}
})
},
goAdd(id) {
if (this.type === 'supplier') {
return

2
pages/projectEnd/carManage/indexPage.vue
View File

@ -186,7 +186,7 @@
</view>
</view>
</view> -->
<view class="tabBarBox">
<view class="tabBarBox" v-if="COMPANY == 'agjt'">
<view class="item active">
<image src="/static/personManage/index.png" class="img"></image>
<view class="txt">

2
pages/projectEnd/emergencyDisposal/detail.vue
View File

@ -197,7 +197,7 @@
</view>
</view>
</view>
<view class="addSaveBtn" @click="addSaveBtn" v-if="btnEditAuth">提交</view>
<view class="addSaveBtn" @click="addSaveBtn">提交</view>
</view>
<view v-if="emergencyDetail.dispositionStatus == 3"
style="color: #5181f6; cursor: pointer; height: 88rpx; justify-content: center; align-items: center;display: flex;"

2
pages/projectEnd/projectIndex/projectIndex.vue
View File

@ -135,7 +135,7 @@
<view class="position"> 巡检点位置：{{ qrCode.position }}</view>
</view>
</uni-popup>
<footers :activeTab="'projectEnd'" v-if="accountType == 5 || accountType == 6 || accountType == 10"></footers>
<footers :activeTab="'projectEnd'" v-if="(accountType == 5 || accountType == 6 || accountType == 10) && projectDetail.projectSn"></footers>
<levitatedsphere :x="100" :y="80"></levitatedsphere>
</view>
</template>

4
pages/projectEnd/safeSame/index.vue
View File

@ -79,12 +79,12 @@
</image>
<view>安全分析预警</view>
</view>
<view class="menu" @click="specialCheck">
<view class="menu" @click="specialCheck" v-if="COMPANY == 'agjt'">
<image class="icon" style="width: 30px; height: 30px;" src="@/static/safeMange/danger_check.png">
</image>
<view>特殊作业验收</view>
</view>
<view class="menu" @click="reliefApprove">
<view class="menu" @click="reliefApprove" v-if="COMPANY == 'agjt'">
<image class="icon" style="width: 30px; height: 30px;" src="@/static/reliefApprove.png">
</image>
<view>救援隐患审批</view>

2
pages/projectEnd/visitorsManage/visitorsDetails.vue
View File

@ -88,7 +88,7 @@
this.getDetails()
},
onLoad(vai) {
this.btnAuth = this.checkBtnPermission({key: 'trainPlan_add', menuPath: '/project/labor/visitRecord'})
this.btnAuth = this.checkBtnPermission({key: 'fkyyjl_delete', menuPath: '/project/labor/visitRecord'})
this.id = vai.itemS
},
onReachBottom() {

240906
unpackage/dist/dev/app-plus/app-service.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

256878
unpackage/dist/dev/app-plus/app-view.js vendored Normal file
View File

File diff suppressed because one or more lines are too long