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

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
Vce 2024-05-05 15:16:30 +08:00
commit 06d7910514
10 changed files with 157 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/doc/h5Entry/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.87175123858093ffc18168c24c1ea391.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.2894818dffea468ddc2107034baa0082.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
var rootURL = host + "/";
// var rootURL = "http://192.168.34.221:28888/";
// var rootURL = "http://192.168.34.221:9111/"; //本地
@ -16,4 +16,4 @@
// rootURL = "http://192.168.34.155:19111/" //本地
// locationURL=rootURL+'doc/h5Entry/index.html?userId=4&projectSn=a2ef0238b59146aa814b93f47710dbf2#/'
locationURL=rootURL+'doc/h5Entry/index.html?userId=1779721457571291137&projectSn=BD3137498CB84BF0969979E0342CDBCA&educationId=1666278624304615426#/'
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.f54bc54e6e52d34697c4.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.c6b3cb802133ea2879cb.js></script></body></html>
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.57836df18953bdc17acc.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.c6b3cb802133ea2879cb.js></script></body></html>

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

@ -84,7 +84,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

26
src/store/index.js
View File

@ -48,24 +48,24 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
// WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
// UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
// FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl

10
src/views/home/login_v2.vue
View File

@ -70,7 +70,7 @@
>
用户登录
</p>
<p
<!-- <p
:class="loginType == 2 ? 'border_bottom' : 'placeholder'"
@click="
() => {
@ -79,7 +79,7 @@
"
>
供应商登录
</p>
</p> -->
</div>
<div class="info_content">
<el-form
@ -209,7 +209,7 @@
>
新用户注册
</p>
<p
<!-- <p
:class="registerType == 2 ? 'border_bottom' : 'placeholder'"
@click="
() => {
@ -218,7 +218,7 @@
"
>
供应商注册
</p>
</p> -->
</div>
<div class="info_content">
<el-form
@ -1310,7 +1310,7 @@ export default {
}
.info_title {
justify-content: space-around;
// justify-content: space-around;
font-family: PingFangSC-Medium;
font-size: 16px;
color: #aeafb9;

79
src/views/projectFront/laborManage/personDetails.vue
View File

@ -1463,7 +1463,7 @@
v-else
v-for="(item, index) in scope.row.fileList"
@click="
handlePreview({ url: item.url }, { name: item.name }, 4)
handlePreview({ url: item.url }, { name: item.name }, 5)
"
:key="index"
style="cursor: pointer"
@ -1830,6 +1830,54 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="address"
:label="$t('message.laborMange.accessory')"
>
<template slot-scope="scope">
<el-upload
v-if="scope.row.insuranceState"
class="upload-demo"
:action="uploadUrl"
:on-preview="(file) => handlePreview(file, 6)"
:on-remove="
(file) =>
handleRemove({ file: file, index: scope.$index }, 7)
"
:on-success="
(file) =>
handleSuccess({ file: file, index: scope.$index }, 7)
"
:limit="5"
name="files"
:file-list="scope.row.fileList"
>
<el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload')
}}</el-button>
</el-upload>
<div
v-else
v-for="(item, index) in scope.row.fileList"
@click="
handlePreview({ url: item.url }, { name: item.name }, 7)
"
:key="index"
style="cursor: pointer"
>
<el-tooltip
class="item"
effect="dark"
:content="item.name"
placement="top"
>
<div :class="item.name.length > 8 ? 'hide' : ''">
{{ item.name }}
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column prop="address" label="">
<template slot-scope="scope">
<el-button
@ -2749,6 +2797,12 @@ export default {
if (data.insuranceList.length > 0) {
data.insuranceList.forEach((item) => {
item.insuranceState = false; //设置可编辑状态
if (item.photoUrl) {
let arr = item.photoUrl.split("*");
item.fileList = [{ name: arr[0], url: arr[1] }];
} else {
item.fileList = [];
}
});
}
this.insuranceList = data.insuranceList; //保险
@ -2994,6 +3048,14 @@ export default {
file.file.data[0].fileInfo.originalFilename + "*" + file.file.data[0].imageUrl;
} else if (type == 6) {
this.workerInfo.idCardBigPhotoUrl = file.data[0].imageUrl;
} else if(type == 7){
let data = {
name: file.file.data[0].fileInfo.originalFilename,
url: file.file.data[0].imageUrl,
};
this.insuranceList[file.index].fileList = [data];
this.insuranceList[file.index].photoUrl =
file.file.data[0].fileInfo.originalFilename + "*" + file.file.data[0].imageUrl;
}
},
// 人员照片库比对
@ -3193,6 +3255,9 @@ export default {
} else if (type == 5) {
this.certificateList[file.index].fileList = [];
this.certificateList[file.index].photoUrl = "";
} else if (type == 7) {
this.insuranceList[file.index].fileList = [];
this.insuranceList[file.index].photoUrl = "";
}
},
@ -3330,6 +3395,7 @@ export default {
projectSn: this.$store.state.projectSn,
workerId: this.userId,
state: "",
fileList: [],
insuranceState: true,
};
this.insuranceList.push(data);
@ -3383,6 +3449,17 @@ export default {
if (this.isNew == true) {
this.insuranceList.splice(index, 1)
} else {
if (data.insuranceList.length > 0) {
data.insuranceList.forEach((item) => {
item.insuranceState = false; //设置可编辑状态
if (item.photoUrl) {
let arr = item.photoUrl.split("*");
item.fileList = [{ name: arr[0], url: arr[1] }];
} else {
item.fileList = [];
}
});
}
this.insuranceList[index].insuranceState = false;
}
} else if (type == 4) {

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

@ -365,7 +365,7 @@
<el-button v-permission="{key: 'rygl_refresh', menuPath: '/project/labor/personManage'}" type="warning" @click="refreshBtn" plain>{{
$t("message.laborMange.refresh")
}}</el-button>
<el-button v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{
<el-button title="按班组导出" v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{
$t("message.laborMange.export")
}}</el-button>
<el-button

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

@ -322,7 +322,7 @@
$t("message.laborMange.refresh")
}}</el-button>
<!-- 导出 -->
<el-button v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{
<el-button title="按班组导出" v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{
$t("message.laborMange.export")
}}</el-button>
<el-button

2
src/views/projectFront/laborManage/personModule/temporary.vue
View File

@ -59,7 +59,7 @@
plain
>{{ $t("message.laborMange.refresh") }}</el-button
>
<el-button v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{$t('message.laborMange.export')}}</el-button>
<el-button title="按班组导出" v-permission="{key: 'rygl_drive', menuPath: '/project/labor/personManage'}" type="primary" @click="exportFn">{{$t('message.laborMange.export')}}</el-button>
</el-form-item>
</el-form>
</div>

50
src/views/projectFront/laborManage/personRegisterDetails.vue
View File

@ -1556,7 +1556,7 @@
v-else
v-for="(item, index) in scope.row.fileList"
@click="
handlePreview({ url: item.url }, { name: item.name }, 4)
handlePreview({ url: item.url }, { name: item.name }, 5)
"
:key="index"
style="cursor: pointer"
@ -1924,6 +1924,54 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="address"
:label="$t('message.laborMange.accessory')"
>
<template slot-scope="scope">
<el-upload
v-if="scope.row.insuranceState"
class="upload-demo"
:action="uploadUrl"
:on-preview="(file) => handlePreview(file, 6)"
:on-remove="
(file) =>
handleRemove({ file: file, index: scope.$index }, 6)
"
:on-success="
(file) =>
handleSuccess({ file: file, index: scope.$index }, 6)
"
:limit="5"
name="files"
:file-list="scope.row.fileList"
>
<el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload')
}}</el-button>
</el-upload>
<div
v-else
v-for="(item, index) in scope.row.fileList"
@click="
handlePreview({ url: item.url }, { name: item.name }, 6)
"
:key="index"
style="cursor: pointer"
>
<el-tooltip
class="item"
effect="dark"
:content="item.name"
placement="top"
>
<div :class="item.name.length > 8 ? 'hide' : ''">
{{ item.name }}
</div>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column prop="address" label="">
<template slot-scope="scope">
<el-button

12
src/views/workSpace/index.vue
View File

@ -143,13 +143,13 @@ export default {
},
];
console.error("================发消息之前的userInfo==================")
console.error(this.$store.state.userInfo)
console.error("================发消息之前的userInfo==================")
// console.error("================发消息之前的userInfo==================")
// console.error(this.$store.state.userInfo)
// console.error("================发消息之前的userInfo==================")
console.error("================发消息之前的projectSn==================")
console.error(this.$store.state.projectSn)
console.error("================发消息之前的projectSn==================")
// console.error("================发消息之前的projectSn==================")
// console.error(this.$store.state.projectSn)
// console.error("================发消息之前的projectSn==================")
// let iframe = document.getElementById("myIframe");
let iframe = this.$refs.myIframeRef;