From 99dd539df87a39272725853f9787a458e8b970c8 Mon Sep 17 00:00:00 2001 From: yanfeiyong <2060201549@qq.com> Date: Wed, 19 Mar 2025 09:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8Fbug=E5=92=8C?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/assets/styles/sidebar.scss | 2 + src/layout/components/Navbar.vue | 8 +- src/layout/components/breadword.vue | 5 - src/store/modules/app.js | 22 +- .../compilation/onecailiao-info/index.vue | 3 + src/views/compilation/onecailiao/index.vue | 651 +++++++++--------- .../components/ProjectDetails/Buildings.vue | 8 +- src/views/components/ProjectDetails/Liver.vue | 35 +- .../components/ProjectDetails/Months.vue | 14 +- .../ProjectDetails/Projectpicturetwo.vue | 2 +- src/views/components/analysis/map.vue | 78 ++- src/views/components/analysis/projectList.vue | 8 +- src/views/login.vue | 2 +- src/views/manage-info/index.vue | 45 +- src/views/manage/index.vue | 36 +- src/views/models/badlist/index.vue | 4 +- src/views/onecailiao-info/index.vue | 3 + src/views/orientedtwo/content/index.vue | 4 +- vue.config.js | 2 +- 20 files changed, 478 insertions(+), 455 deletions(-) create mode 100644 src/views/compilation/onecailiao-info/index.vue create mode 100644 src/views/onecailiao-info/index.vue diff --git a/package.json b/package.json index 36188a8..bbec0a6 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", + "vue-quill-editor": "^3.0.6", "vue-router": "3.4.9", "vuedraggable": "2.24.3", "vuex": "3.6.0", diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 70ecac4..6642bc5 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -70,6 +70,8 @@ height: 100%; width: 100% !important; background-image: url(../images/侧边栏2.png); + background-repeat: no-repeat; + background-size: 100% 100%; } .el-menu-item, .el-submenu__title { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 96ed57b..411cd70 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -25,12 +25,12 @@ - + + 退出登录 diff --git a/src/layout/components/breadword.vue b/src/layout/components/breadword.vue index 80bd337..ea342d4 100644 --- a/src/layout/components/breadword.vue +++ b/src/layout/components/breadword.vue @@ -4,7 +4,6 @@ - @@ -113,10 +112,6 @@ export default { float: left; } - .topmenu-container { - position: absolute; - left: 50px; - } .errLog-container { display: inline-block; diff --git a/src/store/modules/app.js b/src/store/modules/app.js index 3e22d1c..0a370d6 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -2,7 +2,7 @@ import Cookies from 'js-cookie' const state = { sidebar: { - opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + opened: true, withoutAnimation: false, hide: false }, @@ -15,18 +15,18 @@ const mutations = { if (state.sidebar.hide) { return false; } - state.sidebar.opened = !state.sidebar.opened - state.sidebar.withoutAnimation = false - if (state.sidebar.opened) { - Cookies.set('sidebarStatus', 1) - } else { - Cookies.set('sidebarStatus', 0) - } + // state.sidebar.opened = !state.sidebar.opened + // state.sidebar.withoutAnimation = false + // if (state.sidebar.opened) { + // Cookies.set('sidebarStatus', 1) + // } else { + // Cookies.set('sidebarStatus', 0) + // } }, CLOSE_SIDEBAR: (state, withoutAnimation) => { - Cookies.set('sidebarStatus', 0) - state.sidebar.opened = false - state.sidebar.withoutAnimation = withoutAnimation + // Cookies.set('sidebarStatus', 0) + // state.sidebar.opened = false + // state.sidebar.withoutAnimation = withoutAnimation }, TOGGLE_DEVICE: (state, device) => { state.device = device diff --git a/src/views/compilation/onecailiao-info/index.vue b/src/views/compilation/onecailiao-info/index.vue new file mode 100644 index 0000000..fe60de4 --- /dev/null +++ b/src/views/compilation/onecailiao-info/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/src/views/compilation/onecailiao/index.vue b/src/views/compilation/onecailiao/index.vue index 92d908e..c491df5 100644 --- a/src/views/compilation/onecailiao/index.vue +++ b/src/views/compilation/onecailiao/index.vue @@ -1,351 +1,330 @@ - - - - - - \ No newline at end of file +}; + + + \ No newline at end of file diff --git a/src/views/components/ProjectDetails/Buildings.vue b/src/views/components/ProjectDetails/Buildings.vue index ee7cbfc..333de12 100644 --- a/src/views/components/ProjectDetails/Buildings.vue +++ b/src/views/components/ProjectDetails/Buildings.vue @@ -307,10 +307,10 @@ export default { }, handleAddBuilding() { // 这里可以添加表单验证逻辑 - if (!this.buildingForm.buildingNumber) { - this.$message.error('请填写楼栋编号'); - return; - } + // if (!this.buildingForm) { + // this.$message.error('请填写完整信息'); + // return; + // } // 将新楼栋添加到 dynamicTags this.dynamicTags.push(this.buildingForm.buildingNumber + '栋'); diff --git a/src/views/components/ProjectDetails/Liver.vue b/src/views/components/ProjectDetails/Liver.vue index 4d510bc..de1b943 100644 --- a/src/views/components/ProjectDetails/Liver.vue +++ b/src/views/components/ProjectDetails/Liver.vue @@ -18,7 +18,7 @@
- 项目录像 + 现场实况
@@ -27,7 +27,9 @@
- + +
在线
+
离线
@@ -38,16 +40,18 @@ export default { data() { return { images: [ - { src: '' }, - { src: '' }, - { src: '' }, + { src: 'https://picsum.photos/300/200?random=1', isOnline: true }, + { src: 'https://picsum.photos/300/200?random=2', isOnline: false }, + { src: 'https://picsum.photos/300/200?random=3', isOnline: true }, // 添加更多图片 ] }; }, methods: { removeImage(index) { - this.images.splice(index, 1); + if (confirm('确定要删除该实况吗？')) { + this.images.splice(index, 1); + } } } }; @@ -145,4 +149,23 @@ export default { width: 4.19rem; height: 4.19rem; } + +.online-status { + position: absolute; + top: 1rem; + right: 1.3rem; + padding: 0.2rem 0.5rem; + font-size: 0.8rem; + color: white; + box-shadow: 0rem 0.13rem 0.31rem 0rem rgba(0, 0, 0, 0.3); + border-radius: 0.63rem 0.63rem 0.63rem 0.63rem +} + +.online-status.online { + background: #0DB770; +} + +.online-status.offline { + background: #E34242; +} \ No newline at end of file diff --git a/src/views/components/ProjectDetails/Months.vue b/src/views/components/ProjectDetails/Months.vue index 05aa036..04fc244 100644 --- a/src/views/components/ProjectDetails/Months.vue +++ b/src/views/components/ProjectDetails/Months.vue @@ -7,18 +7,8 @@ 月度进展信息 diff --git a/src/views/components/ProjectDetails/Projectpicturetwo.vue b/src/views/components/ProjectDetails/Projectpicturetwo.vue index d3509aa..51fe705 100644 --- a/src/views/components/ProjectDetails/Projectpicturetwo.vue +++ b/src/views/components/ProjectDetails/Projectpicturetwo.vue @@ -349,7 +349,7 @@ export default { justify-content: center; align-items: center; font-size: .7rem; - z-index: 999; + z-index: 98; } .map-thumbnail { diff --git a/src/views/components/analysis/map.vue b/src/views/components/analysis/map.vue index ee24f5e..80441b8 100644 --- a/src/views/components/analysis/map.vue +++ b/src/views/components/analysis/map.vue @@ -1,9 +1,8 @@