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

1

Browse Source
This commit is contained in:
X_Rian 2024-06-11 19:13:22 +08:00
parent 7b683e084f
commit d1085b7e02
4 changed files with 110 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,25 +169,25 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖 // axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址 // axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 axios.defaults.baseURL = 'http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // 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:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // 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://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/'//中科安信正式地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
} else if (process.env.NODE_ENV == "debug") { } else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com"; axios.defaults.baseURL = "https://www.ceshi.com";

2
src/components/videoModule/videoModule.vue
View File

@ -581,7 +581,7 @@ export default {
} }
let configInfo = localStorage.getItem('configInfo') let configInfo = localStorage.getItem('configInfo')
if (configInfo) { if (configInfo) {
configInfo = JSON.parse(configInfo) configInfo = configInfo && JSON.parse(configInfo)
if (configInfo.length < 0) { if (configInfo.length < 0) {
this.getProjectVideoConfigList() this.getProjectVideoConfigList()
} else { } else {

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

@ -34,7 +34,7 @@
>{{ $t("message.laborMange.cancel") }}</el-button >{{ $t("message.laborMange.cancel") }}</el-button
> >
</div> </div>
<div class="content_title flex3"> <div class="content_title flex3" style="position: relative;">
<div class="flex"> <div class="flex">
<div class="flex"> <div class="flex">
<div class="img_wrap" style="margin-right: 8px"> <div class="img_wrap" style="margin-right: 8px">
@ -157,6 +157,7 @@
</div> </div>
</div> </div>
<div id="workerQRcode" ref="workerQRcode"></div> <div id="workerQRcode" ref="workerQRcode"></div>
<!-- <el-button type="primary" size="medium" class="exportrecord" @click="exportRecord()">导出教育档案</el-button> -->
</div> </div>
<div id="details" class="table"> <div id="details" class="table">
<div class="pageTitle"> <div class="pageTitle">
@ -2511,6 +2512,16 @@ export default {
}); });
}, },
methods: { methods: {
exportRecord() {
// getExporExcelWorkerEducation({
// projectSn: this.projectSn,
// workerId: this.workerInfo.id,
// })
window.location.href =
this.$http.defaults.baseURL +
"xmgl/download/exporExcelWorkerEducation?projectSn=" +
this.projectSn + '&workerId=' + this.workerInfo.id;
},
scoreReset() { scoreReset() {
let requestData = { let requestData = {
id: this.workerInfo.id, id: this.workerInfo.id,
@ -3935,6 +3946,13 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.exportrecord {
position: absolute;
bottom: -40px;
right: 28px;
z-index: 999;
}
.flex { .flex {
display: flex; display: flex;
align-items: center; align-items: center;

148
src/views/projectFront/videoManage/ysyNew.vue
View File

@ -5,66 +5,32 @@
<div class="left" id="divPlugin"> <div class="left" id="divPlugin">
<div class="hello-ezuikit-js" ref="videoBox"> <div class="hello-ezuikit-js" ref="videoBox">
<!-- 最多9格 --> <!-- 最多9格 -->
<div <div v-for="item in 9" v-show="
v-for="item in 9" (select == 1 && selectVideoFirst == item) ||
v-show=" (select == 2 &&
(select == 1 && selectVideoFirst == item) || item >= selectVideoFirst &&
(select == 2 && item < selectVideoFirst + 4) ||
item >= selectVideoFirst && select == 3
item < selectVideoFirst + 4) || " :key="item" :class="select == 1 ? 'width' : select == 2 ? 'width2' : 'width3'" style="position: relative"
select == 3 @click="pieceClick(item)">
" <div :id="'video-cover' + item" class="video-cover" @click="btnStyle(item)"
:key="item" :class="{ 'btnCss': btnIndex == item }"></div>
:class="select == 1 ? 'width' : select == 2 ? 'width2' : 'width3'"
style="position: relative"
@click="pieceClick(item)"
>
<div
:id="'video-cover' + item"
class="video-cover"
@click="btnStyle(item)"
:class="{ 'btnCss': btnIndex == item }"
></div>
<div :id="'video-container' + item"></div> <div :id="'video-container' + item"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- 底部切屏按钮 --> <!-- 底部切屏按钮 -->
<div <div @click="select = 1" style="position: absolute; left: 0.875rem; top: 88.8vh; cursor: pointer">
@click="select = 1" <img class="rect" v-if="select == 1" src="@/assets/images/videoOne1.png" alt />
style="position: absolute; left: 0.875rem; top: 88.8vh; cursor: pointer"
>
<img
class="rect"
v-if="select == 1"
src="@/assets/images/videoOne1.png"
alt
/>
<img class="rect" v-else src="@/assets/images/videoOne.png" alt /> <img class="rect" v-else src="@/assets/images/videoOne.png" alt />
</div> </div>
<div <div @click="select = 2" style="position: absolute; left: 3.5rem; top: 88.8vh; cursor: pointer">
@click="select = 2" <img class="rect" v-if="select == 2" src="@/assets/images/videoTwo1.png" alt />
style="position: absolute; left: 3.5rem; top: 88.8vh; cursor: pointer"
>
<img
class="rect"
v-if="select == 2"
src="@/assets/images/videoTwo1.png"
alt
/>
<img class="rect" v-else src="@/assets/images/videoTwo.png" alt /> <img class="rect" v-else src="@/assets/images/videoTwo.png" alt />
</div> </div>
<div <div @click="select = 3" style="position: absolute; left: 6.5rem; top: 88.8vh; cursor: pointer">
@click="select = 3" <img class="rect" v-if="select == 3" src="@/assets/images/videoThree1.png" alt />
style="position: absolute; left: 6.5rem; top: 88.8vh; cursor: pointer"
>
<img
class="rect"
v-if="select == 3"
src="@/assets/images/videoThree1.png"
alt
/>
<img class="rect" v-else src="@/assets/images/videoThree.png" alt /> <img class="rect" v-else src="@/assets/images/videoThree.png" alt />
</div> </div>
</div> </div>
@ -91,20 +57,24 @@ export default {
demoList: [], demoList: [],
indextest: 0, indextest: 0,
btnIndex: 0, btnIndex: 0,
devs:[] devs: []
} }
}, },
created() { }, created() { },
mounted() { mounted() {
//向父组件取的数据 //向父组件取的数据
// this.devs = this.$props.ysyParams;
this.devList = this.$props.ysyParams this.devList = this.$props.ysyParams
console.log('this.$props.ysyParams', this.$props.ysyParams) console.log('this.$props.ysyParams', this.$props.ysyParams)
this.ysyBtn(this.devList, this.indextest, this.select) this.ysyBtn(this.devList, this.indextest, this.select)
}, },
watch: { watch: {
ysyParams: function (a, b) { ysyParams: function (a, b) {
console.log('父组件传递的数据 ysyParams :', a) console.log('父组件传递的数据 ysyParams :', a, b)
console.log('父组件传递的数据 this.devList :', this.devList) console.log('父组件传递的数据 this.devList :', this.devList)
//向父组件取的数据
this.devList = this.$props.ysyParams;
console.log('this.$props.ysyParams', this.$props.ysyParams)
if (this.select == 1) { if (this.select == 1) {
var index = this.devList.findIndex((item) => item.url == a[0].url) var index = this.devList.findIndex((item) => item.url == a[0].url)
@ -112,12 +82,15 @@ export default {
} else { } else {
var index = this.devList.findIndex((item) => item.url == a[0].url) var index = this.devList.findIndex((item) => item.url == a[0].url)
this.devsob = [] this.devsob = []
console.log(this.devList, index);
let ob = JSON.parse(JSON.stringify(this.devList[index])); let ob = JSON.parse(JSON.stringify(this.devList[index]));
this.devsob.push(ob) this.devsob.push(ob)
// this.devList.push(this.devList[index]) // this.devList.push(this.devList[index])
console.log('块的点击事件1：', this.devList) console.log('块的点击事件1：', this.devList)
this.ysyBtn(this.devsob, this.indextest, this.select) this.ysyBtn(this.devsob, this.indextest, this.select, true)
this.devs.push(this.devsob[0]) // this.devs.push(this.devsob[0])
// this.devList.push(this.devsob[0])
// this.ysyBtn(this.devList, this.indextest, this.select)
} }
// this.select = 1 // this.select = 1
@ -132,11 +105,14 @@ export default {
}, },
select: function (value, b) { select: function (value, b) {
this.indextest = 0 this.indextest = 0
console.log('选择显示video数量 :', this.devs) console.log('选择显示video数量 :', this.devs, value, this.devList)
this.select = value this.select = value
this.selectVideoFirst = 1 this.selectVideoFirst = 1
// this.devList = [];
// this.devs = [];
// return
this.devList.forEach((item, index) => { this.devList.forEach((item, index) => {
console.log('item数据', item); console.log('item数据', item, this.$refs.videoBox.offsetWidth);
// item.player.stop() // item.player.stop()
if (value == 1) { if (value == 1) {
item.player.reSize( item.player.reSize(
@ -198,30 +174,47 @@ export default {
// this.ysyBtn(devs,item+1,this.select) // this.ysyBtn(devs,item+1,this.select)
}, },
// 视频播放数据 视频容器id（所在窗口） 当前窗口是几分屏（1、4、9） // 视频播放数据 视频容器id（所在窗口） 当前窗口是几分屏（1、4、9）
ysyBtn(item, indeBtn, selectIndex) { ysyBtn(item, indeBtn, selectIndex, flag) {
console.log("11111111111", item, indeBtn, selectIndex, this.devs, this.devList);
console.log(this.devs, indeBtn - 1);
item.forEach((item2, index) => { item = item.map((item2, index) => {
// if(item2.player) return item;
let container; let container;
console.log('块的点击事件3：', indeBtn) console.log('块的点击事件3：', indeBtn)
if (indeBtn == 0) { if (indeBtn == 0) {
container = `video-container${index + 1}`; container = `video-container${index + 1}`;
} else { } else {
container = `video-container${indeBtn}`; container = `video-container${indeBtn}`;
} }
console.log('item :', item2 + 'index', index) console.log('item :', item2 + 'index', index)
var player = new EZUIKit.EZUIKitPlayer({ var player = new EZUIKit.EZUIKitPlayer({
autoplay: true, autoplay: true,
audio: '0', audio: '0',
id: container, // 视频容器ID id: container, // 视频容器ID
accessToken: item2.token, accessToken: item2.token,
url: item2.url, // 初始化写死一个离线或者找不到的设备，避免初始化无法创建播放器； url: item2.url, // 初始化写死一个离线或者找不到的设备，避免初始化无法创建播放器；
template: 'simple', template: 'simple',
width: this.$refs.videoBox.offsetWidth / selectIndex, width: this.$refs.videoBox.offsetWidth / selectIndex,
height: this.$refs.videoBox.offsetHeight / selectIndex height: this.$refs.videoBox.offsetHeight / selectIndex
}) })
item2.player = player item2.player = player
return item2;
}) })
console.log('item 完:', item ) if (flag) {
// console.log("444444444444444444", this.devs[indeBtn - 1] && this.devs[indeBtn - 1].itemId);
// if (this.devs[indeBtn - 1] && this.devs[indeBtn - 1].itemId) {
// this.devs.splice(indeBtn - 1, 1, item[0])
// } else {
// }
this.devs.push(item[0]);
console.log(this.devs);
this.devList = this.devs;
} else {
this.devs = this.devList;
}
console.log('item 完:', item)
} }
} }
} }
@ -512,6 +505,7 @@ export default {
.videoItem.active { .videoItem.active {
background: #fff !important; background: #fff !important;
} }
.btnCss { .btnCss {
border: 2px solid orange; border: 2px solid orange;
} }