修复bug

.env.development

@@ -6,6 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 VITE_APP_BASE_API = 'http://10.181.7.236:9988'
+VITE_APP_BASE_API2 = 'http://10.181.7.235/'
 VITE_APP_BASE_DOWNLOAD_API = '/file/download/'
 # VITE_APP_BASE_API = 'http://127.0.0.1:9988'
 

.env.production

@@ -15,6 +15,7 @@ VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
 VITE_APP_BASE_API = ''
+VITE_APP_BASE_API2 = '/'
 VITE_APP_BASE_DOWNLOAD_API = '/file/download/'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli

src/assets/styles/index.scss

@@ -535,14 +535,6 @@ aside {
   display: inline-block;
 }
 
-::-webkit-scrollbar-thumb {
-  background-color: #227dfe !important;
-}
-
-::-webkit-scrollbar-track {
-  background-color: transparent !important;
-}
-
 .common-btn-primary {
   width: 212px;
   height: 136px;

src/assets/styles/sidebar.scss

@@ -16,9 +16,9 @@
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
     height: 100%;
-    position: absolute;
+    position: fixed;
     font-size: 0;
-    top: 0;
+    top: 50px;
     bottom: 0;
     left: 0;
     z-index: 1001;

src/components/Dialog/index.vue

@@ -116,14 +116,14 @@ const confirm = () => {
     line-height: 135px;
     padding: 0 40px;
     .dialog-title {
-      width: 865px;
+      width: 500px;
       color: transparent;
       background-image: linear-gradient(to bottom, #ffffff 30%, #edf7fe 50%, #5cc4fa 70%, #40a2e7 100%);
       -webkit-background-clip: text;
       background-clip: text;
       display: inline-block;
       font-family: 'YouSheBiaoTiHei';
-      font-size: 84px;
+      font-size: 24px;
       padding-left: 25px;
     }
     .dialog-close {

src/layout/components/AppMain.vue

@@ -42,10 +42,10 @@ watch(
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  height: calc(100vh - 50px);
   width: 100%;
   position: relative;
-  overflow: hidden;
+  overflow: auto;
 }
 
 .fixed-header + .app-main {
@@ -55,7 +55,7 @@ watch(
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    height: calc(100vh - 84px);
   }
 
   .fixed-header + .app-main {

src/router/index.ts

@@ -62,11 +62,6 @@ export const constantRoutes: RouteRecordRaw[] = [
     component: () => import('@/views/error/401.vue'),
     hidden: true
   },
-  {
-    path: '/test',
-    component: () => import('@/views/emergencyCommandMap/index.vue'),
-    hidden: true
-  },
   {
     path: '',
     component: Layout,

src/types/components.d.ts

@@ -22,7 +22,6 @@ declare module 'vue' {
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -38,6 +37,7 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
@@ -50,8 +50,10 @@ declare module 'vue' {
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+    ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
+    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -73,16 +75,20 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
     Index2: typeof import('./../components/Dialog/index2.vue')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
+    Map: typeof import('./../components/Map/index.vue')['default']
     ModalVideo: typeof import('./../components/HKVideo/modal-video.vue')['default']
     MultiInstanceUser: typeof import('./../components/Process/multiInstanceUser.vue')['default']
     Pagination: typeof import('./../components/Pagination/index.vue')['default']
     ParentView: typeof import('./../components/ParentView/index.vue')['default']
+    QuickZoom: typeof import('./../components/Map/quickZoom.vue')['default']
     Render: typeof import('./../components/BuildCode/render.vue')['default']
     RightToolbar: typeof import('./../components/RightToolbar/index.vue')['default']
     RoleSelect: typeof import('./../components/RoleSelect/index.vue')['default']
@@ -93,11 +99,13 @@ declare module 'vue' {
     Step: typeof import('./../components/Step/index.vue')['default']
     SubmitVerify: typeof import('./../components/Process/submitVerify.vue')['default']
     SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
+    TimeAxis: typeof import('./../components/TimeAxis/index.vue')['default']
     TopNav: typeof import('./../components/TopNav/index.vue')['default']
     TreeSelect: typeof import('./../components/TreeSelect/index.vue')['default']
     UserSelect: typeof import('./../components/UserSelect/index.vue')['default']
     VideoContainer: typeof import('./../components/HKVideo/video-container.vue')['default']
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
+    YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
   export interface ComponentCustomProperties {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']

src/views/emergencyCommandMap/MiddleSection.vue

@@ -27,35 +27,33 @@ const handleQuery1 = () => {
 }
 .btn-box {
   position: absolute;
-  top: 60px;
-  left: 940px;
+  top: 15px;
+  left: 325px;
   z-index: 10;
   display: flex;
   align-items: center;
   .btn,
   .btn-active {
-    width: 454px;
-    height: 176px;
+    width: 93px;
+    height: 36px;
     cursor: pointer;
     display: flex;
     align-items: center;
     justify-content: center;
     color: #fafdf9;
-    font-size: 78px;
+    font-size: 18px;
     font-family: YouSheBiaoTiHei;
+    background-repeat: no-repeat;
     background-size: 100% 100%;
   }
   .btn {
-    background: url('@/assets/images/btn.png') no-repeat;
-    background-size: 100% 100%;
+    background-image: url('@/assets/images/btn.png');
     &:hover {
-      background: url('@/assets/images/btnActive.png') no-repeat;
-      background-size: 100% 100%;
+      background-image: url('@/assets/images/btnActive.png');
     }
   }
   .btn-active {
-    background: url('@/assets/images/btnActive.png') no-repeat;
-    background-size: 100% 100%;
+    background-image: url('@/assets/images/btnActive.png');
   }
 }
 

src/views/emergencyCommandMap/RightSection/JointDuty.vue

@@ -31,7 +31,7 @@
     <div style="display: flex; flex-direction: column; justify-content: center; align-items: center; width: 100%; height: 100%">
       <div id="qrCodeBox" style="display: flex; flex-direction: column; justify-content: center; align-items: center">
         <div class="print-title" style="margin: 30px 0; color: #ffffff">请联合值守人员通过粤政易扫描二维码进行签到、签退</div>
-        <img :src="qrCodeUrl" alt="" style="width: 800px; height: 800px" />
+        <img :src="qrCodeUrl" alt="" style="width: 300px; height: 300px" />
       </div>
       <div class="flex" style="margin-top: 20px">
         <div class="common-btn-primary" v-print="printObj">打印</div>
@@ -239,4 +239,7 @@ onMounted(() => {
     }
   }
 }
+.print-title {
+  font-size: 16px;
+}
 </style>

src/views/emergencyCommandMap/index.vue

@@ -4,10 +4,10 @@
       <HeaderSection />
       <div class="dashboard-content">
         <LeftSection v-show="showLeftSection" />
-<!--        <MiddleSection>-->
-<!--          <i :class="showLeftSection ? 'arrow-icon left-icon' : 'arrow-icon right-icon'" @click="handleTelescoping('left')" />-->
-<!--          <i :class="showRightSection ? 'arrow-icon2 right-icon' : 'arrow-icon2 left-icon'" @click="handleTelescoping('right')" />-->
-<!--        </MiddleSection>-->
+        <MiddleSection>
+          <i :class="showLeftSection ? 'arrow-icon left-icon' : 'arrow-icon right-icon'" @click="handleTelescoping('left')" />
+          <i :class="showRightSection ? 'arrow-icon2 right-icon' : 'arrow-icon2 left-icon'" @click="handleTelescoping('right')" />
+        </MiddleSection>
         <RightSection v-show="showRightSection" />
       </div>
       <FooterSection style="position: absolute; bottom: 0; left: 0" />
@@ -112,4 +112,11 @@ onUnmounted(() => {
   height: 57px;
   cursor: pointer;
 }
+::-webkit-scrollbar-thumb {
+  background-color: #227dfe !important;
+}
+
+::-webkit-scrollbar-track {
+  background-color: transparent !important;
+}
 </style>

src/views/routineCommandMap/index.vue

@@ -113,4 +113,11 @@ onUnmounted(() => {
   height: 57px;
   cursor: pointer;
 }
+::-webkit-scrollbar-thumb {
+  background-color: #227dfe !important;
+}
+
+::-webkit-scrollbar-track {
+  background-color: transparent !important;
+}
 </style>

src/views/system/dept/index.vue

@@ -58,20 +58,20 @@
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         :default-expand-all="isExpandAll"
       >
-        <el-table-column prop="deptName" align="center" label="部门名称" width="360"></el-table-column>
+        <el-table-column prop="deptName" align="center" label="部门名称"></el-table-column>
         <el-table-column prop="deptCategory" align="center" label="类别编码" width="300"></el-table-column>
-        <el-table-column prop="orderNum" align="center" label="排序" width="200"></el-table-column>
+        <el-table-column prop="orderNum" align="center" label="排序" width="50"></el-table-column>
         <el-table-column prop="status" align="center" label="状态" width="160">
           <template #default="scope">
             <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="260">
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
           <template #default="scope">
             <el-text v-hasPermi="['system:menu:edit']" class="common-btn-text-primary" @click="handleUpdate(scope.row)">修改</el-text>
             <el-text v-hasPermi="['system:menu:add']" class="common-btn-text-primary" @click="handleAdd(scope.row)">新增</el-text>