diff --git a/src/assets/images/site/zdgl_dbj.png b/src/assets/images/site/zdgl_dbj.png new file mode 100644 index 0000000..d7614de Binary files /dev/null and b/src/assets/images/site/zdgl_dbj.png differ diff --git a/src/components/content/badGasInfo/childComps/GasInfoItem.vue b/src/components/content/badGasInfo/childComps/GasInfoItem.vue index 5d2ff3c..00c03a0 100644 --- a/src/components/content/badGasInfo/childComps/GasInfoItem.vue +++ b/src/components/content/badGasInfo/childComps/GasInfoItem.vue @@ -37,7 +37,7 @@ const option = { clip: false, itemStyle: { color: `${ - params.gasInfo.value > params.gasInfo.point ? "#F94236" : "#7EDFEC" + params.gasInfo.value >= params.gasInfo.point ? "#F94236" : "#7EDFEC" }`, }, }, @@ -65,7 +65,9 @@ const option = { axisLine: { lineStyle: { width: 25, - color: [[1, "#0a4265"]], + color: [ + [1, "#0a4265"] + ], }, }, detail: { @@ -73,7 +75,7 @@ const option = { height: 14, fontSize: 26, color: `${ - params.gasInfo.value > params.gasInfo.point ? "#F94236" : "#FFCE23" + params.gasInfo.value >= params.gasInfo.point ? "#F94236" : "#FFCE23" }`, formatter: "Vo{value}%", }, diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index 94f324f..0870087 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -107,6 +107,7 @@ watch(() => props.list, (now, old) => { padding-left: 5px; &:hover { + cursor: pointer; width: 280px; //height: 46px; background: #2E5589; diff --git a/src/router/index.js b/src/router/index.js index bb6dff4..32e6ed5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -31,6 +31,15 @@ const routes = [ title: 'debug', breadcrumb: true } + }, + { + path: '/site', + name: 'site', + component: () => import('@/views/site/index.vue'), + meta: { + title: 'site', + breadcrumb: true + } } ]; diff --git a/src/utils/date.js b/src/utils/date.js index 4ece773..61af94a 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -9,7 +9,6 @@ export const dateFormat = (time = new Date().getTime()) => { //YYYY年MM月DD日 const m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()); const s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()); let weekDay = new Date().getDay(); - console.log('weekDay',weekDay) const week= weekList[weekDay] // const strDate = `${Y}/${M}/${D} ${h}:${m}:${s}` return `${Y}年${M}月${D}日 星期${week}`; diff --git a/src/views/site/index.vue b/src/views/site/index.vue new file mode 100644 index 0000000..d5667fe --- /dev/null +++ b/src/views/site/index.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/src/views/tunnel/index.vue b/src/views/tunnel/index.vue index 7a374ab..070e99b 100644 --- a/src/views/tunnel/index.vue +++ b/src/views/tunnel/index.vue @@ -131,7 +131,12 @@ onMounted(() => { showFan.value = true }) }) -const manageSelect = () => { +const manageSelect = (index) => { + console.log('首页点击-',index) + if(index===0){ + console.log('站点管理=====-----') + router.push('/site') + } // getInfo(); }; const closeLeft = () => { @@ -196,7 +201,7 @@ const initWebSocket = () => { //连接关闭的回调方法 socket.onclose = function () { console.log("ws连接关闭"); - initWebSocket() + // initWebSocket() } setInterval(() => { socket.send(JSON.stringify(send))