diff --git a/.env.development b/.env.development index 74915dd8..04aa8506 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -# VITE_API_URL = 'http://192.168.34.221:9111' +VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' @@ -15,7 +15,7 @@ NODE_ENV = 'development' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) diff --git a/src/assets/images/commandScreen/top-bg.png b/src/assets/images/commandScreen/top-bg.png new file mode 100644 index 00000000..95b18d37 Binary files /dev/null and b/src/assets/images/commandScreen/top-bg.png differ diff --git a/src/config/config.ts b/src/config/config.ts index 0a4fb6cb..f2bf6418 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -24,11 +24,11 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 // export const COMPANY: string = ""; //标准版 -export const COMPANY: string = "zhzrf"; //中海·臻如府 +// export const COMPANY: string = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 -// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 +export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 93a541cd..617fd451 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { diff --git a/src/views/commandScreen/commandCenter/centerTop.vue b/src/views/commandScreen/commandCenter/centerTop.vue index a3c1a5b9..5212addc 100644 --- a/src/views/commandScreen/commandCenter/centerTop.vue +++ b/src/views/commandScreen/commandCenter/centerTop.vue @@ -1,6 +1,75 @@ @@ -130,71 +199,6 @@ const uploadSuccess = () => { type: "success" }); }; - -// 视频文件上传 之前 -function handleBeforeUploadVideo(file: any) { - console.log(file, "上传之前"); - let fileType = file.type.split("/")[0]; - if (fileType == "video") { - return true; - } else { - fileTypeFail("请选择正确的视频文件"); //"请选择正确的文件" - return false; - } -} - -// 图片文件上传 之前 -function handleBeforeUploadPic(file: any) { - console.log(file, "上传之前"); - let fileType = file.type.split("/")[0]; - if (fileType == "image") { - return true; - } else { - fileTypeFail("请选择正确的图片文件"); //"请选择正确的文件" - return false; - } -} - -//上传失败 -function handleError(file: any) { - console.log(file, "上传失败"); - uploadFail(); //"上传失败，请重试" -} -// 效果图上传成功 -function handleSuccess(file: any) { - console.log("效果图上传成功", file); - if (file.code == 200 || file.status == "SUCCESS") { - console.log(file); - let url = file.data[0].imageUrl; - saveEffectData(url); - } -} - -// 视频上传成功 -function handleSuccessTwo(file: any) { - if (file.code == 200 || file.status == "SUCCESS") { - console.log(file, "上传成功"); - let url = file.data[0].imageUrl; - // this.imgUrl = url; - saveOrDeleteVideo(url); - } -} -//效果图 保存 -function saveEffectData(url: any) { - // let configValue = JSON.stringify(url); - let data = { - projectSn: store.sn, - showType: 3, - showTitle: "效果图", //'效果图' - configValue: url - }; - eidtProjectShowConfig(data).then((res: any) => { - if (res.code == 200) { - getQueryBySnData(); - } - }); -} - // 查询效果图 function getQueryBySnData() { queryBySnData({ @@ -231,5 +235,103 @@ onMounted(async () => {