浏览代码

Merge remote-tracking branch 'origin/dev' into dev

zhangyihao 8 月之前
父节点
当前提交
5584433ae2
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 6 1
      src/views/emergencyCommandMap/MiddleSection.vue
  2. 2 1
      src/views/routineCommandMap/MiddleSection.vue

+ 6 - 1
src/views/emergencyCommandMap/MiddleSection.vue

@@ -2,7 +2,7 @@
   <div class="middle-section">
     <div class="search-button">
       <el-button type="primary" @click="handleQuery1">备战防御</el-button>
-      <el-button type="primary" @click="handleQuery2">指挥调度</el-button>
+      <el-button type="primary" :disabled="true" @click="handleQuery2">指挥调度</el-button>
     </div>
     <GlobalMap is-component width="3321" height="2140" />
   </div>
@@ -10,6 +10,11 @@
 
 <script lang="ts" setup>
 import GlobalMap from '@/views/globalMap/index.vue';
+import { useRouter } from 'vue-router';
+const router = useRouter();
+const handleQuery1 = () => {
+  router.push({ path: '/' });
+};
 </script>
 
 <style lang="scss" scoped>

+ 2 - 1
src/views/routineCommandMap/MiddleSection.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="middle-section">
     <div class="search-button">
-      <el-button type="primary" @click="handleQuery1">备战防御</el-button>
+      <el-button type="primary" @click="handleQuery1" :disabled="true">备战防御</el-button>
       <el-button type="primary" @click="handleQuery2">指挥调度</el-button>
     </div>
     <company-map v-model:visible="mapDialogVisible" @change="handleMapChange" />
@@ -22,6 +22,7 @@ const form = ref({
   lat: ''
 });
 const mapDialogVisible = ref(false);
+
 const handleQuery1 = () => {
   console.log('备战防御被点击');
 };