From 093d98e63013d832e59385914d527f6407506fee Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Mon, 22 May 2023 18:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 8 +- src/views/Login.vue | 2 +- src/views/components/carouselChart.vue | 53 ++- .../components/addPhotoDialog.vue | 2 +- .../components/pictureTags.vue | 301 ++++++++++++++++++ .../photographicDevice/index.vue | 56 +++- .../components/pictureTags.vue | 172 ---------- src/views/realTimeMonitor/index.vue | 4 +- 8 files changed, 399 insertions(+), 199 deletions(-) create mode 100644 src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue delete mode 100644 src/views/realTimeMonitor/components/pictureTags.vue diff --git a/src/router/index.js b/src/router/index.js index 5d00f4e..f2adf33 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,10 +4,10 @@ import VueRouter from "vue-router"; Vue.use(VueRouter); const routes = [ - { - path: "/", - redirect: "/realTimeMonitor", - }, + // { + // path: "/", + // redirect: "/realTimeMonitor", + // }, { path: "/", component: () => diff --git a/src/views/Login.vue b/src/views/Login.vue index 6134f1c..0079294 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -99,7 +99,7 @@ export default { this.token = this.$md5(this.userInfo.password); //获取token this.$store.commit("SET_TOKEN", this.token); //将token保存在vuex中 this.$store.commit("SET_USERINFO", this.userInfo.username); //将用户信息保存在vuex中 - this.$router.push("/"); + this.$router.push("/realTimeMonitor"); this.$message.success("登录成功"); } else { this.$message.error("请输入账号和密码"); diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index b8cfbaa..4b938b8 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -12,7 +12,8 @@ bigPicPath ? 'backgroundImage:url(' + bigPicPath + '!128x72)' : '' " > - + + +

+ {{ pictureData.linename }} +

+

+ {{ pictureData.towername }} +

+

+ {{ pictureData.cmdid }} +

+

+ + + + + +

+ +
+

+ +

+

+ + +

+

+ 重新绘制 + 保存绘制 +

+
+ + + + + + + diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index 9ae2447..b3543f3 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -40,8 +40,8 @@ - - + +