航班视图-UTC

public/config.js

@@ -79,6 +79,7 @@ var NEW_DATACONTENT_ID = [
   52006,
   52016,
   51062,
+  100000,
   9, //航站查询
   10, //航司查询
   11, //节点查询
@@ -204,6 +205,7 @@ var DATACONTENT_ID = {
   sysQueryChildTabId: 25, //系统设置-查询模板-列设置-表格-id
   sysQueryChildEditTabId: 26, //系统设置-查询模板-列设置-表格-编辑-id
   messageQueryTabId: 1803442, //系统设置-消息查询-表格-id
+  securityPolicy: 100000, // 系统配置-基础配置
 
   dataSourceOptions: 13, //系统设置-数据源下拉
   serviceOptions: 14, //系统设置-服务下拉
@@ -425,6 +427,7 @@ var SERVICE_ID = {
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改
   sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交
+  securityPolicy: 101000, // 系统配置-基础配置
 
   /***-----应用管理------***/
   appScId: 12, //应用管理-增删改

src/router/routes/routes-file-four.ts

@@ -23,8 +23,7 @@ const HomeRoutes = {
     {
       path: "/systemSettings/securityPolicyedit",
       name: "SecurityPolicyedit",
-      hidden: true,
-      meta: { title: "安全策略编辑" },
+      meta: { title: "基础配置" },
       component: () =>
         import("@/views/systemSettings/securityPolicy/securityPolicyedit.vue"),
     },

src/router/routes/routes-file-two.ts

@@ -77,13 +77,13 @@ const HomeRoutes = {
       meta: { title: '应用管理', roles: ['application_managemen_page'] },
       component: () => import('@/views/userManagement/application/index.vue'),
     },
-    {
-      path: "/userManagement/securityPolicy",
-      name: "SecurityPolicy",
-      meta: { title: "登录策略", roles: ["login_strategy_page"] },
-      component: () =>
-        import("@/views/systemSettings/securityPolicy/index.vue"),
-    },
+    // {
+    //   path: "/userManagement/securityPolicy",
+    //   name: "SecurityPolicy",
+    //   meta: { title: "登录策略", roles: ["login_strategy_page"] },
+    //   component: () =>
+    //     import("@/views/systemSettings/securityPolicy/index.vue"),
+    // },
   ],
 }
 

src/views/realTime/components/FlightView/index.vue

@@ -29,7 +29,7 @@
           scrollbar-always-on
           :row-class-name="flightContainerRowClass"
           :cell-class-name="flightContainerCellClass"
-          :column-props="{ formatter: tableFormatter }"
+          :column-props="{ formatter }"
           sequence
           @cell-click="flightContainerCellClickHandler"
         />
@@ -37,7 +37,11 @@
     </div>
     <div class="waybill-list-wrapper">
       <div class="waybill-list-header">
-        <!-- <CommonSwitch v-model:flag="UTCFlag" label="开启UTC" /> -->
+        <CommonSwitch
+          :flag="UTCFlag"
+          label="开启UTC"
+          @update:flag="flag => timeZoneStore.toggleUTCFlag(flag)"
+        />
         <!-- <el-button
           class="button-sqaure"
           :icon="Refresh"
@@ -65,7 +69,7 @@
           :columns="waybillTableColumns"
           :row-class-name="flightWaybillRowClass"
           :cell-class-name="flightWaybillCellClass"
-          :column-props="{ formatter: tableFormatter }"
+          :column-props="{ formatter }"
           :filter-sort-options="filterSortOptions"
           sequence
           @cell-click="flightWaybillCellClickHandler"
@@ -85,7 +89,7 @@ import Search from '@/components/search/index.vue'
 import { CaretRight } from '@element-plus/icons-vue'
 import ContainerWaybillDialog from './ContainerWaybillDialog.vue'
 import SimpleTable from '@/components/SimpleTable/index.vue'
-// import CommonSwitch from '../../components/CommonSwitch/index.vue'
+import CommonSwitch from '../../components/CommonSwitch/index.vue'
 import ColumnSet from '@/components/ColumnSet/index.vue'
 import { useTable } from '../../hooks/useTable'
 import { useTableColumnSet } from '@/hooks/useTableColumnSet'
@@ -94,6 +98,7 @@ import { useTableStyle } from '../../hooks/useTableStyle'
 import { useTableCellClick } from '../../hooks/useTableCellClick'
 import { useFlightInfo } from './useFlightInfo'
 import { useLoop } from '@/hooks/useLoop'
+import { useTimeZoneStore } from '@/store/timeZone'
 import { CommonTableFormatter, CommonValue } from '~/common'
 import { datetimeToTime } from '@/utils/validate'
 
@@ -121,12 +126,15 @@ const dataContent = [
   // landingAirport,
 ] as string[]
 
+const timeZoneStore = useTimeZoneStore()
+const { UTCFlag } = storeToRefs(timeZoneStore)
+
 const {
   flightInfoItems,
   flightInfo,
   computedFlightInfo,
   getFlightInfo,
-} = useFlightInfo(props.name, dataContent)
+} = useFlightInfo(props.name, dataContent, UTCFlag)
 
 const airLine = toRef(flightInfo, 'flightinfo')
 
@@ -150,12 +158,7 @@ watchEffect(() => {
   }
 })
 
-const tableFormatter: CommonTableFormatter = (
-  row,
-  column,
-  cellValue,
-  index
-) => {
+const formatter: CommonTableFormatter = (row, column, cellValue, index) => {
   const value = String(cellValue ?? '').trim()
   if (column.property === 'execResult') {
     // const execResult = Number(cellValue)
@@ -166,7 +169,7 @@ const tableFormatter: CommonTableFormatter = (
     return '通过'
   }
   if (column.property.includes('Time')) {
-    return datetimeToTime(value, flightDate as CommonValue)
+    return datetimeToTime(value, flightDate as CommonValue, unref(UTCFlag))
   }
   if (
     [
@@ -196,7 +199,11 @@ const tableFormatter: CommonTableFormatter = (
     // } else {
     //   return datetimeToTime(value, flightDate as CommonValue)
     // }
-    const time = datetimeToTime(value, flightDate as CommonValue)
+    const time = datetimeToTime(
+      value,
+      flightDate as CommonValue,
+      unref(UTCFlag)
+    )
     return time ? `位置：--\n结果：通过\n时间：${time}` : ''
   }
   if (column.property === 'nodeCode') {
@@ -216,8 +223,6 @@ const tableFormatter: CommonTableFormatter = (
 
 useLoop([getFlightInfo, getContainerTableData, getWaybillTableData], 'flight')
 
-// const UTCFlag = ref(true)
-
 const { columnChecked } = useTableColumnSet(waybillTableColumns)
 
 const waybillTableRef = ref<InstanceType<typeof SimpleTable> | null>(null)

src/views/realTime/components/FlightView/useFlightInfo.ts

@@ -1,7 +1,14 @@
-import { CommonData, CommonValue } from '~/common'
+import { CommonData, CommonValue, MaybeRef } from '~/common'
 import { Query } from '@/api/webApi'
 import { ElMessage } from 'element-plus'
 import _ from 'lodash'
+import { parseTime } from '@/utils/validate'
+
+type FlightInfoItem = {
+  label: string
+  key?: string
+  getter?: (info: CommonData, UTCFlag?: boolean) => string
+}
 
 const flightTypeMap = ['货机', '客机', '其他']
 const flightStateMap = {
@@ -9,7 +16,20 @@ const flightStateMap = {
   DLY: '延误',
 }
 
-const flightInfoItemsMap = {
+const datetimeFormatter = (str: any, UTCFlag?: boolean) => {
+  if (typeof str !== 'string' || !str) {
+    return ''
+  }
+  const datetime = new Date(str.replace('T', ' '))
+  if (UTCFlag) {
+    datetime.setTime(datetime.getTime() - 8 * 60 * 60 * 1000)
+  }
+  return parseTime(datetime, '{y}-{m}-{d} {h}:{i}:{s}') as string
+}
+
+const flightInfoItemsMap: {
+  [type: string]: FlightInfoItem[][]
+} = {
   departure: [
     [
       {
@@ -18,11 +38,13 @@ const flightInfoItemsMap = {
       },
       {
         label: '计划起飞时间',
-        getter: info => info.planDepartureTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.planDepartureTime, UTCFlag),
       },
       {
         label: '实际起飞时间',
-        getter: info => info.acDepartureTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.acDepartureTime, UTCFlag),
       },
       {
         label: '机型',
@@ -86,11 +108,13 @@ const flightInfoItemsMap = {
       },
       {
         label: '计划降落时间',
-        getter: info => info.planLandingTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.planLandingTime, UTCFlag),
       },
       {
         label: '实际降落时间',
-        getter: info => info.acLandingTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.acLandingTime, UTCFlag),
       },
     ],
   ],
@@ -102,11 +126,13 @@ const flightInfoItemsMap = {
       },
       {
         label: '计划起飞时间',
-        getter: info => info.planDepartureTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.planDepartureTime, UTCFlag),
       },
       {
         label: '实际起飞时间',
-        getter: info => info.acDepartureTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.acDepartureTime, UTCFlag),
       },
       {
         label: '机型',
@@ -166,11 +192,13 @@ const flightInfoItemsMap = {
       },
       {
         label: '计划降落时间',
-        getter: info => info.planLandingTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.planLandingTime, UTCFlag),
       },
       {
         label: '实际降落时间',
-        getter: info => info.acLandingTime?.replace('T', ' ') ?? '',
+        getter: (info, UTCFlag) =>
+          datetimeFormatter(info.acLandingTime, UTCFlag),
       },
       {
         label: '停机位',
@@ -180,14 +208,12 @@ const flightInfoItemsMap = {
   ],
 }
 
-export function useFlightInfo(name: string, dataContent: CommonValue[]) {
-  const flightInfoItems = ref<
-    {
-      label: string
-      key?: string
-      getter?: (info: any) => string
-    }[][]
-  >([])
+export function useFlightInfo(
+  name: string,
+  dataContent: CommonValue[],
+  UTCFlag?: MaybeRef<boolean>
+) {
+  const flightInfoItems = ref<FlightInfoItem[][]>([])
   const getFlightInfoItems = () => {
     flightInfoItems.value = _.cloneDeep(
       flightInfoItemsMap[name.includes('Departure') ? 'departure' : 'arrival']
@@ -236,7 +262,7 @@ export function useFlightInfo(name: string, dataContent: CommonValue[]) {
       return airportNameZhMap[flightInfo[item.key.slice(0, -2)]!] ?? ''
     }
     if (item.getter) {
-      return item.getter(flightInfo)
+      return item.getter(flightInfo, unref(UTCFlag))
     }
     if (item.key) {
       return String(flightInfo[item.key] ?? '')

src/views/systemSettings/securityPolicy/securityPolicyedit.vue

@@ -3,13 +3,13 @@
     <el-row :gutter="24">
       <el-col :span="8">
         <div class="dos">
-          <Minheader :is-Preser="true" :is-statuser="true">
+          <Minheader :is-preser="true" :is-statuser="true">
             <template #header>
               <div class="status flex-wrap">
                 <div class="manageTitle">验证码策略</div>
               </div>
-            </template></Minheader
-          >
+            </template>
+          </Minheader>
           <el-form :model="tableForm">
             <el-row :gutter="24">
               <el-col :span="12">
@@ -38,8 +38,9 @@
                       :value="item.v ? item.v : item.planDepartureApt"
                     >
                     </el-option>
-                  </el-select> </el-form-item
-              ></el-col>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="大小写选择" size="default">
                   <el-select
@@ -58,8 +59,9 @@
                       :value="item.v ? item.v : item.planDepartureApt"
                     >
                     </el-option>
-                  </el-select> </el-form-item
-              ></el-col>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="是否开启" prop="roleStatus">
                   <el-radio-group v-model="tableForm.two">
@@ -67,20 +69,20 @@
                     <el-radio label="2"> 否</el-radio>
                   </el-radio-group>
                 </el-form-item>
-              </el-col></el-row
-            ></el-form
-          >
+              </el-col>
+            </el-row>
+          </el-form>
         </div>
       </el-col>
       <el-col :span="8">
         <div class="dos">
-          <Minheader :is-Preser="true" :is-statuser="true">
+          <Minheader :is-preser="true" :is-statuser="true">
             <template #header>
               <div class="status flex-wrap">
                 <div class="manageTitle">密码策略</div>
               </div>
-            </template></Minheader
-          >
+            </template>
+          </Minheader>
           <el-form :model="tableForm1">
             <el-row :gutter="24">
               <el-col :span="12">
@@ -130,18 +132,21 @@
                     >
                     </el-option>
                   </el-select>
-                </el-form-item> </el-col></el-row
-          ></el-form></div
-      ></el-col>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </el-col>
       <el-col :span="8">
         <div class="dos">
-          <Minheader :is-Preser="true" :is-statuser="true">
+          <Minheader :is-preser="true" :is-statuser="true">
             <template #header>
               <div class="status flex-wrap">
                 <div class="manageTitle">多点登录</div>
               </div>
-            </template></Minheader
-          >
+            </template>
+          </Minheader>
           <el-form :model="tableForm2">
             <el-row :gutter="24">
               <el-col :span="12">
@@ -154,39 +159,54 @@
               </el-col>
             </el-row>
           </el-form>
-        </div></el-col
-      >
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script setup lang="ts">
-import Minheader from "@/components/minheader/index.vue";
-const tableOptionser = ref<Array>([]); //弹窗下拉
+import { Query } from '@/api/webApi'
+import Minheader from '@/components/minheader/index.vue'
+const tableOptionser = ref<any[]>([]) //弹窗下拉
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "1",
-  three: "",
-  text: "",
-}); //弹窗内容
+  name: '',
+  china: '',
+  englin: '',
+  two: '1',
+  three: '',
+  text: '',
+})
 const tableForm1 = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-}); //弹窗内容
+  name: '',
+  china: '',
+  englin: '',
+  two: '',
+  three: '',
+  text: '',
+})
 const tableForm2 = reactive({
-  name: "1",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-}); //弹窗内容
+  name: '1',
+  china: '',
+  englin: '',
+  two: '',
+  three: '',
+  text: '',
+})
+
+const getSecurityPolicy = async () => {
+  try {
+    Query({
+      id: DATACONTENT_ID.securityPolicy,
+      dataContent: [],
+    })
+  } catch (error) {
+    console.error(error)
+  }
+}
+onMounted(() => {
+  getSecurityPolicy()
+})
 </script>
 
 <style lang="scss" scoped>