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

Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into shenzhen-dev

Browse Source
This commit is contained in:
Vce 2024-07-02 19:14:47 +08:00
commit 84c3f223d8
4 changed files with 19 additions and 9 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.155:19111' # VITE_API_URL = 'http://192.168.34.155: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/config/config.ts
View File

@ -29,8 +29,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "as"; //鞍山项目
// export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjt"; //鞍钢集团
// export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
// export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
// export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "zkjc"; //中科佳成项目
// export const COMPANY: string = "cqna"; //重庆南岸项目 // export const COMPANY: string = "cqna"; //重庆南岸项目

2
src/routers/modules/staticRouter.ts
View File

@ -25,7 +25,7 @@ export const staticRouter: RouteRecordRaw[] = [
path: "/large", path: "/large",
name: "大屏", name: "大屏",
// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏 component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏 // component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏 // component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏

18
src/views/commandScreen/dialogCompnnents/weather-info.vue
View File

@ -57,15 +57,25 @@
<div>{{ delayEvent(item.delayEventType) }}</div> <div>{{ delayEvent(item.delayEventType) }}</div>
<div> <div>
<el-tooltip class="box-item" effect="dark" :content="item.delayEventReason" placement="top-start"> <el-tooltip class="box-item" effect="dark" :content="item.delayEventReason" placement="top-start">
<span>{{item.delayEventReason}}</span> <span>{{ item.delayEventReason }}</span>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="list-img"> <div class="list-img">
<!-- :src="BASEURL + '/image/' + item.image"
:preview-src-list="[BASEURL + '/image/' + item.image]" -->
<el-image <el-image
fit="contain" fit="contain"
class="el-img" class="el-img"
:src="BASEURL + '/image/' + item.image" :src="
:preview-src-list="[BASEURL + '/image/' + item.image]" item.image && JSON.parse(item.image) instanceof Array
? JSON.parse(item.image)[0].url
: BASEURL + '/image/' + item.image
"
:preview-src-list="
item.image && JSON.parse(item.image) instanceof Array
? JSON.parse(item.image).map((ele: any) => ele.url)
: [BASEURL + '/image/' + item.image]
"
> >
<template #error> <template #error>
<el-image :src="noDataImage" :preview-src-list="[noDataImage]" fit="contain" class="el-no-img" alt="" /> <el-image :src="noDataImage" :preview-src-list="[noDataImage]" fit="contain" class="el-no-img" alt="" />
@ -102,7 +112,7 @@ const tableParams = ref({
calendarVal: "" calendarVal: ""
}); });
const partyMemberList = ref({} as any); const partyMemberList = ref([] as any[]);
const topStatisticData = ref({} as any); const topStatisticData = ref({} as any);
const delayEvent = (type: string) => { const delayEvent = (type: string) => {
const arrType = ["人为因素", "环境因素", "不可抵抗因素"]; const arrType = ["人为因素", "环境因素", "不可抵抗因素"];