diff --git a/.env.development b/.env.development index af9ba00..adb2dae 100644 --- a/.env.development +++ b/.env.development @@ -1,8 +1,8 @@ # 页面标题 -VITE_APP_TITLE = 若依管理系统 +VITE_APP_TITLE = 徐汇园林 # 开发环境配置 VITE_APP_ENV = 'development' -# 若依管理系统/开发环境 +# 徐汇园林/开发环境 VITE_APP_BASE_API = '/dev-api' diff --git a/.env.production b/.env.production index cbabf89..901fa1f 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ # 页面标题 -VITE_APP_TITLE = 若依管理系统 +VITE_APP_TITLE = 徐汇园林 # 生产环境配置 VITE_APP_ENV = 'production' -# 若依管理系统/生产环境 +# 徐汇园林/生产环境 VITE_APP_BASE_API = '/prod-api' # 是否在打包时开启压缩，支持 gzip 和 brotli diff --git a/.env.staging b/.env.staging index b11336d..57e2882 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VITE_APP_TITLE = 若依管理系统 +VITE_APP_TITLE = 徐汇园林 # 生产环境配置 VITE_APP_ENV = 'staging' -# 若依管理系统/生产环境 +# 徐汇园林/生产环境 VITE_APP_BASE_API = '/stage-api' # 是否在打包时开启压缩，支持 gzip 和 brotli diff --git a/index.html b/index.html index 246a2ad..c8707e7 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@ content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> - 若依管理系统 + 徐汇园林 .app-breadcrumb.el-breadcrumb { display: inline-block; - font-size: 14px; + font-size: 16px; line-height: 50px; margin-left: 8px; - + font-family: 'MiSans-Medium'; .no-redirect { color: #fff; cursor: text; diff --git a/src/components/mars-work/mars-map.vue b/src/components/mars-work/mars-map.vue index 02660c2..9e12497 100644 --- a/src/components/mars-work/mars-map.vue +++ b/src/components/mars-work/mars-map.vue @@ -47,7 +47,7 @@ const initMars3d = async () => { } else if (props.options) { mapOptions = toRaw(props.options); } - console.log("Map地图构造参数", mapOptions); + // console.log("Map地图构造参数", mapOptions); map = new mars3d.Map(withKeyId.value, mapOptions); diff --git a/src/components/tableOperation/index.vue b/src/components/tableOperation/index.vue new file mode 100644 index 0000000..1fa5185 --- /dev/null +++ b/src/components/tableOperation/index.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/components/tablePage/index.vue b/src/components/tablePage/index.vue new file mode 100644 index 0000000..2c38d23 --- /dev/null +++ b/src/components/tablePage/index.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 21f3039..61c9de9 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -36,14 +36,16 @@ function addIframe() { diff --git a/src/views/emergency-rescue/workOrder/index.vue b/src/views/emergency-rescue/workOrder/index.vue index ecb8c0f..ac4ef1b 100644 --- a/src/views/emergency-rescue/workOrder/index.vue +++ b/src/views/emergency-rescue/workOrder/index.vue @@ -1,19 +1,186 @@ +/** + * 导出 + */ +const handlerExport=()=>{ - \ No newline at end of file + diff --git a/src/views/visualization/components/navigationBar.vue b/src/views/visualization/components/navigationBar.vue index 7e7a07c..d4a40fb 100644 --- a/src/views/visualization/components/navigationBar.vue +++ b/src/views/visualization/components/navigationBar.vue @@ -21,18 +21,14 @@ {{ item.meta.title }} - -
{{ formattedDate }}
+
+ {{ formattedDate }} +
+ 返回门户 + +
+
@@ -42,48 +38,35 @@ import { useRouter } from "vue-router"; import moment from "moment"; import "moment/locale/zh-cn"; // 导入中文语言包 moment.locale("zh-cn", { - weekdays: "星期一_星期二_星期三_星期四_星期五_星期六_星期日".split("_"), + weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"), }); // 设置为中文 const router = useRouter(); -const { proxy } = getCurrentInstance(); const title = "徐汇区智慧园林数据可视化驾驶舱"; -let currentIndex = ref(4); - /** * 获取当前时间 */ const formattedDate = computed(() => { - return moment("2019-05-14").format("YYYY-MM-DD dddd"); + return moment().format("YYYY-MM-DD dddd"); }); /** * 获取大屏路由信息 */ const formatRouter = computed(() => { - const menuList = router.options.routes.find( + const menuData = router.options.routes.find( (item) => item.path === "/visualization" ); - console.log(menuList); - if (menuList) { - return menuList.children; - } + if (menuData) return menuData.children; return []; }); /** - * 菜单选中 - * @param index + * 返回门户 */ -const handlerSelect = (index, item) => { - if (item.disable) { - proxy.$modal.msgWarning("功能开发中，敬请期待"); - return; - } - if (currentIndex.value !== index) { - currentIndex.value = index; - } +const backPortal = () => { + router.replace("/index"); }; @@ -131,10 +114,7 @@ const handlerSelect = (index, item) => { height: 100%; display: flex; align-items: flex-end; - margin: 0 10px; - gap: 10px; - .menu-item { cursor: pointer; font-size: 16px; @@ -145,28 +125,39 @@ const handlerSelect = (index, item) => { display: flex; align-items: center; gap: 6px; - background-image: url('@/assets/images/visualization/dp-menu.png'); + background-image: url("@/assets/images/visualization/dp-menu.png"); background-size: 100% 100%; padding: 12px 40px; } .activeMenu { color: #ffffff; - background-image: url('@/assets/images/visualization/dp-menu-s.png'); + background-image: url("@/assets/images/visualization/dp-menu-s.png"); background-size: 100% 100%; } } .navigation-time { height: 100%; - - font-size: 14px; + font-size: 16px; color: #ffffff; font-weight: bold; letter-spacing: 1px; font-family: "Alimama ShuHeiTi-Bold"; display: flex; - align-items: flex-end; + flex-direction: column; + justify-content: flex-end; + gap: 10px; padding-bottom: 12px; padding-right: 35px; } +.Logout { + padding: 8px 0px; + cursor: pointer; + background: rgba(255, 255, 255, 0.25); + border-radius: 20px; + font-size: 16px; + color: #ffffff; + font-weight: 400; + text-align: center; +} diff --git a/src/views/visualization/emergency/index.vue b/src/views/visualization/emergency/index.vue index ea93fd7..81ff21d 100644 --- a/src/views/visualization/emergency/index.vue +++ b/src/views/visualization/emergency/index.vue @@ -1,9 +1,9 @@