diff --git a/.env.production b/.env.production index 5ed1dc3..a8c1271 100644 --- a/.env.production +++ b/.env.production @@ -3,10 +3,11 @@ NODE_ENV = "production" # 线上环境接口地址(easymock) # VITE_API_URL = "http://139.9.66.234:6688" -# VITE_API_URL = "http://182.90.224.147:6688" -# VITE_API_URL = "http://182.90.224.147:6688" -VITE_API_URL = 'http://182.90.224.147:100' +# VITE_API_URL = "http://jxj.zhgdyun.com:6688" +# 沈阳合盈线上 +# VITE_API_URL = "http://101.43.164.214:45022" +VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 打包 -VITE_ULD_API_URL = 'http://182.90.224.147:8012/onlinePreview?url=' +VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url=' diff --git a/src/api/modules/login.ts b/src/api/modules/login.ts index ee6ba8f..1087c56 100644 --- a/src/api/modules/login.ts +++ b/src/api/modules/login.ts @@ -45,3 +45,8 @@ export const logoutApi = () => { // export const jumpLoginApi = () => { // return http.post(BASEURL + ``); // }; + +// * 免登录用户信息 +export const jumpLargeUserInfoApi = (params?: any) => { + return http.post(BASEURL + `/xmgl/base/getLoginInfoByToken`, params, { headers: { "Content-Type": "application/json" } }); +}; diff --git a/src/views/sevenLargeScreen/headNoise/rightCenter.vue b/src/views/sevenLargeScreen/headNoise/rightCenter.vue index 31624a8..319498f 100644 --- a/src/views/sevenLargeScreen/headNoise/rightCenter.vue +++ b/src/views/sevenLargeScreen/headNoise/rightCenter.vue @@ -1,8 +1,10 @@ @@ -366,13 +368,13 @@ let option = ref({ // for (let j = 0; j < cont; j++) { // stringArr += ""; // } - num =name + stringArr + totalData.value[i].value; + num = name + stringArr + totalData.value[i].value; } } return num; }, data: ["噪声报警", "PM2.5超标报警", "PM10超标报警", "TSP报警", "温度报警", "湿度报警", "风速报警"], - top:20, + top: 20, right: 300, left: 280, bottom: 10, @@ -460,13 +462,13 @@ const getList = async () => { totalData.value[i].value = res.result.windspeedNum; } } - console.log("获取今日报警统计",totalData.value) + console.log("获取今日报警统计", totalData.value); draw(); } }; function draw() { - console.log("绘图数据",option.value) + console.log("绘图数据", option.value); let echartsTest = echarts.init(document.getElementById("echartsTest")); echartsTest.setOption(option.value); } @@ -482,23 +484,26 @@ onMounted(async () => { diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 2b974b6..e9a0794 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -83,6 +83,36 @@ const store = GlobalStore(); let nowTime = ref("2023-04-16 09:22:12" as any); let showUserBox = ref(false as any); let adminName = ref("" as any); +// let menuList = ref([ +// { +// moduleName: "工程概况", +// modulePath: "/projectOverview" +// }, +// { +// moduleName: "智慧党建", +// modulePath: "/smartPartyBuilding" +// }, +// { +// moduleName: "扬尘噪声", +// modulePath: "/headNoise" +// }, +// { +// moduleName: "劳务管理", +// modulePath: "/laborManagement" +// }, +// { +// moduleName: "视频管理", +// modulePath: "/videoManagement" +// }, +// { +// moduleName: "配电箱监测", +// modulePath: "/distributionMonitoring" +// }, +// { +// moduleName: "AI预警", +// modulePath: "/aIEarlyWarning" +// } +// ]); let menuList = ref([ { moduleName: "综合管理", @@ -190,7 +220,7 @@ let menuList = ref([ }, { moduleName: "绿色施工", - modulePath: "/electricityMonitor", + modulePath: "/headNoise", menuList: [ { menuName: "扬尘噪声", @@ -259,6 +289,7 @@ const navigateTo = (path, type) => { console.log("点击的路由---", path, type); if (type == 1) { activeTab.value = path.modulePath; + activeTab2.value = path.modulePath; itemList.value = path.menuList; router.push(path.modulePath); } else { @@ -269,6 +300,7 @@ const navigateTo = (path, type) => { onMounted(async () => { // await getAllModelMenu(); activeTab.value = menuList.value[0].modulePath; + activeTab2.value = menuList.value[0].modulePath; itemList.value = menuList.value[0].menuList; //数据看板跳转免登录 if (window.location.href.indexOf("token") != -1) { diff --git a/src/views/sevenLargeScreen/indexL_biaoZhun.vue b/src/views/sevenLargeScreen/indexL_biaoZhun.vue new file mode 100644 index 0000000..2b974b6 --- /dev/null +++ b/src/views/sevenLargeScreen/indexL_biaoZhun.vue @@ -0,0 +1,583 @@ + + + + + + + diff --git a/src/views/sevenLargeScreen/indexL_syhy.vue b/src/views/sevenLargeScreen/indexL_syhy.vue new file mode 100644 index 0000000..73fa068 --- /dev/null +++ b/src/views/sevenLargeScreen/indexL_syhy.vue @@ -0,0 +1,620 @@ + + + + + + +