Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/components/dialog/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dialog">
-    <el-dialog v-model="props.flag" :append-to-body="props.isBody" ref="dialogTk" :top="props.top" :custom-class="props.customClass" :lock-scroll="false" :modal="props.modal" :before-close="props.close" :close-on-click-modal="false" :width="props.width" :show-close="props.showFlag">
+    <el-dialog :model-value="props.flag" :append-to-body="props.isBody" ref="dialogTk" :top="props.top" :custom-class="props.customClass" :lock-scroll="false" :modal="props.modal" :before-close="close" :close-on-click-modal="false" :width="props.width" :show-close="props.showFlag">
       <div class="dialog-content">
         <slot />
       </div>
@@ -13,44 +13,44 @@ const props = defineProps({
   // 弹框开关
   flag: {
     type: Boolean,
-    default: false
+    default: false,
   },
   showFlag: {
     type: Boolean,
-    default: false
+    default: false,
   },
   // 弹框宽度
   width: {
     type: String,
-    default: '400px'
+    default: "400px",
   },
   // 弹框类名
   customClass: {
     type: String,
-    default: ''
+    default: "",
   },
   // 弹框高度
   top: {
     type: String,
-    default: '0vh'
+    default: "0vh",
   },
   // 弹框遮罩层
   modal: {
     type: Boolean,
-    default: true
+    default: true,
   },
   // 二级弹框标记
   child: {
     type: Boolean,
-    default: false
+    default: false,
   },
   isBody: {
     type: Boolean,
-    default: true
-  }
-})
-const emits = defineEmits(['closeDialog'])
+    default: true,
+  },
+});
+const emits = defineEmits(["closeDialog"]);
 const close = () => {
-  emits('closeDialog')
-}
+  emits("closeDialog");
+};
 </script>

src/components/table2/index.vue

@@ -83,7 +83,6 @@ const data = generateData(columns, 200);
 
 <style lang="scss" scoped>
 .table2 {
-  padding: 20px;
   height: 100%;
   .data-table-btn {
     line-height: 32px;

src/router/index.ts

@@ -4,6 +4,9 @@ import { RouterTy } from "~/router";
 import routesOne from "./routes/routes-file-one";
 import routesTwo from "./routes/routes-file-two";
 import routesThree from "./routes/routes-file-three";
+import routesFour from "./routes/routes-file-four";
+import routesFive from "./routes/routes-file-five";
+import routesSix from "./routes/routes-file-six";
 const routesPush = (arr, routes) => {
   if (!Array.isArray(arr)) return "请传入数组格式路由表";
   for (let i = 0; i < arr.length; i++) {
@@ -50,7 +53,17 @@ export const asyncRoutes: RouterTy = [
 ];
 
 // 插入路由
-routesPush([...routesOne, ...routesTwo, ...routesThree], asyncRoutes);
+routesPush(
+  [
+    ...routesOne,
+    ...routesTwo,
+    ...routesThree,
+    ...routesFour,
+    ...routesFive,
+    ...routesSix,
+  ],
+  asyncRoutes
+);
 
 const router: Router = createRouter({
   history: createWebHashHistory(),

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

@@ -0,0 +1,32 @@
+import Layout from "@/layout";
+
+const HomeRoutes = {
+  path: "/dataQuery",
+  component: Layout,
+  name: "dataQuery",
+  redirect: "/dataQuery/flightQuery",
+  //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
+  meta: { title: "数据查询", elSvgIcon: "Fold" },
+  children: [
+    {
+      path: "/dataQuery/flightQuery",
+      name: "FlightQuery",
+      meta: { title: "航班查询", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/dataQuery/flightQuery/index.vue"),
+    },
+    {
+      path: "/dataQuery/waybillQuery",
+      name: "WaybillQuery",
+      meta: { title: "运单查询", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/dataQuery/waybillQuery/index.vue"),
+    },
+    {
+      path: "/dataQuery/freightInquiry",
+      name: "FreightInquiry",
+      meta: { title: "货物查询", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/dataQuery/freightInquiry/index.vue"),
+    },
+  ],
+};
+
+export default [HomeRoutes];

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

@@ -0,0 +1,72 @@
+import Layout from "@/layout";
+
+const HomeRoutes = {
+  path: "/systemSettings",
+  component: Layout,
+  name: "systemSettings",
+  redirect: "/systemSettings/securityPolicy",
+  //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
+  meta: { title: "系统配置", elSvgIcon: "Fold" },
+  children: [
+    {
+      path: "/systemSettings/securityPolicy",
+      name: "SecurityPolicy",
+      meta: { title: "安全策略", elSvgIcon: "Fold", icon: "table" },
+      component: () =>
+        import("@/views/systemSettings/securityPolicy/index.vue"),
+    },
+    {
+      path: "/systemSettings/warningSet",
+      name: "WarningSet",
+      meta: { title: "预警告警策略", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/systemSettings/warningSet/index.vue"),
+    },
+    {
+      path: "/systemSettings/log",
+      name: "log",
+      meta: { title: "日志管理", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/systemSettings/log/index.vue"),
+    },
+    {
+      path: "/systemSettings/serviceManagement",
+      name: "ServiceManagement",
+      meta: { title: "服务管理", elSvgIcon: "Fold", icon: "table" },
+      component: () =>
+        import("@/views/systemSettings/serviceManagement/index.vue"),
+    },
+    {
+      path: "/systemSettings/queryTemplate",
+      name: "QueryTemplate",
+      meta: { title: "查询模板", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/systemSettings/queryTemplate/index.vue"),
+    },
+    {
+      path: "/systemSettings/sourceservice",
+      name: "Sourceservice",
+      meta: { title: "数据源服务", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/systemSettings/sourceservice/index.vue"),
+    },
+    {
+      path: "/systemSettings/protocolManagement",
+      name: "ProtocolManagement",
+      meta: { title: "协议管理", elSvgIcon: "Fold", icon: "table" },
+      component: () =>
+        import("@/views/systemSettings/protocolManagement/index.vue"),
+    },
+    {
+      path: "/systemSettings/datastructure",
+      name: "Datastructure",
+      meta: { title: "数据结构管理", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/systemSettings/datastructure/index.vue"),
+    },
+    {
+      path: "/systemSettings/messageTemplate",
+      name: "MessageTemplate",
+      meta: { title: "消息模板", elSvgIcon: "Fold", icon: "table" },
+      component: () =>
+        import("@/views/systemSettings/messageTemplate/index.vue"),
+    },
+  ],
+};
+
+export default [HomeRoutes];

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

@@ -0,0 +1,32 @@
+import Layout from "@/layout";
+
+const HomeRoutes = {
+  path: "/baggageManagement",
+  component: Layout,
+  name: "baggageManagement",
+  redirect: "/baggageManagement/departureC",
+  //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
+  meta: { title: "综合可视化", elSvgIcon: "Fold" },
+  children: [
+    {
+      path: "/baggageManagement/departureC",
+      name: "DepartureC",
+      meta: { title: "出港相关", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/baggageManagement/departureC/index.vue"),
+    },
+    {
+      path: "/baggageManagement/arrival",
+      name: "Arrival",
+      meta: { title: "进港相关", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/baggageManagement/arrival/index.vue"),
+    },
+    {
+      path: "/baggageManagement/trackMap",
+      name: "TrackMap",
+      meta: { title: "轨迹地图", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/baggageManagement/trackMap/index.vue"),
+    },
+  ],
+};
+
+export default [HomeRoutes];

src/views/baggageManagement/arrival/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/baggageManagement/departureC/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/baggageManagement/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/baggageManagement/trackMap/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/dataQuery/flightQuery/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/dataQuery/freightInquiry/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/dataQuery/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/dataQuery/waybillQuery/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/datastructure/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/index.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <router-view />
+  </div>
+</template>

src/views/systemSettings/log/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/messageTemplate/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/protocolManagement/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/queryTemplate/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/securityPolicy/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/serviceManagement/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/sourceservice/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>

src/views/systemSettings/warningSet/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+<script lang="ts">
+import { defineComponent } from "vue";
+
+export default defineComponent({
+  setup() {},
+});
+</script>
+<style lang="scss" scoped></style>