diff --git a/src/assets/images/tunnel/device.png b/src/assets/images/tunnel/device.png new file mode 100644 index 0000000..317689f Binary files /dev/null and b/src/assets/images/tunnel/device.png differ diff --git a/src/assets/images/tunnel/sd_bj.png b/src/assets/images/tunnel/sd_bj.png new file mode 100644 index 0000000..7ad3210 Binary files /dev/null and b/src/assets/images/tunnel/sd_bj.png differ diff --git a/src/assets/images/tunnel/sdgl_sdt.png b/src/assets/images/tunnel/sdgl_sdt.png new file mode 100644 index 0000000..daf630a Binary files /dev/null and b/src/assets/images/tunnel/sdgl_sdt.png differ diff --git a/src/assets/images/tunnel/sp_icon_yc.png b/src/assets/images/tunnel/sp_icon_yc.png new file mode 100644 index 0000000..cf00b6c Binary files /dev/null and b/src/assets/images/tunnel/sp_icon_yc.png differ diff --git a/src/assets/images/tunnel/white-state-icon.png b/src/assets/images/tunnel/white-state-icon.png new file mode 100644 index 0000000..0bf15cd Binary files /dev/null and b/src/assets/images/tunnel/white-state-icon.png differ diff --git a/src/components/content/badGasInfo/BadGasInfo.vue b/src/components/content/badGasInfo/BadGasInfo.vue index d1340fb..f011ee8 100644 --- a/src/components/content/badGasInfo/BadGasInfo.vue +++ b/src/components/content/badGasInfo/BadGasInfo.vue @@ -2,6 +2,7 @@
有害气体
@@ -9,7 +10,6 @@ v-for="item in badGasList" :key="item.equipmentId" :gasInfo="item" - @click="handleOpenChart" />
@@ -37,7 +37,6 @@
- >>>>>>> 077ff6a0744d396411f6b0bd5f409d42997965e9 @@ -138,11 +137,12 @@ const initChart = () => { legend: { left: 0, textStyle: { - color: "#FFFFFF", - fontSize: 40, + color: '#60DDDE', + fontSize: 40 }, - // itemWidth: 20, - // itemHeight: 20 + itemWidth: 30, + itemHeight: 30, + icon: "circle", }, //离容器四侧的距离 grid: { @@ -156,6 +156,9 @@ const initChart = () => { tooltip: { show: true, trigger: "axis", + textStyle: { + fontSize: 40 + } }, //X轴 xAxis: { @@ -296,6 +299,7 @@ const initChart = () => { \ No newline at end of file diff --git a/src/views/site/index.vue b/src/views/site/index.vue index aa73c89..ad39d0f 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -32,32 +32,31 @@
施工长度{{ item.constructionLength }}米
实现长度{{ item.implementationLength }}公里
-
+
-
+
更多
-
+
站点编辑
-
+
添加站点
- +
- 站点id:{{ siteId }} - 站点管理员id:{{ siteManageId }} + {{title}}
- + @@ -65,7 +64,7 @@ - + @@ -111,24 +110,11 @@ const siteList = ref([ sortTunnel: '一号隧道', constructionLength: 500, implementationLength: 10 - }, - { - siteName: '松江站', - num: 1, - sortTunnel: '一号隧道', - constructionLength: 500, - implementationLength: 10 - }, - { - siteName: '松江站', - num: 1, - sortTunnel: '一号隧道', - constructionLength: 500, - implementationLength: 10 - }, + } ]) const siteId = ref('iu78686') const siteManageId = ref('j98h0') +const title=ref('新增站点') const isClick = ref(false); const isVisited = ref(false); const form = ref({ @@ -140,17 +126,27 @@ const form = ref({ const handleClickSite = () => { isClick.value = !isClick.value } +const goToAddTunnel=()=>{ + router.push('/tunnel') +} +const handleEdit=()=>{ + title.value='编辑站点' + isVisited.value=true +} + +const handleAdd=()=>{ + title.value='新增站点' + isVisited.value=true +} \ No newline at end of file diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue index 6fd9d9f..989d1df 100644 --- a/src/views/tunnel/index.vue +++ b/src/views/tunnel/index.vue @@ -102,7 +102,7 @@ import { getLargeScreen } from "@/api/largeScreen"; const authStore = useAuthStore(); const router = useRouter(); -const selectIndex = ref(1); +const selectIndex = ref(-1); const showFan = ref(false); const drawerLeft = ref(true); const drawerRight = ref(true); @@ -167,6 +167,8 @@ const manageSelect = (index) => { console.log("首页点击-", index); if (index === 0) { router.push("/site"); + }else if (index === 1){ + router.push("/tunnel"); } }; const closeLeft = () => {