"回滚代码"

src/renderer/src/I18n/zh-CN.ts

@@ -9,7 +9,8 @@ export default {
   },
   btn: {
     search: '搜索',
-    treePlaceholder: '关键词搜索',
+    treePlaceholder: '请输入所需查找的地点',
+    treeLayerholder: '请输入图层名称',
     selectPlaceholder: '请选择',
     selectNoText: '无数据',
     confirm: '确定'

src/renderer/src/views/TS/index.vue

@@ -1,379 +0,0 @@
-<template>
-  <div class="index">
-    <!--<span @click="back">态势</span>-->
-    <div class="titles">实景三维态势推演系统</div>
-    <svg class="icon icon-top" aria-hidden="true">
-      <use xlink:href="#icon-top"></use>
-    </svg>
-    <svg class="icon icon-tuichudenglu" @click="back" aria-hidden="true">
-      <use xlink:href="#icon-tuichudenglu"></use>
-    </svg>
-    <div class="list-container">
-      <div class="sub-title">
-        <span>历史推演</span>
-        <svg class="icon icon-title" aria-hidden="true">
-          <use xlink:href="#icon-title"></use>
-        </svg>
-      </div>
-      <div class="search">
-        <span
-          >推演名称
-          <el-input
-            v-model="searchParams.name"
-            style="width: 240px"
-            placeholder="请输入推演名称"
-            clearable
-        /></span>
-        <span
-          >创建人
-          <el-input
-            v-model="searchParams.create_by"
-            style="width: 240px"
-            placeholder="请输入创建人姓名"
-            clearable
-        /></span>
-        <span
-          >创建时间
-          <el-date-picker
-            v-model="searchParams.datetime"
-            type="datetimerange"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            format="YYYY-MM-DD HH:mm:ss"
-            date-format="YYYY-MM-DD ddd"
-            time-format="A hh:mm:ss"
-            value-format="x"
-        /></span>
-        <el-button @click="search">搜索</el-button>
-        <el-button @click="reset">重置</el-button>
-      </div>
-      <div class="option">
-        <el-button :icon="CirclePlus">新建推演</el-button>
-        <el-button :icon="Download">导入</el-button>
-        <el-button :icon="Upload">导出</el-button>
-      </div>
-      <div class="tableBox">
-        <el-table
-          :data="tableData"
-          :default-sort="{ prop: 'date', order: 'descending' }"
-          style="width: 100%"
-        >
-          <el-table-column align="center" prop="name" label="推演名称" />
-          <el-table-column align="center" prop="description" label="推演描述" />
-          <el-table-column align="center" prop="create_by" label="创建人" />
-          <el-table-column align="center" prop="date" label="创建日期" sortable />
-          <el-table-column align="center" label="操作">
-            <template #default="scope">
-              <el-button text size="small" type="primary" :icon="Edit" @click="toTSEdit"
-                >编辑</el-button
-              >
-              <el-button text size="small" type="primary" :icon="Delete">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <!--        <el-auto-resizer>
-                  <template #default="{ height, width }">
-                    <el-table-v2
-                      :sort-by="sortState"
-                      :columns="columns"
-                      :data="data"
-                      :width="width"
-                      :height="height"
-                      fixed
-                      @column-sort="onSort"
-                    />
-                  </template>
-                </el-auto-resizer>-->
-      </div>
-      <!--      <div class="pageBox">
-
-              <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
-                             :page-sizes="[5, 10, 50, 100]" :page-size="pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="total">
-              </el-pagination>
-            </div>-->
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-//@ts-nocheck
-import { ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { Delete, Edit, CirclePlus, Download, Upload } from '@element-plus/icons-vue'
-import { TableV2SortOrder } from 'element-plus'
-import type { SortBy } from 'element-plus'
-
-const { ipcRenderer } = require('electron')
-const router = useRouter()
-let searchParams = ref({
-  name: '',
-  create_by: '',
-  datetime: ''
-})
-
-let pageSize = ref(5)
-let pageNum = ref(1)
-let total = ref(0)
-const back = () => {
-  ipcRenderer.send('toggle-fullscreen', false)
-  router.push({ path: '/home' })
-}
-const handleSizeChange = (val) => {
-  pageSize = val
-  getList()
-}
-const handleCurrentChange = (val) => {
-  pageNum = val
-  getList()
-}
-const getList = () => {
-  console.log(pageSize, pageNum)
-}
-const tableData: User[] = [
-  {
-    date: '2016-05-03',
-    name: '测试',
-    description: '这是一个方案描述',
-    create_by: 'admin'
-  },
-  {
-    date: '2016-05-02',
-    name: '协同方案',
-    description: '这是一个方案描述',
-    create_by: 'admin'
-  },
-  {
-    date: '2016-05-04',
-    name: '1990',
-    description: '这是一个方案描述',
-    create_by: 'admin'
-  },
-  {
-    date: '2016-05-01',
-    name: '2025',
-    description: '这是一个方案描述',
-    create_by: 'admin'
-  }
-]
-const search = () => {
-  console.log(searchParams)
-}
-const reset = () => {
-  searchParams.value = { name: '', create_by: '', datetime: '' }
-}
-const toTSEdit = () => {
-  router.push({ path: '/tsEdit' })
-}
-/*
-const generateData = (
-  columns: ReturnType<typeof generateColumns>,
-  length = 200,
-  prefix = 'row-'
-) =>
-  Array.from({length}).map((_, rowIndex) => {
-    return columns.reduce(
-      (rowData, column, columnIndex) => {
-        rowData[column.dataKey] = `Row ${rowIndex} - Col ${columnIndex}`
-        return rowData
-      },
-      {
-        id: `${prefix}${rowIndex}`,
-        parentId: null,
-      }
-    )
-  })
-const generateColumns = (length = 10, prefix = 'column-', props?: any) =>
-  Array.from({length}).map((_, columnIndex) => ({
-    ...props,
-    key: `${prefix}${columnIndex}`,
-    dataKey: `${prefix}${columnIndex}`,
-    title: `Column ${columnIndex}`,
-    width: 150,
-  }))
-const columns = generateColumns(3)
-const sortState = ref<SortBy>({
-  key: 'column-0',
-  order: TableV2SortOrder.ASC,
-})
-
-let data = generateData(columns, 10)
-console.log(data)
-console.log(columns)
-columns[0].sortable = true
-const onSort = (sortBy: SortBy) => {
-  console.log(sortBy)
-  data = data.reverse()
-  sortState.value = sortBy
-}
-*/
-</script>
-
-<style lang="scss" scoped>
-.index {
-  background: url('../../assets/img/bkgif@3x.gif') no-repeat;
-  background-size: 100% 100%;
-  width: 100vw;
-  height: 100vh !important;
-  position: relative;
-
-  .titles {
-    left: 50%;
-    transform: translateX(-50%);
-    font-size: 40px;
-    top: 19px;
-    line-height: 50px;
-    font-family: 'alimamashuheiti';
-    z-index: 999;
-    position: absolute;
-    color: #fff;
-  }
-
-  .icon-top {
-    width: 100%;
-    height: 95px;
-    top: 0;
-    left: 0;
-    z-index: 99;
-    position: absolute;
-  }
-
-  .icon-tuichudenglu {
-    cursor: pointer;
-    position: absolute;
-    z-index: 999;
-    width: 26px;
-    height: 26px;
-    right: 8px;
-    top: 8px;
-  }
-
-  .list-container {
-    border: 1px solid rgba(var(--color-base1), 1);
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: 80vw;
-    height: 72vh;
-    display: flex;
-    flex-direction: column;
-    background:
-      linear-gradient(180deg, rgba(var(--color-base1), 0.2) 0%, rgba(var(--color-base1), 0) 100%),
-      rgba(0, 0, 0, 0.6);
-    border-image: linear-gradient(137.95deg, rgba(var(--color-base1), 1) 6.25%, var(--color-border1) 100%)
-      2;
-    backdrop-filter: blur(2px);
-
-    & > div {
-      padding: 10px 0;
-      margin: 0 auto;
-      width: 95%;
-      //border: 1px solid;
-      box-sizing: content-box;
-    }
-
-    .sub-title {
-      font-size: 32px;
-      width: 15.4350566864vw;
-      height: 4.0740740741vh;
-      //padding: vh(20);
-      position: relative;
-
-      span {
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%, -50%);
-        //font-family: W7;
-        user-select: none;
-      }
-
-      .icon-title {
-        width: 15.4350566864vw;
-        height: 4.0740740741vh;
-      }
-    }
-
-    .search {
-      span {
-        margin-right: 10px;
-      }
-    }
-
-    .tableBox {
-      flex: auto;
-    }
-  }
-}
-
-//将表格所有的背景色都改为透明色，字体改为白色
-:deep(.el-table),
-:deep(.el-table tr),
-:deep(.el-table .el-table__cell) {
-  background-color: transparent;
-  color: #fff;
-}
-
-//表格行hover和表头的背景色
-:deep(.el-table__header-wrapper),
-:deep(.el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell) {
-  background-color: rgba(var(--color-base1), 0.2);
-}
-
-:deep(.el-button) {
-  color: #fff;
-}
-
-:deep(.el-button:not(.is-text)) {
-  border: 1px solid rgba(var(--color-base1), 1);
-  background: rgba(var(--color-base1), 0.2);
-}
-
-:deep(.el-button:hover) {
-  color: rgba(var(--color-base1), 1);
-  //background-color: transparent !important;
-  background: rgba(var(--color-base1), 0.2) !important;
-}
-
-:deep(.el-input__wrapper),
-:deep(.el-range-input),
-:deep(.el-range-separator) {
-  background: transparent;
-  --el-input-placeholder-color: #fff;
-  --el-text-color-placeholder: #fff;
-  color: #fff;
-}
-
-:deep(.el-input__inner:focus) {
-  border-color: #f00;
-}
-
-:deep(.el-table__inner-wrapper:before) {
-  background: transparent;
-}
-
-:deep(.el-table__header-wrapper .el-table__cell) {
-  border-bottom: none !important;
-}
-
-:deep(.el-table__row .el-table__cell) {
-  border-bottom: 1px solid rgba(152, 152, 152, 0.5);
-}
-
-/*
-表格V2
-:deep(.el-table-v2__main) {
-background-color: transparent;
- }
-
-:deep(.el-table-v2__header-cell) {
-  background-color: transparent;
-  color: #fff;
-}
-
-:deep(.el-table-v2__header-wrapper) {
-  background-color: rgba(var(--color-base1), 0.2);
-}*/
-</style>

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

@@ -240,11 +240,29 @@ const poiImport = () => {
         path: path[0]
       }).then((res) => {
         if (res.code === 200) {
+          PoiApi.getPoiList().then((list) => {
+            poiList.splice(0, poiList.length, ...list.data)
+            //只有一个poi时默认启用
+            if (poiList.length == 1) {
+
+              let formData = new FormData()
+              formData.append('id', poiList[0].id)
+              PoiApi.enablePoi(formData).then((res) => {
+                if (res.code === 200) {
+                  ElMessage({
+                    message: '上传并启用成功',
+                    type: 'success'
+                  })
+                  getPoiList()
+                }
+              })
+            } else {
               ElMessage({
                 message: '上传成功',
                 type: 'success'
               })
-          getPoiList()
+            }
+          })
         }
       })
     }

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

@@ -8,7 +8,7 @@
       <div class="seting_content">
         <!-- 语言设置 -->
         <div class="detailSkin">
-          <span>{{ t('systemSetting.setLanguage') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.setLanguage') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.language"
@@ -22,7 +22,7 @@
         <!-- 主题色 -->
         <div class="detailSkin"></div>
         <div class="detailSkin">
-          <span>{{ t('systemSetting.theme') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.theme') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.skinInfo"
@@ -48,7 +48,7 @@
       <div class="seting_content">
         <!-- 坐标系 -->
         <div class="detailSkin">
-          <span>{{ t('systemSetting.coordinateSystem') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.coordinateSystem') }}</span>
           <!-- <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -126,7 +126,7 @@
         </div>
         <div class="detailSkin"></div>
         <div class="detailSkin" v-show="showPosiType">
-          <span>{{ t('systemSetting.latitude') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.latitude') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.positionType"
@@ -151,7 +151,7 @@
       </div>
       <div class="seting_content1">
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.lengthUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.lengthUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -169,7 +169,7 @@
         </div>
         <div class="detailSkin1"></div>
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.areaUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.areaUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -186,7 +186,7 @@
           </el-select>
         </div>
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.heightUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.heightUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -204,7 +204,7 @@
         </div>
         <div class="detailSkin1"></div>
         <div class="detailSkin1">
-          <span>{{ t('systemSetting.speedUnit') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.speedUnit') }}</span>
           <el-select
             style="width: 175px"
             v-model="systemSetting.coordinate"
@@ -229,21 +229,21 @@
       </div>
       <div class="seting_switch">
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.defaultViewLabel') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.defaultViewLabel') }}</span>
           <el-button @click="setView"
             ><svg-icon name="sitting" :size="12" style="margin-right: 5px"></svg-icon>
             {{ t('systemSetting.defaultView') }}</el-button
           >
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.defaultDataLabel') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.defaultDataLabel') }}</span>
           <el-button color="#005c5c" @click="setData"
             ><svg-icon name="add" :size="12" style="margin-right: 5px"></svg-icon
             >{{ t('systemSetting.defaultData') }}</el-button
           >
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.management') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.management') }}</span>
           <el-button color="#005c5c" @click="intoBack"
             ><svg-icon name="out_login" :size="12" style="margin-right: 5px"></svg-icon
             >{{ t('systemSetting.intoBack') }}</el-button
@@ -252,7 +252,7 @@
       </div>
       <div class="seting_content1">
         <div class="detailSkin1">
-          <span>{{ t('searchWay.title') }}：</span>
+          <span class="titleLabel">{{ t('searchWay.title') }}</span>
           <el-select
             style="width: 150px"
             v-model="searchWay"
@@ -270,7 +270,7 @@
         </div>
         <div class="detailSkin1"></div>
         <div class="detailSkin1">
-          <span>{{ t('ConcurrencyControl') }}：</span>
+          <span class="titleLabel">{{ t('ConcurrencyControl') }}</span>
           <el-select
             style="width: 150px"
             v-model="concurrentcode"
@@ -289,7 +289,7 @@
       </div>
       <div class="seting_switch">
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showCompass') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showCompass') }}</span>
           <el-switch
             @change="sysChange"
             v-model="systemSetting.showCompass"
@@ -301,7 +301,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showToolBar') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showToolBar') }}</span>
           <el-switch
             @change="sysChange"
             v-model="systemSetting.showToolBar"
@@ -313,7 +313,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showDistanceLegend') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showDistanceLegend') }}</span>
           <el-switch
             @change="sysChange"
             v-model="systemSetting.showDistanceLegend"
@@ -325,7 +325,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showMapX') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showMapX') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -339,7 +339,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showFPS') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showFPS') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -353,7 +353,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.administrativeArea') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.administrativeArea') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -367,7 +367,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showLatitudeLongitudeNetwork') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showLatitudeLongitudeNetwork') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -380,7 +380,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.showFangliNet') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.showFangliNet') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -393,7 +393,7 @@
           </el-switch>
         </div>
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.sheetIndexStatusSwitch') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.sheetIndexStatusSwitch') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -407,7 +407,7 @@
         </div>
 
         <div class="detailSkin2">
-          <span>{{ t('systemSetting.occlusion') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.occlusion') }}</span>
 
           <el-switch
             @change="sysChange"
@@ -421,7 +421,7 @@
         </div>
 
         <div v-if="false" class="detailSkin2">
-          <span>{{ t('systemSetting.battery') }}：</span>
+          <span class="titleLabel">{{ t('systemSetting.battery') }}</span>
           <el-switch
             @change="batteryChange"
             v-model="showBattery"
@@ -790,4 +790,7 @@ onMounted(() => {
 .arrowActive {
   color: rgba(var(--color-base1), 1);
 }
+.titleLabel {
+  margin-right: 10px;
+}
 </style>

src/renderer/src/views/components/headers/components/weather/index.vue

@@ -515,7 +515,7 @@ var shadowChange = () => {
       margin-top: 4px;
       font-size: 12px !important;
       font-weight: 400 !important;
-      line-height: 24px !important;
+      line-height: 20px !important;
       cursor: pointer;
     }
 
@@ -597,4 +597,13 @@ var shadowChange = () => {
     }
   }
 }
+/* 隐藏Webkit内核浏览器中的上下箭头及白色背景 */
+.input ::v-deep(input::-webkit-outer-spin-button),
+.input ::v-deep(input::-webkit-inner-spin-button) {
+  -webkit-appearance: none !important;
+  appearance: none !important;
+  margin: 0;
+  background: none; /* 移除白色背景 */
+  display: none; /* 彻底隐藏元素 */
+}
 </style>

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

@@ -3,7 +3,12 @@
     <div class="head_box">
       <!-- <span class="head_title">实景三维电子沙盘系统</span> -->
       <!-- <headSvg style="width: 100%;height: 100%;"></headSvg> -->
-      <img width="100%" height="100%" :src="headImg" alt="" />
+      <img
+        width="100%"
+        height="100%"
+        :src="`../../../src/assets/images/theme/${skinInfo}/head.png`"
+        alt=""
+      />
     </div>
     <div class="dateTime">
       <span>{{ date.hms }}</span>
@@ -12,7 +17,12 @@
         <span>{{ t(`week.4`) }}</span>
       </div>
       <div class="weather">
-        <svg-icon name="weather" :size="40" @click="clickFun"></svg-icon>
+        <svg-icon
+          name="weatherBase"
+          :class="weatherClick ? 'weatherIcon' : ''"
+          :size="40"
+          @click="clickFun"
+        ></svg-icon>
       </div>
     </div>
     <setTool ref="setToolRef"></setTool>
@@ -53,8 +63,7 @@ const headImg = computed(() => {
   }
 })
 
-
+const skinInfo = ref(JSON.parse(localStorage.getItem('systemSetting') || '{}').skinInfo || 'color1')
-const skinInfo = ref(JSON.parse(localStorage.getItem("systemSetting") || '{}').skinInfo || 'color1')
 
 const { t } = useI18n()
 const date = ref({
@@ -62,26 +71,25 @@ const date = ref({
   hms: '',
   week: 0
 })
-window.addEventListener("setItemEvent", (e: any) => {
+window.addEventListener('setItemEvent', (e: any) => {
   console.log('e', e)
-  if (e.key == "systemSetting") {
+  if (e.key == 'systemSetting') {
-    let obj = JSON.parse(e.newValue);
+    let obj = JSON.parse(e.newValue)
-    skinInfo.value = obj.skinInfo;
+    skinInfo.value = obj.skinInfo
 
     let setting = JSON.parse(e.newValue)
     let dialogElm: any = document.getElementsByClassName('YJ-custom-base-dialog')
     if (setting.language === 'zh-EN') {
       for (let i = 0; i < dialogElm.length; i++) {
-        dialogElm[i].classList.add('dialog-en');
+        dialogElm[i].classList.add('dialog-en')
       }
-    }
+    } else {
-    else {
       for (let i = 0; i < dialogElm.length; i++) {
-        dialogElm[i].classList.remove('dialog-en');
+        dialogElm[i].classList.remove('dialog-en')
       }
     }
   }
-});
+})
 var weatherClick = ref(false)
 const setTime = () => {
   let date1 = new Date()
@@ -200,9 +208,12 @@ var clickFun = () => {
 
     .weather {
       margin-left: 15px;
+      .weatherIcon {
+        fill: rgba(var(--color-base1), 1) !important;
+      }
 
       svg {
-        fill: rgba(var(--color-base1), 1) !important;
+        // fill: rgba(var(--color-base1), 1) !important;
         cursor: pointer;
       }
     }

src/renderer/src/views/components/tree/index.vue

@@ -186,7 +186,7 @@
             style="width: 50px"
             id="keyword"
             type="text"
-            :placeholder="t('btn.treePlaceholder')"
+            :placeholder="select == 'poi' ? t('btn.treePlaceholder') : t('btn.treeLayerholder')"
             @input="clearResult"
             @change="searchPlace"
           />