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-09-30 18:38:40 +08:00
parent dc520acfc2
commit dfc51c3e59
8 changed files with 128 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debug.log
View File

@ -1,2 +1,7 @@
[0524/103228.221:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[0530/171244.522:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[0929/142712.385:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[0929/142712.471:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[0929/142712.525:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[0929/142714.949:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)
[0929/142715.640:ERROR:registration_protocol_win.cc(108)] CreateFile: 系统找不到指定的文件。 (0x2)

BIN
src/assets/images/iscImage/text-to-image.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 89 KiB

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

@ -208,7 +208,8 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = "http://139.9.66.234:20628";
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:9500";
// axios.defaults.baseURL = "http://jxj.zhgdyun.com:21000"; // 潮州
// axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 潮州
axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/";
// axios.defaults.baseURL = "http://gszhdz.crpower.com.cn:9809/"; // 潮州
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";
} else if (process.env.NODE_ENV == "production") {

40
src/components/videoModule/isc_plugin/isc_plugin_h5.vue
View File

@ -139,18 +139,22 @@ export default {
this.play(item, this.iWndIndex);
} else if (a.length == 1) {
this.play(item, this.iWndIndex);
this.devH5List.push(item);
this.devH5List.push({
...item,
eIndex: this.devH5List.length
});
} else {
this.play(item, index);
}
});
if(a.length > 1) {
this.devH5List = a;
if (a.length > 1) {
this.devH5List = a.map((item, index) => ({ ...item, eIndex: index }));
}
},
},
mounted() {
this.devH5List = this.devList;
this.devH5List = this.devList.map((item, index) => ({ ...item, eIndex: index }));;
console.log("我进来了", this.devList);
// 页面加载初始化`
this.initPlayer();
@ -196,7 +200,7 @@ export default {
if (controls) {
controls.classList.remove("video-controls_flex");
}
if(type == "delete") return;
if (type == "delete") return;
this.devH5List.splice(currentWindowIndex - 1, 1);
}
},
@ -361,9 +365,9 @@ export default {
//插件错误回调
console.log("pluginError callback: ", iWndIndex, iErrorCode, oError);
},
windowEventOver: function (iWndIndex) {
windowEventOver: function (iWndIndex, iEventType, iMouseX, iMouseY) {
//鼠标移过回调
console.log(iWndIndex);
console.log(iWndIndex, iEventType);
// 使用选中事件来定位控制按钮
const wnd = document.querySelector(
`#player #player-container-${iWndIndex}`
@ -382,9 +386,13 @@ export default {
}
}
if (controls) {
console.log(888777, iWndIndex, _this.devH5List.length - 1);
if (iWndIndex > _this.devH5List.length - 1) return;
controls.classList.add("video-controls_flex");
// console.log(888777, iWndIndex, _this.devH5List);
// const findIndex = _this.devH5List.findIndex(item => item.eIndex === iWndIndex);
// if (findIndex == -1) return;
const player_playVideo = wnd.querySelector(`#player_playVideo${iWndIndex}`)
if(player_playVideo.src) {
controls.classList.add("video-controls_flex");
}
}
}
},
@ -470,7 +478,7 @@ export default {
const param = {
cameraIndexCode: tempCode,
streamType: row.defaultStreamType == 2 ? 0 : row.defaultStreamType,
type: "ws",
type: window.location.protocol.includes("https") ? "wss" : "ws",
transmode: 1,
itemId: row.itemId,
};
@ -549,6 +557,16 @@ export default {
// _this.stopPlay(index);
}
);
_this.player.JS_SetConnectTimeOut(index, 60).then(
() => {
console.info("JS_SetConnectTimeOut success");
// do you want...
},
(err) => {
console.info("JS_SetConnectTimeOut failed", err);
// do you want...
}
);
});
},
/**

104
src/views/projectAdmin/projectList.vue
View File

@ -306,62 +306,82 @@ export default {
// 获取一二级下拉
getLayerCompany() {
let data = {
sn: this.userInfo.headquartersSn,
// sn: this.userInfo.headquartersSn,
sn: this.userInfo.sn,
videoType: 0,
};
getComapnyStatisticsListApi(data).then((res) => {
if (res.code == 200) {
// ;
this.institutionList1 = res.result.companyList;
let DATA = res.result.companyList;
// this.institutionList1 = [...res.result.companyList] || [];
// let DATA = res.result.companyList || [];
console.log(222, this.userInfo.accountType);
//accountType==2 可以选择一级、二级管理机构
if (this.userInfo.accountType == 2) {
// this.institutionList2 = res.result[0].list;
// this.institutionList3 = this.institutionList2[0].list;
//accountType==3 不可以选择一级管理机构 可以选择二级管理机构
} else if (this.userInfo.accountType == 3) {
for (let i in DATA) {
if (DATA[i].companySn == this.userInfo.sn) {
this.institutionList1.push(DATA[i]);
this.searchForm.firstCompanyId = DATA[i].companyId;
this.institutionList2 = DATA[i].list;
}
}
// for (let i in DATA) {
// if (DATA[i].companySn == this.userInfo.sn) {
// // this.institutionList1.push(DATA[i]);
// this.searchForm.firstCompanyId = DATA[i].companyId;
// this.institutionList2 = DATA[i].list;
// }
// }
this.searchForm.firstCompanyId = res.result.companyInfo.companyId;
this.institutionList2 = res.result.companyList;
this.institutionList1.push({
...res.result.companyInfo,
});
console.log(this.institutionList1);
//accountType==4 不可以选择一级、二级管理机构
} else if (this.userInfo.accountType == 4) {
for (let i in DATA) {
let list = DATA[i].list;
if (list.length > 0) {
for (let j in list) {
if (this.userInfo.sn == list[j].companySn) {
this.institutionList1.push(DATA[i]);
this.institutionList2.push(list[j]);
this.searchForm.firstCompanyId = DATA[i].companyId;
this.searchForm.secondCompanyId = list[j].companyId;
this.institutionList3 = list[j].list;
}
}
}
}
// for (let i in DATA) {
// let list = DATA[i].list;
// if (list.length > 0) {
// for (let j in list) {
// if (this.userInfo.sn == list[j].companySn) {
// this.institutionList1.push(DATA[i]);
// this.institutionList2.push(list[j]);
// this.searchForm.firstCompanyId = DATA[i].companyId;
// this.searchForm.secondCompanyId = list[j].companyId;
// this.institutionList3 = list[j].list;
// }
// }
// }
// }
this.searchForm.firstCompanyId = res.result.parentCompany.companyId;
this.searchForm.secondCompanyId = res.result.companyInfo.companyId;
this.institutionList3 = res.result.companyList;
this.institutionList1 = [res.result.parentCompany];
this.institutionList2 = [res.result.companyInfo];
} else if (this.userInfo.accountType == 7) {
for (let i in DATA) {
let list = DATA[i].list;
if (list.length > 0) {
for (let j in list) {
let list2 = list[j].list;
for (let k in list2) {
if (this.userInfo.sn == list2[k].companySn) {
this.institutionList1.push(DATA[i]);
this.institutionList2.push(list[j]);
this.searchForm.firstCompanyId = DATA[i].companyId;
this.searchForm.secondCompanyId = list[j].companyId;
this.searchForm.thirdCompanyId = list2[k].companyId;
this.institutionList3.push(list2[k]);
}
}
}
}
}
this.searchForm.firstCompanyId = res.result.firstCompany.companyId;
this.searchForm.secondCompanyId =
res.result.parentCompany.companyId;
this.searchForm.thirdCompanyId = res.result.companyInfo.companyId;
this.institutionList1 = [res.result.firstCompany];
this.institutionList2 = [res.result.parentCompany];
this.institutionList3 = [res.result.companyInfo];
// for (let i in DATA) {
// let list = DATA[i].list;
// if (list.length > 0) {
// for (let j in list) {
// let list2 = list[j].list;
// for (let k in list2) {
// if (this.userInfo.sn == list2[k].companySn) {
// this.institutionList1.push(DATA[i]);
// this.institutionList2.push(list[j]);
// this.searchForm.firstCompanyId = DATA[i].companyId;
// this.searchForm.secondCompanyId = list[j].companyId;
// this.searchForm.thirdCompanyId = list2[k].companyId;
// this.institutionList3.push(list2[k]);
// }
// }
// }
// }
// }
}
// console.log(this.institutionList1)
// console.log(this.institutionList2)

8
src/views/projectFront/buildersDiary/buildersDiaryAll.vue
View File

@ -732,13 +732,13 @@ export default {
const requestData = {
projectSn: this.projectSn,
};
fetch(this.$http.defaults.baseURL + "xmgl/ocrBuildLog/downloadTemplate", {
method: "post",
fetch(this.$http.defaults.baseURL + `xmgl/ocrBuildLog/downloadTemplate?projectSn=${this.projectSn}`, {
method: "get",
headers: {
Authorization: this.$store.state.userInfo.token,
"Content-Type": "application/json", // 设置请求头的内容类型为JSON
},
body: JSON.stringify(requestData),
// body: JSON.stringify(requestData),
})
.then((response) => {
// 处理响应
@ -1139,7 +1139,7 @@ export default {
handleConstructionAreaIdsChange() {
this.getEnterpriseInfoList();
},
// 获取施工场站
// 获取施工区域
getQualityRegionList() {
let data = {
projectSn: this.projectSn,

30
src/views/projectFront/replayVideoManage/components/playBack/isc_plugin_h5.vue
View File

@ -233,7 +233,7 @@ export default {
this.play(item, index);
}
});
if(a.length > 1) {
if (a.length > 1) {
this.devH5List = a;
}
},
@ -397,8 +397,8 @@ export default {
if (wnd) {
const controls = document.getElementById(`controls-${index + 1}`);
if (controls) {
controls.classList.remove("video-controls_flex");
}
controls.classList.remove("video-controls_flex");
}
}
});
this.devH5List = [];
@ -424,7 +424,7 @@ export default {
if (controls) {
controls.classList.remove("video-controls_flex");
}
if(type == "delete") return;
if (type == "delete") return;
this.devH5List.splice(currentWindowIndex - 1, 1);
}
},
@ -610,8 +610,14 @@ export default {
}
}
if (controls) {
if (iWndIndex > _this.devH5List.length - 1) return;
controls.classList.add("video-controls_flex");
// if (iWndIndex > _this.devH5List.length - 1) return;
// controls.classList.add("video-controls_flex");
const player_playVideo = wnd.querySelector(
`#player_playVideo${iWndIndex}`
);
if (player_playVideo.src) {
controls.classList.add("video-controls_flex");
}
}
}
},
@ -703,7 +709,7 @@ export default {
// itemId: row.itemId,
serialNumber: row.serialNumber,
projectSn: row.projectSn,
protocol: "ws",
protocol: window.location.protocol.includes("https") ? "wss" : "ws",
beginTime: this.startTime,
endTime: this.endTime,
@ -795,6 +801,16 @@ export default {
_this.$message.warning(obj[err] || "播放失败");
}
);
_this.player.JS_SetConnectTimeOut(index, 60).then(
() => {
console.info("JS_SetConnectTimeOut success");
// do you want...
},
(err) => {
console.info("JS_SetConnectTimeOut failed", err);
// do you want...
}
);
});
},
/**

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

@ -75,7 +75,7 @@
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="施工场站" prop="constructionAreas">
<el-form-item label="施工区域" prop="constructionAreas">
<el-cascader
v-model="queryParams.constructionAreas"
:options="qualityRegionList"
@ -411,7 +411,7 @@
placeholder="请输入"
></el-input>
</el-form-item>
<el-form-item label="施工场站" prop="constructionAreas">
<el-form-item label="施工区域" prop="constructionAreas">
<el-cascader
v-model="workTicketForm.constructionAreas"
:options="qualityRegionList"
@ -1969,7 +1969,7 @@ export default {
}
});
},
// 获取施工场站
// 获取施工区域
getQualityRegionList() {
let data = {
projectSn: this.projectSn,