admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-xiaole' into 'master'

Browse Source 
Dev xiaole

See merge request !13
This commit is contained in:
杜海鹏 2022-06-16 18:22:47 +08:00
commit a982d76475
9 changed files with 176 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/i18n/langs/cn/energyManage.js
View File

@ -168,6 +168,8 @@ export default {
pageTitle:'本项目运单',
feedCompany:'供料单位',
useCompany:'用料单位',
supplierEvaluation:'供应商评价',
performanceAnalysis:'履约分析',
chooseCompany:'选择单位',
fromRootChoose:'从总企业选择',
fromProjectChoose:'从项目企业选择',

4
src/assets/i18n/langs/cn/laborManage/laborDev.js
View File

@ -21,7 +21,8 @@ export default {
projectAppKey: '项目AppKey',
// devTypeList: ['杭州宇泛智能科技', '用jdpush推送', 'mqtt', '芊熠智能'],
// devTypeList: [{name:'杭州宇泛智能科技',id:1},{name:'芊熠智能',id:4},{name:'佳信捷第一版',id:5},{name:'佳信捷',id:6}],
devTypeList: [{name:'定制YF',id:1},{name:'定制QY',id:4},{name:'通用V2',id:5},{name:'通用V1',id:6}],
// devTypeList: [{name:'定制YF',id:1},{name:'定制QY',id:4},{name:'通用V2',id:5},{name:'通用V1',id:6}], //找不到最新版本所以更改了通用v1v2
devTypeList: [{name:'定制YF',id:1},{name:'定制QY',id:4},{name:'通用V1',id:5},{name:'通用V2',id:6}],
devGroupTypeList: [{name:'工地区',id:1},{name:'生活区',id:2},{name:'项目部',id:3}],
devTypeLabel: '设备类型',
noData: '暂无数据',
@ -35,6 +36,7 @@ export default {
blackNames: '黑名单人员',
isSendToDev:'是否下发到设备',
uploadToGover:'上传到住建局',
uploadToOuter:'上传外部平台',
//黑名单管理----end
//安全培训教育管理----start

2
src/assets/js/http.js
View File

@ -76,6 +76,8 @@ else if (process.env.NODE_ENV == 'debug') {
// axios.defaults.baseURL = 'http://zhgd.loganwy.com/'
}
axios.defaults.baseURL = 'http://139.9.66.234:8/'
// tag: 河南
if (COMPANY == 'henan') {
axios.defaults.baseURL = 'http://124.71.178.44:100/'

286
src/router/index.js
View File

@ -7,31 +7,9 @@ import homeIntro from '../views/homeTwo/homeIntro.vue' //首页-系统简介页
Vue.use(VueRouter)
var routes = []
const routes2 = [
// {
// path: '/',
// name: 'Home',
// // component: homeLayout
// component: homeIntro
// },
// {
// path: '/login',
// name: 'login',
// // component: () => import('../views/home/login.vue')
// component: () => import('../views/home/login_v1.vue')
// },
// {
// path: '/sign',
// name: '注册',
// component: () => import('../views/home/sign.vue')
// },
// {
// path: '/authorization',
// name: '授权',
// component: () => import('../views/home/authorization.vue')
// },
{
path: '/',
name: 'HomeTwo',
name: 'Home',
// component: homeLayout
component: homeIntro
},
@ -39,18 +17,40 @@ const routes2 = [
path: '/login',
name: 'login',
// component: () => import('../views/home/login.vue')
component: () => import('../views/homeTwo/login_v1.vue')
component: () => import('../views/home/login_v1.vue')
},
{
path: '/sign',
name: '注册',
component: () => import('../views/homeTwo/sign.vue')
component: () => import('../views/home/sign.vue')
},
{
path: '/authorization',
name: '授权',
component: () => import('../views/homeTwo/authorization.vue')
component: () => import('../views/home/authorization.vue')
},
// {
// path: '/',
// name: 'HomeTwo',
// // component: homeLayout
// component: homeIntro
// },
// {
// path: '/login',
// name: 'login',
// // component: () => import('../views/home/login.vue')
// component: () => import('../views/homeTwo/login_v1.vue')
// },
// {
// path: '/sign',
// name: '注册',
// component: () => import('../views/homeTwo/sign.vue')
// },
// {
// path: '/authorization',
// name: '授权',
// component: () => import('../views/homeTwo/authorization.vue')
// },
{
path: '/page',
name: 'page5',
@ -1386,124 +1386,124 @@ const routes2 = [
{
path: '/project/dataBoard/',
name: '数据看板',
component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve),
// component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve),
// children: [{
// path: 'index',
// name: '数据看板-首页概览',
// component: () => import('@/views/projectAdmin/dataBoard/index.vue'),
// }, {
// path: 'digitalSite',
// name: '数据看板-数字工地',
// component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'),
// }, {
// path: 'laborManage',
// name: '数据看板-劳务管理',
// component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'),
// }, {
// path: 'environment',
// name: '数据看板-环境监测',
// component: () => import('@/views/projectAdmin/dataBoard/environment.vue'),
// },
// {
// path: 'material',
// name: '数据看板-材料管理',
// component: () => import('@/views/projectAdmin/dataBoard/material.vue'),
// },
// {
// path: 'plan',
// name: '数据看板-进度计划',
// component: () => import('@/views/projectAdmin/dataBoard/plan.vue'),
// },
// {
// path: 'secure',
// name: '数据看板-安全管理',
// component: () => import('@/views/projectAdmin/dataBoard/secure.vue'),
// },
// {
// path: 'quality',
// name: '数据看板-质量管理',
// component: () => import('@/views/projectAdmin/dataBoard/quality.vue'),
// },
// {
// path: 'SixHundred',
// name: '数据看板-六个百分百',
// component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'),
// },
// {
// path: 'AiAnalysis',
// name: '数据看板-AI数据分析',
// component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
// }
// ]
// component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve),
component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve),
children: [{
path: 'index',
name: '数据看板-首页概览',
component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
}, {
path: 'digitalSite',
name: '数据看板-数字工地',
component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'),
}, {
path: 'laborManage',
name: '数据看板-劳务管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
}, {
path: 'environment',
name: '数据看板-环境监测',
component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
},
{
path: 'material',
name: '数据看板-材料管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
},
{
path: 'plan',
name: '数据看板-进度计划',
component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
},
{
path: 'secure',
name: '数据看板-安全管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
},
{
path: 'quality',
name: '数据看板-质量管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
},
{
path: 'SixHundred',
name: '数据看板-六个百分百',
component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
},
{
path: 'AiAnalysis',
name: '数据看板-AI数据分析',
component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
},
{
path: 'contractManage',
name: '数据看板-合约管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'),
},
{
path: 'doublecManage',
name: '数据看板-双碳管理',
component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'),
},
{
path: 'bigScreen',
name: '数据看板-监控大屏',
component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'),
},
{
path: 'cimManage',
name: '数据看板-CIM+',
component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'),
}
]
path: 'index',
name: '数据看板-首页概览',
component: () => import('@/views/projectAdmin/dataBoard/index.vue'),
}, {
path: 'digitalSite',
name: '数据看板-数字工地',
component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'),
}, {
path: 'laborManage',
name: '数据看板-劳务管理',
component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'),
}, {
path: 'environment',
name: '数据看板-环境监测',
component: () => import('@/views/projectAdmin/dataBoard/environment.vue'),
},
{
path: 'material',
name: '数据看板-材料管理',
component: () => import('@/views/projectAdmin/dataBoard/material.vue'),
},
{
path: 'plan',
name: '数据看板-进度计划',
component: () => import('@/views/projectAdmin/dataBoard/plan.vue'),
},
{
path: 'secure',
name: '数据看板-安全管理',
component: () => import('@/views/projectAdmin/dataBoard/secure.vue'),
},
{
path: 'quality',
name: '数据看板-质量管理',
component: () => import('@/views/projectAdmin/dataBoard/quality.vue'),
},
{
path: 'SixHundred',
name: '数据看板-六个百分百',
component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'),
},
{
path: 'AiAnalysis',
name: '数据看板-AI数据分析',
component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
}
]
// children: [{
// path: 'index',
// name: '数据看板-首页概览',
// component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'),
// }, {
// path: 'digitalSite',
// name: '数据看板-数字工地',
// component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'),
// }, {
// path: 'laborManage',
// name: '数据看板-劳务管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'),
// }, {
// path: 'environment',
// name: '数据看板-环境监测',
// component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'),
// },
// {
// path: 'material',
// name: '数据看板-材料管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'),
// },
// {
// path: 'plan',
// name: '数据看板-进度计划',
// component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'),
// },
// {
// path: 'secure',
// name: '数据看板-安全管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'),
// },
// {
// path: 'quality',
// name: '数据看板-质量管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'),
// },
// {
// path: 'SixHundred',
// name: '数据看板-六个百分百',
// component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'),
// },
// {
// path: 'AiAnalysis',
// name: '数据看板-AI数据分析',
// component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'),
// },
// {
// path: 'contractManage',
// name: '数据看板-合约管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'),
// },
// {
// path: 'doublecManage',
// name: '数据看板-双碳管理',
// component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'),
// },
// {
// path: 'bigScreen',
// name: '数据看板-监控大屏',
// component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'),
// },
// {
// path: 'cimManage',
// name: '数据看板-CIM+',
// component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'),
// }
// ]
},
{
path: '/equipmentCenter/',

2
src/views/projectAdmin/dataBoardTwo/dataBoard.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="fullHeight dataBoardPage" :class="{'dataBoardPage_blue':enabledProjectV2==3,'dataBoardPage_blue2':enabledProjectV2==4 ,'longguangBg':company=='longguang'}">
<div class="headerBox">
<p class="projectName">{{ $store.state.currentProDetail.projectName }}</p>
<!-- <p class="projectName">{{ $store.state.currentProDetail.projectName }}</p> -->
<h1 class="title">
<img v-if="headerLogo" style="width: auto;height: 30px;margin-right: 16px;" :src="headerLogo" />
<span v-if="company != 'longguang'">

13
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -342,7 +342,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="key == 1"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -492,11 +492,11 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="key == 1"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
<div v-if="key == 1">
<div v-if="!key">
<el-checkbox
v-model="scope.row.isUploadHousing"
:checked="scope.row.isUploadHousing == 1 ? true : false"
@ -1867,13 +1867,14 @@ export default {
data.menuList.forEach((item)=>{
if(item.actionList){
item.actionList.forEach((item2)=>{
if(item2.actionCode == 'akey_issued' ){
this.key == 1 ;
if(item2.actionCode = 'akey_issued' ){
this.key = true ;
// console.log('key',this.key)
}
})
}
})
// console.log('key',this.key)
if (sessionStorage.getItem("personPage2")) {
this.page = JSON.parse(sessionStorage.getItem("personPage2"));
}

14
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -334,7 +334,7 @@
type="primary"
:disabled="checkedWorker.length == 0"
@click="issuePersonFn"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</el-form-item>
@ -475,7 +475,7 @@
type="primary"
size="mini"
@click="issuePersonOneFn(scope.row.id)"
v-if="key"
v-if="!key"
>{{ $t("message.laborMange.aKeyIssued") }}</el-button
>
</div>
@ -490,12 +490,12 @@
@change="
uploadToHouseFn(scope.row.isUploadHousing, scope.row.id)
"
>{{ $t("message.laborDev.uploadToGover") }}</el-checkbox
>{{ $t("message.laborDev.uploadToOuter") }}</el-checkbox
>
</div> -->
<div
class="personItemBottom"
v-if="key"
v-if="!key"
>
<el-checkbox
v-model="scope.row.isUploadHousing"
@ -503,7 +503,7 @@
@change="
uploadToHouseFn(scope.row.isUploadHousing, scope.row.id)
"
>{{ $t("message.laborDev.uploadToGover") }}</el-checkbox
>{{ $t("message.laborDev.uploadToOuter") }}</el-checkbox
>
</div>
</template>
@ -2458,8 +2458,8 @@ export default {
data.menuList.forEach((item)=>{
if(item.actionList){
item.actionList.forEach((item2)=>{
if(item2.status = 'akey_issued'){
this.key == true
if(item2.actionCode == 'akey_issued'){
this.key = true
}
})
}

8
src/views/projectFront/laborManage/roster.vue
View File

@ -152,8 +152,10 @@
<el-table-column prop="attendanceNumber">
<template slot-scope="scope">
<div class="flex3" style="padding-left: 20px">
<!-- {{scope.row}} -->
<!-- :src="$store.state.FILEURL + scope.row.idCardBigPhotoUrl" -->
<img
:src="$store.state.FILEURL + scope.row.idCardBigPhotoUrl"
:src="scope.row.idCardBigPhotoUrl"
style="
width: 52px;
height: 72px;
@ -1193,8 +1195,10 @@ export default {
//查看图片
handlePreview(file) {
console.log('文件',file)
this.bigImageDialog = true;
this.bigImageUrl = this.$store.state.FILEURL + file;
// this.bigImageUrl = this.$store.state.FILEURL + file;
this.bigImageUrl = file;
},
//重置表单

5
src/views/projectFront/materialManage/cooperationUnit.vue
View File

@ -8,6 +8,11 @@
<el-tab-pane :label="$t('message.energyManage.waybill.feedCompany')" name="1"> </el-tab-pane>
<!-- 用料单位 -->
<el-tab-pane :label="$t('message.energyManage.waybill.useCompany')" name="2"> </el-tab-pane>
<!-- 中建四局展示时要求合作单位加两个tab栏 -->
<!-- 供应商评价-->
<el-tab-pane :label="$t('message.energyManage.waybill.supplierEvaluation')" name="3"> </el-tab-pane>
<!-- 履约分析-->
<el-tab-pane :label="$t('message.energyManage.waybill.performanceAnalysis')" name="4"> </el-tab-pane>
</el-tabs>
<div class="operateBar">
<el-dropdown @command="showSelectDialog">