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

Merge branch 'bjxz-rain' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain

Browse Source
This commit is contained in:
”Rain“ 2024-06-05 22:46:54 +08:00
commit b6cfe00059
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -4,8 +4,8 @@ NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用) # 本地环境接口地址(/api/index.ts文件中使用)
# 后端本地 # 后端本地
# VITE_API_URL = 'http://192.168.34.221:19111' # VITE_API_URL = 'http://192.168.34.221:19111'
VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地
# VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程
# VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://192.168.34.221:28889'
# VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://121.196.214.246/api'
# VITE_API_URL = 'http://jxj.zhgdyun.com:100' # VITE_API_URL = 'http://jxj.zhgdyun.com:100'

4
src/api/modules/video.ts
View File

@ -20,6 +20,6 @@ export const getSafeHatSessionApi = (params: {}) => {
}; };
// 现场视频 // 现场视频
export const selectLiveVideoListApi = (params: {}) => { export const selectLiveVideoListApi = (params: {}, showLoading: boolean) => {
return http.get(BASEURL + `/xmgl/project/getProjectExtendInfo`, params, { headers: { noLoading: true }}); return http.get(BASEURL + `/xmgl/project/getProjectExtendInfo`, params, { headers: { noLoading: showLoading } });
}; };

13
src/views/commandScreen/commandCenter/centerTop.vue
View File

@ -150,10 +150,13 @@ let topText = ref([
{ id: 2, title: "宣传视频", isActive: false }, { id: 2, title: "宣传视频", isActive: false },
{ id: 3, title: "效果图", isActive: false } { id: 3, title: "效果图", isActive: false }
]); ]);
const getVideoList = async () => { const getVideoList = async (showLoading: boolean) => {
let res: any = await selectLiveVideoListApi({ let res: any = await selectLiveVideoListApi(
projectSn: store.sn {
}); projectSn: store.sn
},
showLoading
);
console.log(res, "445566"); console.log(res, "445566");
if (res.result && res.result.extend1) { if (res.result && res.result.extend1) {
videoList.value = JSON.parse(res.result.extend1).result.videoList; videoList.value = JSON.parse(res.result.extend1).result.videoList;
@ -270,7 +273,7 @@ defineExpose({
getQueryBySnData getQueryBySnData
}); });
const setIntervalFn = (showLoading: boolean) => { const setIntervalFn = (showLoading: boolean) => {
getVideoList(); getVideoList(showLoading);
getQueryBySnData(showLoading); getQueryBySnData(showLoading);
getStatsDirectorateBigScreen(showLoading); getStatsDirectorateBigScreen(showLoading);
getStatScore(showLoading); getStatScore(showLoading);

21
src/views/commandScreen/commandCenter/rightAll.vue
View File

@ -1020,12 +1020,15 @@ const getSafeInfo = async (showLoading: boolean) => {
// majorDangerRate.value = result.result.percent; // majorDangerRate.value = result.result.percent;
console.log("1111111111111", dataList.value); console.log("1111111111111", dataList.value);
const res: any = await getCountDangerLevelApi({ const res: any = await getCountDangerLevelApi(
projectSn: store.sn, {
isOverdueRectification: 1, projectSn: store.sn,
inspectStartTime: dateRange.value[0], isOverdueRectification: 1,
inspectEndTime: dateRange.value[1] inspectStartTime: dateRange.value[0],
}); inspectEndTime: dateRange.value[1]
},
showLoading
);
// dataList.value = res.result.data.map((item: any, index: number) => { // dataList.value = res.result.data.map((item: any, index: number) => {
// return { // return {
// ...item, // ...item,
@ -1386,12 +1389,12 @@ const getNoticeList = async (showLoading: boolean) => {
watch( watch(
dateRange, dateRange,
async () => { () => {
if (dateRange.value == null) { if (dateRange.value == null) {
dateRange.value = []; dateRange.value = [];
} }
await getSafeInfo(true); getSafeInfo(true);
await qualityInfo(true); qualityInfo(true);
// await getSelectQualityStatisticsNum(); // await getSelectQualityStatisticsNum();
}, },
{ deep: true } { deep: true }