From 21ef0251a6fbac663ba64cc074aeda9217a45f23 Mon Sep 17 00:00:00 2001
From: yyy <2605810609@qq.com>
Date: Fri, 7 Feb 2025 14:06:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |   2 +-
 .vscode/settings.json                         |   4 +-
 src/assets/imgs/logo.png                      | Bin 2801 -> 2623 bytes
 src/layout/Layout.vue                         |   2 +-
 src/layout/components/Logo/src/Logo.vue       |   3 +-
 src/layout/components/Menu/src/Menu.vue       |   3 +-
 src/layout/components/ToolHeader.vue          |   1 +
 src/layout/components/useRenderLayout.tsx     |   7 +-
 src/main.ts                                   |   1 -
 src/store/modules/app.ts                      |  22 ++-
 src/styles/element/index.scss                 |   8 --
 src/styles/var.css                            |  11 +-
 src/views/mapPage/realTimeMap/editMap.vue     | 133 +++++++++++++++++-
 src/views/mapPage/realTimeMap/index.vue       |   2 +-
 .../mapPage/taskManagement/createTask.vue     |  23 ++-
 15 files changed, 177 insertions(+), 45 deletions(-)
 delete mode 100644 src/styles/element/index.scss

diff --git a/.env b/.env
index 4b0f5bf6..0da55ae7 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=芋道管理系统
+VITE_APP_TITLE=RCS智能设备调度系统
 
 # 项目本地运行端口号
 VITE_PORT=80
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c50fc364..c1f8ea8c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -65,13 +65,13 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[html]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[css]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[less]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png
index 7e1043f21e57ead95f41354f0f1b7d1166c07ebd..c9bcc5b3ee45bb7ff8d226ea0a1f9077f3d9464c 100644
GIT binary patch
literal 2623
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

literal 2801
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
D817VA

diff --git a/src/layout/Layout.vue b/src/layout/Layout.vue
index d15025c6..9b3a4027 100644
--- a/src/layout/Layout.vue
+++ b/src/layout/Layout.vue
@@ -59,7 +59,7 @@ export default defineComponent({
 
         <Backtop></Backtop>
 
-        <Setting></Setting>
+        {<Setting></Setting>}
       </section>
     )
   }
diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue
index d241130d..8f8bcd94 100644
--- a/src/layout/components/Logo/src/Logo.vue
+++ b/src/layout/components/Logo/src/Logo.vue
@@ -57,7 +57,7 @@ watch(
 </script>
 
 <template>
-  <div>
+  <div :style="{ 'background-color': appStore.getTheme.topHeaderBgColor }">
     <router-link
       :class="[
         prefixCls,
@@ -80,6 +80,7 @@ watch(
               layout === 'topLeft' || layout === 'top' || layout === 'cutMenu'
           }
         ]"
+        style="font-size: 14px"
       >
         {{ title }}
       </div>
diff --git a/src/layout/components/Menu/src/Menu.vue b/src/layout/components/Menu/src/Menu.vue
index 94a1da4a..d982434a 100644
--- a/src/layout/components/Menu/src/Menu.vue
+++ b/src/layout/components/Menu/src/Menu.vue
@@ -171,7 +171,8 @@ $prefix-cls: #{$namespace}-menu;
     .#{$elNamespace}-menu {
       .#{$elNamespace}-sub-menu__title,
       .#{$elNamespace}-menu-item:not(.is-active) {
-        background-color: var(--left-menu-bg-light-color) !important;
+        // background-color: var(--left-menu-bg-light-color) !important;
+        background-color: #ffffff !important;
       }
     }
   }
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index 0b8d00d5..3fa57cd3 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -52,6 +52,7 @@ export default defineComponent({
           'h-[var(--top-tool-height)] relative px-[var(--top-tool-p-x)] flex items-center justify-between',
           'dark:bg-[var(--el-bg-color)]'
         ]}
+        style="height:60px"
       >
         {layout.value !== 'top' ? (
           <div class="h-full flex items-center">
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
index 5cae84dc..927a369a 100644
--- a/src/layout/components/useRenderLayout.tsx
+++ b/src/layout/components/useRenderLayout.tsx
@@ -55,7 +55,8 @@ export const useRenderLayout = () => {
                   'w-[var(--left-menu-max-width)]': !appStore.getCollapse
                 }
               ]}
-              style="transition: all var(--transition-time-02);"
+              style="transition: all var(--transition-time-02);height:60px;display: flex;
+        align-items: center;"
             ></Logo>
           ) : undefined}
           <Menu class={[{ '!h-[calc(100%-var(--logo-height))]': logo.value }]}></Menu>
@@ -106,9 +107,9 @@ export const useRenderLayout = () => {
                 ]}
               ></ToolHeader>
 
-              {tagsView.value ? (
+              {/* {tagsView.value ? (
                 <TagsView class="layout-border__top layout-border__bottom"></TagsView>
-              ) : undefined}
+              ) : undefined} */}
             </div>
 
             <AppView></AppView>
diff --git a/src/main.ts b/src/main.ts
index 831c34d0..72ff7c67 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -20,7 +20,6 @@ import { setupElementPlus } from '@/plugins/elementPlus'
 import { setupFormCreate } from '@/plugins/formCreate'
 
 // 引入全局样式
-import '@/styles/element/index.scss'
 import '@/styles/index.scss'
 
 // 引入动画
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index e3d6a56f..e7e30857 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -47,7 +47,6 @@ export const useAppStore = defineStore('app', {
       mobile: false, // 是否是移动端
       title: import.meta.env.VITE_APP_TITLE, // 标题
       pageLoading: false, // 路由跳转loading
-
       breadcrumb: true, // 面包屑
       breadcrumbIcon: true, // 面包屑图标
       collapse: false, // 折叠菜单
@@ -58,7 +57,7 @@ export const useAppStore = defineStore('app', {
       size: true, // 尺寸图标
       locale: true, // 多语言图标
       message: true, // 消息图标
-      tagsView: true, // 标签页
+      tagsView: false, // 标签页
       tagsViewImmerse: false, // 标签页沉浸
       tagsViewIcon: true, // 是否显示标签图标
       logo: true, // logo
@@ -66,39 +65,38 @@ export const useAppStore = defineStore('app', {
       footer: true, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
       fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
-
       layout: wsCache.get(CACHE_KEY.LAYOUT) || 'classic', // layout布局
       isDark: wsCache.get(CACHE_KEY.IS_DARK) || false, // 是否是暗黑模式
       currentSize: wsCache.get('default') || 'default', // 组件尺寸
       theme: wsCache.get(CACHE_KEY.THEME) || {
         // 主题色
-        elColorPrimary: '#409eff',
+        elColorPrimary: '#00329F',
         // 左侧菜单边框颜色
         leftMenuBorderColor: 'inherit',
         // 左侧菜单背景颜色
-        leftMenuBgColor: '#001529',
+        leftMenuBgColor: '#ffffff',
         // 左侧菜单浅色背景颜色
         leftMenuBgLightColor: '#0f2438',
         // 左侧菜单选中背景颜色
-        leftMenuBgActiveColor: 'var(--el-color-primary)',
+        leftMenuBgActiveColor: '#EBF1FF',
         // 左侧菜单收起选中背景颜色
-        leftMenuCollapseBgActiveColor: 'var(--el-color-primary)',
+        leftMenuCollapseBgActiveColor: '#EBF1FF',
         // 左侧菜单字体颜色
-        leftMenuTextColor: '#bfcbd9',
+        leftMenuTextColor: '#98A4BF',
         // 左侧菜单选中字体颜色
-        leftMenuTextActiveColor: '#fff',
+        leftMenuTextActiveColor: '#00329F',
         // logo字体颜色
         logoTitleTextColor: '#fff',
         // logo边框颜色
         logoBorderColor: 'inherit',
         // 头部背景颜色
-        topHeaderBgColor: '#fff',
+        topHeaderBgColor: '#00329F',
         // 头部字体颜色
-        topHeaderTextColor: 'inherit',
+        topHeaderTextColor: '#ffffff',
         // 头部悬停颜色
         topHeaderHoverColor: '#f6f6f6',
         // 头部边框颜色
-        topToolBorderColor: '#eee'
+        topToolBorderColor: '#E2E7F5'
       }
     }
   },
diff --git a/src/styles/element/index.scss b/src/styles/element/index.scss
deleted file mode 100644
index 02013c27..00000000
--- a/src/styles/element/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-// @forward 'element-plus/theme-chalk/src/common/var.scss' with (
-//   $colors: (
-//     'primary': (
-//       'base': #00329f
-//     )
-//   )
-// );
-// @use 'element-plus/theme-chalk/src/index.scss' as *;
diff --git a/src/styles/var.css b/src/styles/var.css
index 44f9405c..1b10b273 100644
--- a/src/styles/var.css
+++ b/src/styles/var.css
@@ -1,13 +1,15 @@
 :root {
+  --el-color-primary: #00329f;
+
   --login-bg-color: #293146;
 
-  --left-menu-max-width: 200px;
+  --left-menu-max-width: 220px;
 
   --left-menu-min-width: 64px;
 
-  --left-menu-bg-color: #001529;
+  --left-menu-bg-color: #ffffff;
 
-  --left-menu-bg-light-color: #0f2438;
+  --left-menu-bg-light-color: #ffffff;
 
   --left-menu-bg-active-color: var(--el-color-primary);
 
@@ -35,7 +37,8 @@
 
   --top-tool-p-x: 0;
 
-  --tags-view-height: 35px;
+  /* --tags-view-height: 35px;   开启面包屑时 */
+  --tags-view-height: 8px;
   /* header start */
 
   /* tab menu start */
diff --git a/src/views/mapPage/realTimeMap/editMap.vue b/src/views/mapPage/realTimeMap/editMap.vue
index cfa27b08..eb3d1a57 100644
--- a/src/views/mapPage/realTimeMap/editMap.vue
+++ b/src/views/mapPage/realTimeMap/editMap.vue
@@ -1,14 +1,104 @@
 <template>
   <div>
     <ContentWrap>
-      <div>
-        <el-button type="primary" @click="saveMap" :disabled="formLoading"> 保存 </el-button>
-        <el-button type="primary" @click="backPreviousStep" :disabled="formLoading">
-          撤销
-        </el-button>
-        <el-button type="primary" @click="backNextStep" :disabled="formLoading"> 重做 </el-button>
-        <el-button type="primary" @click="drawNodes" :disabled="formLoading"> 绘制节点 </el-button>
+      <div class="tool-list">
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 打开 </div>
+        </div>
+        <div class="tool-item" @click="saveMap">
+          <Icon icon="ep:folder-checked" :size="24" />
+          <div class="name"> 保存 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-opened" :size="24" />
+          <div class="name"> 另存为 </div>
+        </div>
+        <div class="line"></div>
+        <div class="tool-item">
+          <Icon icon="ep:position" :size="24" />
+          <div class="name"> 选择 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:rank" :size="24" />
+          <div class="name"> 移动 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 旋转 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:document" :size="24" />
+          <div class="name"> 复制 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:copy-document" :size="24" />
+          <div class="name"> 粘贴 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:delete" :size="24" />
+          <div class="name"> 删除 </div>
+        </div>
+        <div class="line"></div>
+        <div class="tool-item">
+          <Icon icon="ep:briefcase" :size="24" />
+          <div class="name"> 工具 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 线库 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 区域 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 文字 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 设备 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 车辆 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 测距 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 图层 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 标记 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 网格 </div>
+        </div>
+        <div class="line"></div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 放大 </div>
+        </div>
+        <div class="tool-item">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 缩小 </div>
+        </div>
+        <div class="tool-item" @click="backPreviousStep">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 撤回 </div>
+        </div>
+        <div class="tool-item" @click="backNextStep">
+          <Icon icon="ep:folder-add" :size="24" />
+          <div class="name"> 重做 </div>
+        </div>
       </div>
+      <!-- <el-button type="primary" @click="drawNodes" :disabled="formLoading"> 绘制节点 </el-button> -->
     </ContentWrap>
     <div class="map-box" ref="imgWrap" @mousewheel.prevent="rollImg" style="overflow: hidden">
       <div class="map-box-inner" ref="image" @mousedown.prevent="moveImg">
@@ -312,4 +402,33 @@ onMounted(() => {
   width: 100%;
   height: 100%;
 }
+
+.tool-list {
+  display: flex;
+  align-items: center;
+  text-align: center;
+
+  .tool-item {
+    width: 50px;
+  }
+
+  .name {
+    font-family:
+      PingFangSC,
+      PingFang SC;
+    font-weight: 400;
+    font-size: 14px;
+    color: #0d162a;
+    line-height: 20px;
+    text-align: center;
+    font-style: normal;
+  }
+
+  .line {
+    margin: 0 14px;
+    width: 1px;
+    height: 47px;
+    border: 1px solid #cccccc;
+  }
+}
 </style>
diff --git a/src/views/mapPage/realTimeMap/index.vue b/src/views/mapPage/realTimeMap/index.vue
index 57e9441d..74abd98c 100644
--- a/src/views/mapPage/realTimeMap/index.vue
+++ b/src/views/mapPage/realTimeMap/index.vue
@@ -1,8 +1,8 @@
 <template>
   <ContentWrap>
     <el-button type="success" @click="createTask">新建任务</el-button>
-    <el-button type="danger" @click="emergencyStop">一键急停</el-button>
     <el-button type="primary" @click="editMap">地图编辑</el-button>
+    <el-button type="danger" @click="emergencyStop">一键急停</el-button>
   </ContentWrap>
 
   <div class="main-content">
diff --git a/src/views/mapPage/taskManagement/createTask.vue b/src/views/mapPage/taskManagement/createTask.vue
index 620a4d0a..9447247e 100644
--- a/src/views/mapPage/taskManagement/createTask.vue
+++ b/src/views/mapPage/taskManagement/createTask.vue
@@ -73,7 +73,12 @@
                     prop="doMoveAll"
                     label-width="146"
                   >
-                    <el-switch v-model="formData.doMoveAll" :active-value="1" :inactive-value="0" />
+                    <el-switch
+                      v-model="formData.doMoveAll"
+                      :active-value="1"
+                      :inactive-value="0"
+                      @change="doMoveAllChange"
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -153,7 +158,7 @@
                   :rules="{ required: true, message: '任务类型不能为空', trigger: 'change' }"
                 >
                   <el-select
-                    :disabled="formData.doCycle == 1 && index == 0"
+                    :disabled="formData.doCycle == 1 || formData.doMoveAll == 1"
                     v-model="detailItem.taskType"
                     placeholder="请选择"
                     @change="taskTypeChange(detailItem, index)"
@@ -968,6 +973,15 @@ const taskTypeChange = (item, index) => {
   }
 }
 
+//搬空区域改变
+const doMoveAllChange = (e) => {
+  if (e === 1) {
+    formData.value.taskDetailList.forEach((item) => {
+      item.taskType = 1
+    })
+  }
+}
+
 //拼接的任务数量改变
 const montageNumberChange = (currentValue: number, oldValue: number) => {
   if (currentValue > oldValue) {
@@ -1007,8 +1021,11 @@ const doCycleChange = (e) => {
     formData.value.cycleNumber = 0
   } else {
     formData.value.cycleNumber = 1
+    formData.value.montageNumber = 1
     formData.value.taskDetailList = formData.value.taskDetailList.slice(0, 1)
-    formData.value.taskDetailList[0].taskType = 1
+    formData.value.taskDetailList.forEach((item) => {
+      item.taskType = 1
+    })
   }
 }