Hwf 9 months ago
parent
commit
6b0c9bc493

+ 29 - 25
src/assets/styles/element-ui.scss

@@ -78,7 +78,8 @@
       padding: 0 !important;
       .el-dialog__title {
         color: rgba(0, 0, 0, 0.85) !important;
-        font-size: 14px !important;
+        font-size: 16px !important;
+        font-weight: bold;
       }
       .el-dialog__body {
         padding: 24px !important;
@@ -268,6 +269,18 @@
   }
 }
 
+.el-button--warning.is-link, .el-button--warning.is-plain, .el-button--warning.is-text {
+  color: #e6a23c !important;
+}
+.el-button--success.is-link.is-disabled, .el-button--success.is-link.is-disabled:active, .el-button--success.is-link.is-disabled:focus, .el-button--success.is-link.is-disabled:hover, .el-button--success.is-plain.is-disabled, .el-button--success.is-plain.is-disabled:active, .el-button--success.is-plain.is-disabled:focus, .el-button--success.is-plain.is-disabled:hover, .el-button--success.is-text.is-disabled, .el-button--success.is-text.is-disabled:active, .el-button--success.is-text.is-disabled:focus, .el-button--success.is-text.is-disabled:hover {
+  color: #b3e19d !important;
+}
+.el-button--success.is-link, .el-button--success.is-plain, .el-button--success.is-text {
+  color: #67c23a !important;
+}
+.el-button--danger.is-link.is-disabled:active, .el-button--danger.is-link.is-disabled:focus, .el-button--danger.is-link.is-disabled:hover, .el-button--danger.is-plain.is-disabled:active, .el-button--danger.is-plain.is-disabled:focus, .el-button--danger.is-plain.is-disabled:hover, .el-button--danger.is-text.is-disabled:active, .el-button--danger.is-text.is-disabled:focus, .el-button--danger.is-text.is-disabled:hover {
+  color: #F90000 !important;
+}
 .el-button.is-plain {
   background-color: transparent !important;
 }
@@ -291,43 +304,47 @@
 .el-button.el-button--danger.is-plain {
   color: #FF2F3C !important;
   &:hover {
-    background-color: #f2dfe1 !important;
-    color: #f90000 !important;
+    background-color: rgba(255, 47, 60, 0.1) !important;
+    border: 1px solid #FF2F3C !important;
   }
   &:active {
-    background-color: #f4cbcf !important;
+    border: 1px solid #FF2F3C !important;
+    background-color: rgba(255, 47, 60, 0.2) !important;
   }
   &:disabled {
-    border: 1px solid #f0cfd1 !important;
-    background-color: #f0cfd1 !important;
+    color: rgba(255, 47, 60, 0.3) !important;
+    border: 1px solid rgba(255, 47, 60, 0.3) !important;
+    background-color: rgba(255, 47, 60, 0.3) !important;
   }
 }
 .el-button.el-button--success.is-plain {
   color: #40c75f !important;
   &:hover {
-    background-color: #deeee5 !important;
+    background-color: rgba(64, 199, 95, 0.1) !important;
     color: #40C75F !important;
   }
   &:active {
     background-color: #ceead6 !important;
   }
   &:disabled {
-    border: 1px solid #d2ebd9 !important;
-    background-color: #d2ebd9 !important;
+    color: rgba(64, 199, 95, 0.3) !important;
+    border: 1px solid rgba(138, 213, 155, 0.3) !important;
+    background-color: rgba(64, 199, 95, 0.3) !important;
   }
 }
 .el-button.el-button--warning.is-plain {
   color: #FFAF00 !important;
   &:hover {
-    background-color: #f2ecdb !important;
+    background-color: rgba(255, 175, 0, 0.1) !important;
     color: #FFAF00 !important;
   }
   &:active {
     background-color: #f4e5c3 !important;
   }
   &:disabled {
-    border: 1px solid #eee5cd !important;
-    background-color: #eee5cd !important;
+    color: rgba(255, 175, 0, 0.7) !important;
+    border: 1px solid rgba(230, 194, 115, 0.3) !important;
+    background-color: rgba(255, 175, 0, 0.3) !important;
   }
 }
 
@@ -418,16 +435,3 @@
 .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label:before {
   margin-right: 0 !important;
 }
-
-.el-button--warning.is-link, .el-button--warning.is-plain, .el-button--warning.is-text {
-  color: #e6a23c !important;
-}
-.el-button--success.is-link.is-disabled, .el-button--success.is-link.is-disabled:active, .el-button--success.is-link.is-disabled:focus, .el-button--success.is-link.is-disabled:hover, .el-button--success.is-plain.is-disabled, .el-button--success.is-plain.is-disabled:active, .el-button--success.is-plain.is-disabled:focus, .el-button--success.is-plain.is-disabled:hover, .el-button--success.is-text.is-disabled, .el-button--success.is-text.is-disabled:active, .el-button--success.is-text.is-disabled:focus, .el-button--success.is-text.is-disabled:hover {
-  color: #b3e19d !important;
-}
-.el-button--success.is-link, .el-button--success.is-plain, .el-button--success.is-text {
-  color: #67c23a !important;
-}
-.el-button--danger.is-link.is-disabled:active, .el-button--danger.is-link.is-disabled:focus, .el-button--danger.is-link.is-disabled:hover, .el-button--danger.is-plain.is-disabled:active, .el-button--danger.is-plain.is-disabled:focus, .el-button--danger.is-plain.is-disabled:hover, .el-button--danger.is-text.is-disabled:active, .el-button--danger.is-text.is-disabled:focus, .el-button--danger.is-text.is-disabled:hover {
-  color: #F90000 !important;
-}

+ 2 - 0
src/assets/styles/index.scss

@@ -466,6 +466,8 @@ aside {
 
 .common-back-box {
   cursor: pointer;
+  color: rgba(0, 0, 0, 0.45);
+  font-size: 14px;
   .common-back {
     width: 13px;
     height: 10px;

+ 61 - 15
src/assets/styles/sidebar.scss

@@ -78,14 +78,6 @@
       text-overflow: ellipsis !important;
       white-space: nowrap !important;
     }
-    .el-menu-item, .el-sub-menu {
-      &:hover {
-        background-color: #2c81ff !important;
-        .el-sub-menu__title {
-          color: #ffffff !important;
-        }
-      }
-    }
     .el-menu-item.is-active {
       background-color: #2c81ff;
       position: relative;
@@ -137,19 +129,42 @@
     .sub-menu-title-noDropdown,
     .el-sub-menu__title {
       &:hover {
-        background-color: rgba(0, 0, 0, 0.05) !important;
+        color: #fff;
+        background-color: #2c81ff !important;
+        position: relative;
+        &::before {
+          content: '';
+          width: 4px;
+          height: 100%;
+          background-color: #fff;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
       }
     }
 
     & .theme-dark .is-active > .el-sub-menu__title {
       color: $base-menu-color-active !important;
     }
-
     & .nest-menu .el-sub-menu > .el-sub-menu__title,
     & .el-sub-menu .el-menu-item {
       min-width: $base-sidebar-width !important;
       &:hover {
-        background-color: rgba(0, 0, 0, 0.1) !important;
+        position: relative;
+        background-color: #2c81ff !important;
+        .el-sub-menu__title, .menu-title {
+          color: #ffffff !important;
+        }
+        &::before {
+          content: '';
+          width: 4px;
+          height: 100%;
+          background-color: #fff;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
       }
     }
 
@@ -158,27 +173,58 @@
       background-color: $base-sub-menu-background !important;
 
       &:hover {
-        background-color: $base-sub-menu-hover !important;
+        position: relative;
+        background-color: #2c81ff !important;
         color: #fff;
+        &::before {
+          content: '';
+          width: 4px;
+          height: 100%;
+          background-color: #fff;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
       }
     }
     & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
     & .theme-dark .el-sub-menu .el-menu-item.is-active {
-      background-color: $base-sub-menu-hover !important;
+      background-color: #2c81ff !important;
     }
 
     & .theme-dark .nest-menu .el-sub-menu > .el-sub-menu__title,
     & .theme-dark .el-menu-item {
       &:hover {
         // you can use $sub-menuHover
-        background-color: $base-menu-hover !important;
+        position: relative;
+        background-color: #2c81ff !important;
+        &::before {
+          content: '';
+          width: 4px;
+          height: 100%;
+          background-color: #fff;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
       }
     }
     & .nest-menu .el-sub-menu > .el-sub-menu__title,
     & .el-menu-item {
       &:hover {
         // you can use $sub-menuHover
-        background-color: rgba(0, 0, 0, 0.04) !important;
+        position: relative;
+        background-color: #2c81ff !important;
+        color: #ffffff;
+        &::before {
+          content: '';
+          width: 4px;
+          height: 100%;
+          background-color: #fff;
+          position: absolute;
+          top: 0;
+          left: 0;
+        }
       }
     }
   }

+ 1 - 1
src/layout/components/TagsView/index.vue

@@ -250,7 +250,7 @@ onMounted(() => {
       line-height: 26px;
       background-color: var(--el-bg-color);
       color: #495060;
-      font-size: 12px;
+      font-size: 14px;
       margin-left: 15px;
       margin-top: 4px;
       &:hover {

+ 2 - 8
src/types/components.d.ts

@@ -14,23 +14,17 @@ declare module 'vue' {
     BuildCode: typeof import('./../components/BuildCode/index.vue')['default']
     ChunkUpload: typeof import('./../components/ChunkUpload/index.vue')['default']
     CompanyMap: typeof import('./../components/Map/company-map.vue')['default']
-    Contact: typeof import('./../components/Contact/index.vue')['default']
     ContactSelect: typeof import('./../components/ContactSelect/index.vue')['default']
     DictTag: typeof import('./../components/DictTag/index.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     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']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -59,10 +53,10 @@ declare module 'vue' {
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']

+ 3 - 2
src/views/duty/eventing/eventDetails.vue

@@ -18,7 +18,7 @@
           <i class="command-icon" />
           开始指挥
         </el-button>
-        <el-button type="danger" plain :disabled="detailData.event_status != '2'" @click="handleCloseEvent">
+        <el-button v-if="['0', '1'].includes(detailData.event_status)" type="danger" plain @click="handleCloseEvent">
           <i class="close-icon" />
           关闭事件
         </el-button>
@@ -169,6 +169,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { mm_event_type, mm_event_level, mm_event_state, region } = toRefs<any>(
   proxy?.useDict('mm_event_type', 'mm_event_level', 'mm_event_state', 'region')
 );
+const emits = defineEmits(['close']);
 
 // 事件等级数据
 let eventLevelState = reactive({
@@ -213,7 +214,7 @@ let eventTrackState = reactive({
 });
 // 返回上一级
 const handleBack = () => {
-  router.go(-1);
+  emits('close');
 };
 
 const detailData = ref({

+ 4 - 1
src/views/duty/eventing/index.vue

@@ -128,7 +128,7 @@
       />
     </div>
     <EventEditDialog v-model="eventEditDialogState.show" :title="eventEditDialogState.title" :event-id="eventId" @get-list="getList" />
-    <EventDetails v-if="eventDetailsState.show" :eventId="eventDetailsState.eventId" />
+    <EventDetails v-if="eventDetailsState.show" :eventId="eventDetailsState.eventId" @close="handleEventDetailsClose" />
   </div>
 </template>
 
@@ -325,6 +325,9 @@ const getStatusClass2 = (value) => {
     return 'dot-grey';
   }
 };
+const handleEventDetailsClose = () => {
+  eventDetailsState.show = false;
+};
 onMounted(() => {
   getList();
 });