大屏合并

src/views/demo/tiankongdi/changearea/MapList/index.vue

@@ -286,7 +286,7 @@
       @cancel="showSplitPolygon = false"
     >
       <div class="modal-content" > 
-        <SplitPolygonModal v-if="showSplitPolygon" :showInfoData="showInfoData"  @closeModal="handlerSplitComplete"/>
+        <SplitPolygonModal  :showInfoData="showInfoData"  @closeModal="handlerSplitComplete"/>
       </div>
     </a-modal>
 
@@ -437,6 +437,7 @@ onMounted(() => {
   getInfoList();
 });
 
+const showSplitPolygon = ref(false);
 
 function handlerSplitComplete(){
   showSplitPolygon.value=false;
@@ -462,7 +463,6 @@ const getCollectList = () => {
   }
   getInfoList();
 };
-const showSplitPolygon = ref(false);
 const handlerRevertPolygon = (item)=>{
   Modal.confirm({
     title:'是否确认还原分割图斑?',
@@ -496,7 +496,6 @@ const handlerSplitPolygon = (item) => {
     }else{
       message.error("数据为空");
     }
-
   })
 }
 const dataListSort = (type) => {

src/views/demo/tiankongdi/curbspotcity/MapList/SplitPolygonModal/index.vue

@@ -6,12 +6,12 @@
         <MapboxMap
           :geomsList="geomsList"
           :mapConfig="mapConfig"
-          @handlerDrawComplete="handlerDrawComplete"
           @handlerSplitPolygon="handlerSplitPolygon"
           @mapOnLoad="onMapboxLoad"
           :splitPlugin="true"
           @onFeatureClick="onFeatureClick"
           ref="MapboxComponent"
+          v-if="mapshow"
         />
       </div>
 
@@ -62,7 +62,7 @@
                 </div>
               </a-descriptions-item>
               <a-descriptions-item label="接收人">{{ jieshou_people }}</a-descriptions-item>
-            <a-descriptions-item label="接收时间">{{ jieshou_time.split('.')[0] }}</a-descriptions-item>
+            <a-descriptions-item label="接收时间">{{ jieshou_time?.split('.')[0] }}</a-descriptions-item>
             </a-descriptions>
           </a-tab-pane>
           <a-tab-pane key="2" v-if="!['建设用地','推堆土'].includes(typename)" tab="线索填报" force-render>
@@ -489,6 +489,10 @@
   const activeKey = ref('1');
   const geomsList = ref()
 
+  const mapshow = ref<Boolean>(false);
+    onMounted(()=>{
+      mapshow.value = true
+    })
   const {
     id,
     case_no,
@@ -652,9 +656,6 @@
     return label;
   };
   function changeTask() {
-
-    
-
     if (props.showInfoData.geomid) {
       let getGeomPrams = {
         TableName: "drone_shp_data",
@@ -664,7 +665,6 @@
         limit: 999,
         key: null,
       };
-
       getGeom(getGeomPrams).then((res) => {
         let geoms = [];
         if (res) {

src/views/sys/exception/mapComponent/top_title.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="screen-header-container">
         <div class="screen-title">
+
             <img src="/public/statistical/logo.png" alt="" > {{t("sys.subject.header_title")}}</div>
           <span class="screen-currentTime"> 
             <span class="time">{{ currentTime }}</span>
@@ -19,12 +20,19 @@
                 @click="getHome(item)"
             >{{item.title}}</div>
         </div>
+        <div class="user-info">
+            <span style="color:#325E95;">{{fireUserLoginName}}</span>
+            &nbsp;
+            <span style="color:#ddd" @click="logout">退出</span>
+        </div>
     </div>
   </template>
   <script lang="ts" setup>
-    import { ref, defineEmits, onMounted, onUnmounted, watchEffect } from 'vue';
+
+    import { ref, defineEmits, onMounted, onUnmounted, watchEffect,h } from 'vue';
     import axios from 'axios';
     import dayjs from 'dayjs';
+
     import { useI18n } from '@/hooks/web/useI18n';
     const { t } = useI18n();
     import {message} from 'ant-design-vue'
@@ -34,8 +42,12 @@
     import { useUserStore } from '@/store/modules/user';
     const userStore = useUserStore();
     const router = useRouter();
+    import { useMessage } from '@/hooks/web/useMessage';
+    import { useMultipleTabStore } from '@/store/modules/multipleTab';
+    const { createConfirm } = useMessage();
+    const fireUserLoginName = ref<string>("");
 
-
+    fireUserLoginName.value = localStorage.getItem("fireUserLoginName")?localStorage.getItem("fireUserLoginName"):'';
     // emit
     const left_categorys = ref([])
     const right_categorys = ref([])
@@ -52,24 +64,37 @@
         })
     }
 
+    const tabStore = useMultipleTabStore();
+
+    function logout(){
+        createConfirm({
+        iconType: 'warning',
+        title: () => h('span', t('sys.navigation.logoutTip')),
+        content: () => h('span', t('sys.navigation.logoutMessage')),
+        onOk: async () => {
+            tabStore.resetState();
+            await router.replace(PageEnum.SUBJECT_HOME);
+        },
+        });
+    }
     async function getHome(item) {
         console.log(window.innerWidth);
         if (!item.isDevelop) {
-        message.warn(item.title + '系统暂未开放！');
-        return;
-        }
-        if (item.isExternal) {
-        if (item.linkOrApi) {
-            window.location.href = item.linkOrApi;
-        } else {
-            message.warn('系统外部链接未配置！');
+            message.warn(item.title + '系统暂未开放！');
             return;
         }
+        if (item.isExternal) {
+            if (item.linkOrApi) {
+                window.location.href = item.linkOrApi;
+            } else {
+                message.warn('系统外部链接未配置！');
+                return;
+            }
         } else {
-        if (!item.linkOrApi) {
-            item.linkOrApi = PageEnum.WELCOME_HOME;
-        }
-        userStore.setSubject(item.id, item.title, item.logoTitle, item.linkOrApi);
+            if (!item.linkOrApi) {
+                item.linkOrApi = PageEnum.WELCOME_HOME;
+            }
+            userStore.setSubject(item.id, item.title, item.logoTitle, item.linkOrApi);
         }
     }
 
@@ -197,6 +222,19 @@
                 position:relative;
             }
         }
+
+        .user-info{
+            width:120px;
+            color:#e1e1e1;
+            position:absolute;
+            top:40px;
+            right:120px;
+            font-size:14px;
+            &:hover{
+                cursor:pointer;
+                color:#8BE5EE;
+            }
+        }
     }
   </style>