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

修改质量安全 视频列表

Browse Source
This commit is contained in:
X_Rian 2024-06-12 14:57:29 +08:00
parent 3c9a91b10d
commit a6dece2a07
8 changed files with 127 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.js
View File

@ -47,8 +47,8 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // 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://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17: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:19097' // 工作流测试地址
Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址 // Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址 // Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
@ -93,7 +93,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://10.168.1.104: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://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17: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://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 // 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://47.93.215.234:19997' // 工作流线上地址（弃用）
@ -133,7 +133,7 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 // 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://jxj.zhgdyun.com:30250/#/'// 演示平台H5
// Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段 // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段
// Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信 Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信
} }
Vue.prototype.$formatDates = formatDates; Vue.prototype.$formatDates = formatDates;

25
pages/projectEnd/qualityManage/editIssue.vue
View File

@ -571,7 +571,7 @@
this.getCheckPointList(); this.getCheckPointList();
this.getIssueList(); this.getIssueList();
this.getPersonList(); this.getPersonList();
this.getReviewPeopleList();
// this.getPersonUpdateList(); // this.getPersonUpdateList();
this.getProgressListData() this.getProgressListData()
console.log('lll', option.taskId, option.itemId) console.log('lll', option.taskId, option.itemId)
@ -581,8 +581,15 @@
this.form.itemId = option.itemId this.form.itemId = option.itemId
console.log(dateformat(new Date()), 777888) console.log(dateformat(new Date()), 777888)
}, },
watch: {
"form.regionId": {
// immediate: true,
handler(nVal) {
this.getReviewPeopleList();
// console.log("22222222222", this.reviewList)
}
}
},
methods: { methods: {
//获取基本信息 //获取基本信息
getBasicInfo() { getBasicInfo() {
@ -646,12 +653,22 @@
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionId,
qualityRegionBindType: 2,
isSupervisingRoleName: 1
}, },
success: res => { success: res => {
console.log(res.result) console.log(res.result)
if (res.result.length > 0) { if (res.result.length > 0) {
this.reviewList = res.result; this.reviewList = res.result;
// 复查人数据拿取
this.reviewList.forEach((item, index) => {
// console.log("11111111", item.userId,this.form.reviewId)
if (item.userId == this.form.reviewId) {
this.reviewIndex = index
}
});
} else { } else {
this.reviewList = []; this.reviewList = [];
} }

29
pages/projectEnd/qualityManage/list.vue
View File

@ -60,7 +60,7 @@
<!-- 筛选条件弹框 --> <!-- 筛选条件弹框 -->
<uni-popup class="screenDialog" ref="screenShow" :show="popupShow"> <uni-popup class="screenDialog" ref="screenShow" :maskClick="true" @change="closeMenu" :show="popupShow">
<view class="screenContent"> <view class="screenContent">
<scroll-view style="height: 100%;" scroll-y> <scroll-view style="height: 100%;" scroll-y>
@ -403,6 +403,14 @@
} }
}, },
closeMenu(e) {
console.log("关闭！！！！",e)
if(e.show == false){
// this.$refs.screenShow.close()
this.popupShow = false;
// this.resettingBtn()
}
},
//关闭筛选 //关闭筛选
closeBtn() { closeBtn() {
this.$refs.screenShow.close() this.$refs.screenShow.close()
@ -736,7 +744,9 @@
type: 9, type: 9,
value: -1 value: -1
} }
this.searchItem(userInfo, 1) if (this.inspectStartTime && this.inspectEndTime) {
this.searchItem(userInfo, 1)
}
}, },
//筛选结束时间 //筛选结束时间
@ -748,7 +758,9 @@
type: 10, type: 10,
value: -1 value: -1
} }
this.searchItem(userInfo, 1) if (this.inspectStartTime && this.inspectEndTime) {
this.searchItem(userInfo, 1)
}
}, },
//点击打开筛选 //点击打开筛选
screenData() { screenData() {
@ -1025,16 +1037,19 @@
.screenContent { .screenContent {
width: 100vw; width: 100vw;
height: 100%; height: 70%;
// width: 90%; // width: 90%;
// margin: -65% 0%; // margin: -65% 0%;
overflow: scroll; overflow: scroll;
position: relative; // position: relative;
// margin-top: 180%; // margin-top: 180%;
border-radius: 20px 20px 0 0; border-radius: 20px 20px 0 0;
// margin-left: -4%; // margin-left: -4%;
background-color: white; background-color: white;
padding-left: 10%; padding-left: 10%;
position: fixed;
left: 0;
bottom: 0;
.titleItem { .titleItem {
font-size: 14px; font-size: 14px;
@ -1209,7 +1224,7 @@
.content { .content {
padding: 0px 30rpx 0; padding: 0px 30rpx 0;
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100vw;
} }
.item { .item {
@ -1320,6 +1335,6 @@
.popupShow { .popupShow {
overflow: hidden; overflow: hidden;
// position: fixed; position: fixed;
} }
</style> </style>

42
pages/projectEnd/safeSame/list.vue
View File

@ -61,7 +61,7 @@
<!-- 筛选条件弹框 --> <!-- 筛选条件弹框 -->
<uni-popup class="screenDialog" ref="screenShow" :show="popupShow"> <uni-popup class="screenDialog" ref="screenShow" :maskClick="true" @change="closeMenu" :show="popupShow">
<view class="screenContent"> <view class="screenContent">
<scroll-view style="height: 100%;" scroll-y> <scroll-view style="height: 100%;" scroll-y>
@ -366,8 +366,6 @@
chekItm6: '', chekItm6: '',
chekItm7: '', chekItm7: '',
chekItm8: '', chekItm8: '',
} }
}, },
onLoad(option) { onLoad(option) {
@ -404,6 +402,14 @@
} }
}, },
closeMenu(e) {
console.log("关闭！！！！",e)
if(e.show == false){
// this.$refs.screenShow.close()
this.popupShow = false;
// this.resettingBtn()
}
},
//关闭筛选 //关闭筛选
closeBtn() { closeBtn() {
this.$refs.screenShow.close() this.$refs.screenShow.close()
@ -737,7 +743,10 @@
type: 9, type: 9,
value: -1 value: -1
} }
this.searchItem(userInfo, 1) if (this.inspectStartTime && this.inspectEndTime) {
this.searchItem(userInfo, 1)
}
}, },
//筛选结束时间 //筛选结束时间
@ -749,7 +758,9 @@
type: 10, type: 10,
value: -1 value: -1
} }
this.searchItem(userInfo, 1) if (this.inspectStartTime && this.inspectEndTime) {
this.searchItem(userInfo, 1)
}
}, },
//点击打开筛选 //点击打开筛选
screenData() { screenData() {
@ -971,17 +982,18 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.fixedheader {
.fixedheader{
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
z-index: 2; z-index: 2;
.headerName{
.headerName {
z-index: 1; z-index: 1;
} }
} }
.line { .line {
width: 100%; width: 100%;
height: 1px; height: 1px;
@ -989,6 +1001,11 @@
margin-top: 3%; margin-top: 3%;
} }
.popupShow {
overflow: hidden;
position: fixed;
}
.screenDialog { .screenDialog {
position: absolute; position: absolute;
// top: 11%; // top: 11%;
@ -1027,16 +1044,19 @@
.screenContent { .screenContent {
width: 100vw; width: 100vw;
height: 100%; height: 70%;
// width: 90%; // width: 90%;
// margin: -65% 0%; // margin: -65% 0%;
overflow: scroll; overflow: scroll;
position: relative; // position: relative;
// margin-top: 180%; // margin-top: 180%;
border-radius: 20px 20px 0 0; border-radius: 20px 20px 0 0;
// margin-left: -4%; // margin-left: -4%;
background-color: white; background-color: white;
padding-left: 10%; padding-left: 10%;
position: fixed;
left: 0;
bottom: 0;
.titleItem { .titleItem {
font-size: 14px; font-size: 14px;
@ -1322,6 +1342,6 @@
.popupShow { .popupShow {
overflow: hidden; overflow: hidden;
// position: fixed; position: fixed;
} }
</style> </style>

6
pages/videoManage/videoGroup.vue
View File

@ -5,7 +5,7 @@
视频播放列表 视频播放列表
</view> </view>
</headers> </headers>
<view class="content-part" style="padding-top: 45px;"> <view class="content-part" :style="{ 'padding-top': statusBarHeight + 45 + 'px' }">
<tree-menu v-for="(item,index) in treeData" :key="item.id" :item="item" :treeIndex="treeIndex" @clickItem="clickTreeItem"></tree-menu> <tree-menu v-for="(item,index) in treeData" :key="item.id" :item="item" :treeIndex="treeIndex" @clickItem="clickTreeItem"></tree-menu>
</view> </view>
<levitatedsphere :x="100" :y="80"></levitatedsphere> <levitatedsphere :x="100" :y="80"></levitatedsphere>
@ -24,10 +24,12 @@
return { return {
treeIndex: 1, // 树形层级index treeIndex: 1, // 树形层级index
treeData: [], treeData: [],
projectSn: "" projectSn: "",
statusBarHeight: 0,
} }
}, },
onLoad() { onLoad() {
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn; this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
this.getVideoGroup(); this.getVideoGroup();
}, },

4
pages/videoManage/videoList.vue
View File

@ -6,7 +6,7 @@
视频播放列表 视频播放列表
</view> </view>
</headers> </headers>
<view class="videoBox" style="padding-top: 50px;" v-if="videoList.length>0"> <view class="videoBox" :style="{ 'padding-top': statusBarHeight + 50 + 'px' }" v-if="videoList.length>0">
<view class="videoItem" v-for="(item,index) in videoList" :key="index" @click="playVideoFn(item)"> <view class="videoItem" v-for="(item,index) in videoList" :key="index" @click="playVideoFn(item)">
<image v-if="item.coverUrl" class="videoPoster" :src="item.coverUrl" mode="aspectFill"></image> <image v-if="item.coverUrl" class="videoPoster" :src="item.coverUrl" mode="aspectFill"></image>
<view v-else class="videoPoster"> <view v-else class="videoPoster">
@ -42,9 +42,11 @@
groupInfo: {}, groupInfo: {},
projectSn: "", projectSn: "",
videoConfig:{}, videoConfig:{},
statusBarHeight: 0,
}; };
}, },
onLoad(options) { onLoad(options) {
this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
if (options.pageType) { if (options.pageType) {
this.pageType = options.pageType this.pageType = options.pageType
} }

42
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

18
unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long