Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/renderer/src/views/components/headers/components/setPup/components/engineering.vue

@@ -209,7 +209,7 @@ const routeImport = () => {
     filters: [
       {
         name: '路网', //、底图
-        extensions: ['pbf']
+        extensions: ['pbf', 'pbfl']
       }
     ]
   }

src/renderer/src/views/components/headers/components/setPup/setPup.vue

@@ -141,7 +141,6 @@ const activeName = ref('authorize')
 const isShowPup = ref(false)
 const open = (data) => {
   isShowPup.value = true
-  console.log(data, 'kkkkkkkk')
   if (data !== 'current') {
     //如果不是传curent打开就回到第一个tab
     activeName.value = 'authorize'
@@ -159,7 +158,6 @@ const changeTab = (x, j) => {
     default:
       break
   }
-  console.log(x, j, 'activeName.value')
 }
 const close = () => {
   isShowPup.value = false

src/renderer/src/views/components/headers/components/setTool/setTool.vue

@@ -13,10 +13,18 @@
         </div>
       </div>
     </div> -->
-    <el-tooltip v-for="(item, i) of setList" :key="item.id" :content="t('iconTitle.' + item.name)" effect="customized"
+    <el-tooltip
-      :hide-after="0">
+      v-for="(item, i) of setList"
-      <div class="set_item" :class="{ 'last-item': i === setList.length - 1, 'first-item': i === 0 }"
+      :key="item.id"
-        @click="item.callback">
+      :content="t('iconTitle.' + item.name)"
+      effect="customized"
+      :hide-after="0"
+    >
+      <div
+        class="set_item"
+        :class="{ 'last-item': i === setList.length - 1, 'first-item': i === 0 }"
+        @click="item.callback"
+      >
         <svg-icon :name="item.icon" :size="20"></svg-icon>
       </div>
     </el-tooltip>
@@ -65,8 +73,10 @@ const logout = async (e) => {
         // localStorage.clear()
       }
     })
-    .catch(() => {
+    .catch(() => {})
-    })
+}
+const openSet = () => {
+  setPupRef.value?.open()
 }
 
 const fullScreen = (item) => {
@@ -96,7 +106,8 @@ const setList = ref([
     name: 'set',
     className: 'header_public',
     dbcallback: null,
-    callback: setShow
+    // callback: setShow
+    callback: openSet
   },
   {
     id: 2,
@@ -126,7 +137,7 @@ const setList = ref([
     callback: (e) => {}
     //   dbcallback: this.flyTo,
     //   callback: this.locate,
-  },
+  }
 ])
 
 ipcRenderer.invoke('getIsFullScreen').then((res) => {
@@ -171,10 +182,12 @@ ipcRenderer.on('fullscreen-status-changed', (event, isFullscreen) => {
     top: 0;
     bottom: 0;
     width: 1px;
-    background: linear-gradient(180deg,
+    background: linear-gradient(
+      180deg,
       rgba(var(--color-base1), 0),
       rgba(var(--color-base1), 1),
-        rgba(204, 204, 204, 0));
+      rgba(204, 204, 204, 0)
+    );
   }
 
   .set_item.first-item::after {