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

flx：修复

Browse Source
This commit is contained in:
Rain_ 2025-12-02 11:29:07 +08:00
parent 420197914a
commit ece3213618
9 changed files with 143 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debug.log
View File

@ -29,3 +29,7 @@
[1022/140627.514:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) [1022/140627.514:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[1022/140628.205:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) [1022/140628.205:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[1022/140628.872:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2) [1022/140628.872:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[1201/183600.144:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[1201/183600.190:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[1201/183601.414:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[1201/183602.811:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)

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

@ -181,7 +181,7 @@ if (process.env.NODE_ENV == "development") {
// 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:28890/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
// 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.221:19112/"; //郭圣雄本地 axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
// 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/' //彭洁远程

5
src/pages/index/index.js
View File

@ -326,6 +326,8 @@ Vue.directive('permission', {
const { value } = binding; const { value } = binding;
// 判断当前用户是否拥有该按钮权限 // 判断当前用户是否拥有该按钮权限
if (!Vue.prototype.checkPermission(value)) { if (!Vue.prototype.checkPermission(value)) {
console.log('权限：', el.parentNode)
el.parentNode.removeChild(el); el.parentNode.removeChild(el);
} }
} }
@ -337,13 +339,14 @@ Vue.prototype.checkPermission = function(permission) {
permissions = permissions.filter( permissions = permissions.filter(
(x) => x.path == permission.menuPath (x) => x.path == permission.menuPath
)[0]; )[0];
// console.log('权限', permissions) console.log('权限', permissions)
if (!permissions || !permissions.actionList) { if (!permissions || !permissions.actionList) {
return false; return false;
} }
let index = permissions.actionList.findIndex( let index = permissions.actionList.findIndex(
(x) => x.actionCode == permission.key (x) => x.actionCode == permission.key
) )
console.log('index', index != -1, permission.key)
return index != -1 ? true : false; return index != -1 ? true : false;
} }
// 加载缩略图 // 加载缩略图

12
src/store/index.js
View File

@ -94,10 +94,10 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
// FILEURL: 'http://42.180.188.17:11211/image/', //测试 // FILEURL: 'http://42.180.188.17:11211/image/', //测试
// BASEURL: baseUrl ? BASEURL: baseUrl ?
// baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/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', //鞍钢平台工作流地址
@ -108,8 +108,8 @@ export default new Vuex.Store({
// UPLOADURL: 'http://gszhdz.crpower.com.cn:9809/upload/image', //敦煌线上 // UPLOADURL: 'http://gszhdz.crpower.com.cn:9809/upload/image', //敦煌线上
// FILEURL: 'http://gszhdz.crpower.com.cn:9809/image/', //敦煌线上 // FILEURL: 'http://gszhdz.crpower.com.cn:9809/image/', //敦煌线上
UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地 // UPLOADURL: 'http://192.168.34.221:8111/upload/image', //演示平台 雄本地
FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地 // FILEURL: 'http://192.168.34.221:8111/image/', //演示平台 雄本地
// UPLOADURL: 'http://jxj.zhgdyun.com:100/upload/image', //演示平台 // UPLOADURL: 'http://jxj.zhgdyun.com:100/upload/image', //演示平台
// FILEURL: 'http://jxj.zhgdyun.com:100/image/', //演示平台 // FILEURL: 'http://jxj.zhgdyun.com:100/image/', //演示平台

8
src/views/companyAdmin/companyBigScreen/highRiskOperation/homeworkControlProcess.vue
View File

@ -237,12 +237,12 @@
{{ workTicketDetail.applicationTime }} {{ workTicketDetail.applicationTime }}
</div> </div>
</div> </div>
<div class="box1"> <!-- <div class="box1">
<div>安全措施</div> <div>安全措施</div>
<div> <div>
{{ workTicketDetail.safetyMeasure }} {{ workTicketDetail.safetyMeasure }}
</div> </div>
</div> </div> -->
<div class="box1"> <div class="box1">
<div>作业内容</div> <div>作业内容</div>
<div> <div>
@ -674,7 +674,7 @@
}} }}
</div> </div>
</div> </div>
<div> <!-- <div>
<div>安全措施</div> <div>安全措施</div>
<div> <div>
{{ {{
@ -683,7 +683,7 @@
: "--" : "--"
}} }}
</div> </div>
</div> </div> -->
<div> <div>
<div>作业内容</div> <div>作业内容</div>
<div> <div>

8
src/views/companyAdmin/companyBigScreen/terminalOperation/homeworkControlProcess.vue
View File

@ -252,12 +252,12 @@
{{ workTicketDetail.applicationTime }} {{ workTicketDetail.applicationTime }}
</div> </div>
</div> </div>
<div class="box1"> <!-- <div class="box1">
<div>安全措施</div> <div>安全措施</div>
<div> <div>
{{ workTicketDetail.safetyMeasure }} {{ workTicketDetail.safetyMeasure }}
</div> </div>
</div> </div> -->
<div class="box1"> <div class="box1">
<div>作业内容</div> <div>作业内容</div>
<div> <div>
@ -689,7 +689,7 @@
}} }}
</div> </div>
</div> </div>
<div> <!-- <div>
<div>安全措施</div> <div>安全措施</div>
<div> <div>
{{ {{
@ -698,7 +698,7 @@
: "--" : "--"
}} }}
</div> </div>
</div> </div> -->
<div> <div>
<div>作业内容</div> <div>作业内容</div>
<div> <div>

102
src/views/companyAdmin/companyBigScreen/videoSurveillance/areaTree.vue
View File

@ -33,11 +33,11 @@
<div class="bg-icon" @click="onRefresh"> <div class="bg-icon" @click="onRefresh">
<div class="refresh-icon"></div> <div class="refresh-icon"></div>
</div> </div>
<div class="bg-icon" @click="onExpand">
<div <div
class="bg-icon" class="shrink-icon"
@click="onExpand" :class="{ 'shrink-icon_active': this.defaultExpand }"
> ></div>
<div class="shrink-icon" :class="{ 'shrink-icon_active': this.defaultExpand }"></div>
</div> </div>
</div> </div>
</div> </div>
@ -85,12 +85,12 @@
> >
</span> </span>
<span <span
:class=" :class="{
{'videoName' : data.videoName, videoName: data.videoName,
'projectName' : data.projectName, projectName: data.projectName,
'companyName2' : data.companyType == 2, companyName2: data.companyType == 2,
'color-01' : data.videoItem && data.videoItem.deviceState == 1} 'color-01': data.videoItem && data.videoItem.deviceState == 1,
" }"
:title="node.label" :title="node.label"
>{{ node.label }} >{{ node.label }}
<span v-if="data.children.length > 0"> <span v-if="data.children.length > 0">
@ -109,11 +109,7 @@
v-show="data.projectNum && videoType == 0" v-show="data.projectNum && videoType == 0"
>{{ data.projectNum }}</span >{{ data.projectNum }}</span
> --> > -->
<el-tooltip <el-tooltip effect="dark" content="播放项目所有视频" placement="top">
effect="dark"
content="播放项目所有视频"
placement="top"
>
<!-- data.type == 'project' && --> <!-- data.type == 'project' && -->
<span <span
class="playAllBtn" class="playAllBtn"
@ -246,8 +242,7 @@ export default {
//查询项目各类型的视频配置信息 //查询项目各类型的视频配置信息
getProjectVideoConfigList(dataItem, type, itemList) { getProjectVideoConfigList(dataItem, type, itemList) {
projectVideoConfigListApi({ projectVideoConfigListApi({
projectSn: projectSn: this.$store.state.projectSn || dataItem.sn || dataItem.projectSn,
this.$store.state.projectSn || dataItem.sn || dataItem.projectSn,
}).then((res) => { }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log(res.result, "resresresres"); console.log(res.result, "resresresres");
@ -537,11 +532,7 @@ export default {
}, },
playMutipleVideo(data) { playMutipleVideo(data) {
this.videoInfo = data.allvideolist[0]; this.videoInfo = data.allvideolist[0];
this.getProjectVideoConfigList( this.getProjectVideoConfigList(data.allvideolist[0], "all", data.allvideolist);
data.allvideolist[0],
"all",
data.allvideolist
);
}, },
filterNode(value, data) { filterNode(value, data) {
this.defaultExpand = true; this.defaultExpand = true;
@ -549,30 +540,34 @@ export default {
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
recursion(array) { recursion(array) {
return array.map((item) => { return array
if ( .map((item) => {
item.children && if (item.children && Array.isArray(item.children) && item.children.length > 0) {
Array.isArray(item.children) &&
item.children.length > 0
) {
item.children = this.recursion(item.children); item.children = this.recursion(item.children);
if (item.children.length > 0) { if (item.children.length > 0) {
return item; return item;
} }
return return;
} }
console.log(item.deviceState, this.searchInfo.deviceState); console.log(888444, item);
if (item.type == "video") { if (item.type == "video") {
if(item.videoItem && item.videoItem.deviceState == this.searchInfo.deviceState) { if (
item.videoItem &&
item.videoItem.deviceState == this.searchInfo.deviceState
) {
return item; return item;
} }
return return;
} }
return item; return item;
}).filter(item => item != undefined); })
.filter((item) => item != undefined)
.filter((item) => (item.type != "video" ? item.children.length > 0 : true));
}, },
}, },
computed: { computed: {
// 计算树形数据的总数、在线数和离线数
// type: 1-总数 2-在线数 3-离线数
filterTreeDataTotal() { filterTreeDataTotal() {
return (type) => { return (type) => {
if (type == 1) { if (type == 1) {
@ -599,11 +594,7 @@ export default {
const dataList = structuredClone(this.treeData); const dataList = structuredClone(this.treeData);
return dataList.map((item) => { return dataList.map((item) => {
let children = []; let children = [];
if ( if (item.children && Array.isArray(item.children) && item.children.length > 0) {
item.children &&
Array.isArray(item.children) &&
item.children.length > 0
) {
children = this.recursion(item.children); children = this.recursion(item.children);
} }
return { return {
@ -632,7 +623,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.color-01 { .color-01 {
color: #01FFF0 !important; color: #01fff0 !important;
} }
.header-search { .header-search {
padding: 10px 15px; padding: 10px 15px;
@ -715,12 +706,7 @@ export default {
background: linear-gradient(180deg, #082a68 0%, #001e53 100%); background: linear-gradient(180deg, #082a68 0%, #001e53 100%);
border-radius: 0px 0px 0px 0px; border-radius: 0px 0px 0px 0px;
border: 4px solid; border: 4px solid;
border-image: linear-gradient( border-image: linear-gradient(150deg, rgba(0, 255, 240, 0.7), rgba(0, 255, 240, 0)) 4 4;
150deg,
rgba(0, 255, 240, 0.7),
rgba(0, 255, 240, 0)
)
4 4;
} }
.header-box { .header-box {
background-image: url("~@/assets/images/videoSurveillance/header-bg2.png"); background-image: url("~@/assets/images/videoSurveillance/header-bg2.png");
@ -875,11 +861,10 @@ export default {
color: #5181f6; color: #5181f6;
// font-weight: bold; // font-weight: bold;
.icon-video { .icon-video {
background: url("~@/assets/images/icon-video-blue.png") center center background: url("~@/assets/images/icon-video-blue.png") center center no-repeat;
no-repeat;
&.icon-video2 { &.icon-video2 {
background: url("~@/assets/images/icon-video2-blue.png") center background: url("~@/assets/images/icon-video2-blue.png") center center
center no-repeat; no-repeat;
} }
} }
} }
@ -1033,19 +1018,19 @@ export default {
color: #5181f6; color: #5181f6;
// font-weight: bold; // font-weight: bold;
.icon-video { .icon-video {
background: url("~@/assets/images/longguang/icon-video-blue.png") center background: url("~@/assets/images/longguang/icon-video-blue.png") center center
center no-repeat !important; no-repeat !important;
&.icon-video2 { &.icon-video2 {
background: url("~@/assets/images/longguang/icon-video2-blue.png") background: url("~@/assets/images/longguang/icon-video2-blue.png") center center
center center no-repeat !important; no-repeat !important;
} }
} }
} }
} }
.playAllBtn { .playAllBtn {
&:hover { &:hover {
background: url("~@/assets/images/longguang/icon-watch-video.png") center background: url("~@/assets/images/longguang/icon-watch-video.png") center center
center no-repeat !important; no-repeat !important;
} }
} }
} }
@ -1090,13 +1075,11 @@ export default {
} }
} }
.icon-video { .icon-video {
background: url("~@/assets/images/icon-video-white.png") center center background: url("~@/assets/images/icon-video-white.png") center center no-repeat;
no-repeat;
// background-size: 14px auto ; // background-size: 14px auto ;
vertical-align: top; vertical-align: top;
&.icon-video2 { &.icon-video2 {
background: url("~@/assets/images/icon-video2.png") center center background: url("~@/assets/images/icon-video2.png") center center no-repeat;
no-repeat;
} }
} }
.projectName:hover { .projectName:hover {
@ -1129,4 +1112,3 @@ export default {
} }
} }
</style> </style>

59
src/views/projectFront/bodyWornCamera/equipmentMonitor.vue
View File

@ -88,48 +88,55 @@
</div> </div>
</div> </div>
<div class="rightPanel whiteBlock"> <div class="rightPanel whiteBlock">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-menu
<el-tab-pane :default-active="activeName"
@select="handleClick"
class="business-menu-demo"
mode="horizontal"
text-color="#262D47"
active-text-color="#5181F6"
>
<el-menu-item
v-permission="{ v-permission="{
key: 'equipmentMonitor', key: 'equipmentMonitor',
menuPath: '/project/bodyWornCamera/equipmentMonitor', menuPath: '/project/bodyWornCamera/equipmentMonitor',
}" }"
label="设备监测" index="first"
name="first" >设备监测</el-menu-item
></el-tab-pane> >
<el-tab-pane <el-menu-item
v-permission="{ v-permission="{
key: 'videoCenter', key: 'videoCenter',
menuPath: '/project/bodyWornCamera/equipmentMonitor', menuPath: '/project/bodyWornCamera/equipmentMonitor',
}" }"
label="录像中心" index="second"
name="second" >录像中心</el-menu-item
></el-tab-pane> >
<el-tab-pane <el-menu-item
v-permission="{ v-permission="{
key: 'imageCenter', key: 'imageCenter',
menuPath: '/project/bodyWornCamera/equipmentMonitor', menuPath: '/project/bodyWornCamera/equipmentMonitor',
}" }"
label="图片中心" index="third"
name="third" >图片中心</el-menu-item
></el-tab-pane> >
<el-tab-pane <el-menu-item
v-permission="{ v-permission="{
key: 'audioCenter', key: 'audioCenter',
menuPath: '/project/bodyWornCamera/equipmentMonitor', menuPath: '/project/bodyWornCamera/equipmentMonitor',
}" }"
label="音频中心" index="fourth"
name="fourth" >音频中心</el-menu-item
></el-tab-pane> >
<el-tab-pane <el-menu-item
v-permission="{ v-permission="{
key: 'workingHour', key: 'workingHour',
menuPath: '/project/bodyWornCamera/equipmentMonitor', menuPath: '/project/bodyWornCamera/equipmentMonitor',
}" }"
label="工作时长统计" index="fifth"
name="fifth" >工作时长统计</el-menu-item
></el-tab-pane> >
</el-tabs> </el-menu>
<div class="equipment_detail" v-if="activeName == 'first'"> <div class="equipment_detail" v-if="activeName == 'first'">
<div> <div>
<div class="equipment_box"> <div class="equipment_box">
@ -663,6 +670,7 @@ export default {
}, },
handleClick(tab, event) { handleClick(tab, event) {
console.log(tab, event); console.log(tab, event);
this.activeName = tab;
this.pageInfo.pageNo = 1; this.pageInfo.pageNo = 1;
if (this.activeName == "fourth") { if (this.activeName == "fourth") {
this.pageInfo.pageSize = 28; this.pageInfo.pageSize = 28;
@ -1891,6 +1899,13 @@ export default {
padding: 10px 15px 20px; padding: 10px 15px 20px;
height: calc(100% - 30px); height: calc(100% - 30px);
position: relative; position: relative;
/deep/ .el-menu {
margin-bottom: 20px;
.el-menu-item {
height: 40px;
line-height: 40px;
}
}
.rightPanel_title { .rightPanel_title {
height: calc(38px + 36px + 22px); height: calc(38px + 36px + 22px);
} }

2
src/views/projectFront/workTicketManage/homeworkControlProcess.vue
View File

@ -1941,7 +1941,7 @@ export default {
setWorkTicketOperateWorkTicketApi(data).then((res) => { setWorkTicketOperateWorkTicketApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if (res.result && res.result.code == 1) { if (res.result && res.result.code == 1) {
this.$alert(res.result.message, "", { this.$alert(res.result.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
callback: (action) => {}, callback: (action) => {},
}); });