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

public/demo.js

@@ -54,10 +54,18 @@ const DATACONTENT_ID = {
   forwarderNodeId: 1803438, //基础数据-货代-表格-id
 
   /***-----系统设置------***/
-  sysSourceId: 13, //系统设置-数据源-id
   sysProtoTabId: 1, //系统设置-协议管理-表格-id
   sysServiceTabId: 2, //系统设置-服务管理-表格-id
+  structureTabId: 5, //系统设置-数据结构管理-表格-id
+  sourceDataTabId: 6, //系统设置-源数据管理-表格-id
+  dataitemTabId: 9, //系统设置-数据项-表格-id
   sysLogTable: 12, //系统设置-日志-表格
+  sysServiceWarningId: 18029, //查询预警报警场景列表
+  sysServiceWarnId: 18030, //预警报警场景(按照ID)
+  sysServiceStrategyId: 18033, //预警报警策略(按照ID)
+  sysSourceId: 13, //系统设置-数据源-id
+  sysServiceTopTable: 31, //系统设置-服务管理-服务拓扑-查看日志
+  messageQueryTabId: 1803442, //系统设置-消息查询-表格-id
 };
 
 const SERVICE_ID = {

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

@@ -88,12 +88,12 @@ const HomeRoutes = {
       component: () =>
         import("@/views/systemSettings/queryTemplate/queryTemplateColumn.vue"),
     },
-    {
-      path: "/systemSettings/sourceservice",
-      name: "Sourceservice",
-      meta: { title: "源数据管理", elSvgIcon: "Fold", icon: "table" },
-      component: () => import("@/views/systemSettings/sourceservice/index.vue"),
-    },
+    // {
+    //   path: "/systemSettings/sourceservice",
+    //   name: "Sourceservice",
+    //   meta: { title: "源数据管理", elSvgIcon: "Fold", icon: "table" },
+    //   component: () => import("@/views/systemSettings/sourceservice/index.vue"),
+    // },
     {
       path: "/systemSettings/sourceserviceEdit",
       name: "SourceserviceEdit",
@@ -105,7 +105,7 @@ const HomeRoutes = {
     {
       path: "/systemSettings/sourceTube",
       name: "SourceTube",
-      meta: { title: "数据源服务", elSvgIcon: "Fold", icon: "table" },
+      meta: { title: "源数据管理", elSvgIcon: "Fold", icon: "table" },
       component: () => import("@/views/systemSettings/sourceTube/index.vue"),
     },
     {

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

@@ -53,15 +53,13 @@ const HomeRoutes = {
       name: "ModelMaintenance",
       meta: { title: "机型维护", elSvgIcon: "Fold", icon: "table" },
       component: () => import("@/views/BasicsData/modelMaintenance/index.vue"),
-      children: [
-        {
-          path: "/BasicsData/modelMaintenance/shippingSpace",
-          name: "ShippingSpace",
-          hidden: true,
-          meta: { title: "舱位管理", elSvgIcon: "Fold", icon: "table" },
-          component: () => import("@/views/BasicsData/shippingSpace/index.vue"),
-        },
-      ],
+    },
+    {
+      path: "/BasicsData/modelMaintenance/shippingSpace",
+      name: "ShippingSpace",
+      hidden: true,
+      meta: { title: "舱位管理", elSvgIcon: "Fold", icon: "table" },
+      component: () => import("@/views/BasicsData/shippingSpace/index.vue"),
     },
     {
       path: "/BasicsData/containerMaintenance",

src/views/BasicsData/airportInfo/index.vue

@@ -407,6 +407,7 @@ const handleNodeClick = (data) => {
   company.value = data.companyName;
   companyID.value = data.companyID;
   tableData.value = [];
+  page.value = 0;
   getQuery();
 };
 //获取表格数据

src/views/systemSettings/datastructure/datastructureTerm.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -24,6 +24,8 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
@@ -31,7 +33,7 @@
               <el-col :span="12">
                 <el-form-item label="数据项名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.ItemName"
                     placeholder="请输入数据项名称"
                   />
                 </el-form-item>
@@ -40,7 +42,7 @@
                 <el-form-item label="数据项类型" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.china"
+                    v-model="tableForm.dataType"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -60,21 +62,21 @@
               <el-col :span="12">
                 <el-form-item label="输出标识符" size="default">
                   <el-input
-                    v-model="tableForm.englin"
+                    v-model="tableForm.outputIdentifier"
                     placeholder="请输入输出标识符"
                   />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="描述" size="default">
+                <!-- <el-form-item label="描述" size="default">
                   <el-input v-model="tableForm.two" placeholder="请输入描述" />
-                </el-form-item>
+                </el-form-item> -->
               </el-col>
               <el-col :span="8">
                 <el-form-item label="唯一项" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.three"
+                    v-model="tableForm.isKey"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -95,7 +97,7 @@
                 <el-form-item label="必填项" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.text"
+                    v-model="tableForm.isMust"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -116,7 +118,7 @@
                 <el-form-item label="多条拆分" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.text1"
+                    v-model="tableForm.isSplite"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -133,7 +135,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col>
+              <!-- <el-col>
                 <el-form-item label="取值表达式" size="default">
                   <el-input
                     type="textarea"
@@ -141,8 +143,8 @@
                     placeholder="请输入取值表达式"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col>
+              </el-col> -->
+              <!-- <el-col>
                 <el-form-item label="实时计算表达式" size="default">
                   <el-input
                     type="textarea"
@@ -150,28 +152,28 @@
                     placeholder="请输入实时计算表达式"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col>
+              </el-col> -->
+              <!-- <el-col>
                 <el-form-item label="计算结果标识符" size="default">
                   <el-input
                     v-model="tableForm.text4"
                     placeholder="请输入计算结果标识符"
                   />
                 </el-form-item>
-              </el-col>
-              <el-col>
+              </el-col> -->
+              <!-- <el-col>
                 <el-form-item label="计算参数" size="default">
                   <el-input
                     v-model="tableForm.text5"
                     placeholder="请输入计算参数"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="计算数据源" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.text6"
+                    v-model="tableForm.dataSourceName"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -199,55 +201,36 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const router = useRouter();
+const route = useRoute();
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增数据项"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableOptionser = ref<Array>([]); //弹窗下拉
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-  text1: "",
-  text2: "",
-  text3: "",
-  text4: "",
-  text5: "",
-  text6: "",
+  ItemID: "",
+  dataStructureID: route.query.dataStructureID,
+  ItemName: "",
+  outputIdentifier: "",
+  dataType: "",
+  isKey: "",
+  isMust: "",
+  isSplite: "",
+  dataSourceName: "",
+  event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-    text: "测试",
-    text1: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-    text: "测试",
-    text1: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-    text: "测试",
-    text1: "测试",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -276,24 +259,21 @@ const tableBtnGroup = ref([
 //新增
 const addForm = () => {
   msgTitle.value = "新增数据项";
+  tableForm.event = 1;
   flag.value = true;
   type.value = "";
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
-  tableForm.text1 = "";
-  tableForm.text2 = "";
-  tableForm.text3 = "";
-  tableForm.text4 = "";
-  tableForm.text5 = "";
-  tableForm.text6 = "";
+  tableForm.ItemID = "";
+  tableForm.ItemName = "";
+  tableForm.outputIdentifier = "";
+  tableForm.dataType = "";
+  tableForm.isKey = "";
+  tableForm.isMust = "";
+  tableForm.isSplite = "";
+  tableForm.dataSourceName = "";
 };
 //编辑
 // const editDialog = (data) => {
@@ -313,22 +293,28 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑数据项";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
-    tableForm.text1 = index.text1;
-    tableForm.text2 = index.text2;
-    tableForm.text3 = index.text3;
-    tableForm.text4 = index.text4;
-    tableForm.text5 = index.text5;
-    tableForm.text6 = index.text6;
+    tableForm.event = 2;
+    tableForm.ItemID = index.ItemID;
+    tableForm.ItemName = index.ItemName;
+    tableForm.outputIdentifier = index.outputIdentifier;
+    tableForm.dataType = index.dataType;
+    tableForm.isKey = index.isKey;
+    tableForm.isMust = index.isMust;
+    tableForm.isSplite = index.isSplite;
+    tableForm.dataSourceName = index.dataSourceName;
   } else if (param === 3) {
     msgTitle.value = "删除数据项";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.ItemID = index.ItemID;
+    tableForm.ItemName = index.ItemName;
+    tableForm.outputIdentifier = index.outputIdentifier;
+    tableForm.dataType = index.dataType;
+    tableForm.isKey = index.isKey;
+    tableForm.isMust = index.isMust;
+    tableForm.isSplite = index.isSplite;
+    tableForm.dataSourceName = index.dataSourceName;
   } else if (param === 4) {
   }
 };
@@ -338,10 +324,99 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.dataitemTabId,
+      needPage: ++page.value,
+      dataContent: [route.query.dataStructureID],
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    let obj = {
+      dataStructureID: route.query.dataStructureID,
+    };
+    data = {
+      ...data,
+      ...obj,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/systemSettings/datastructure/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -24,6 +24,8 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
@@ -31,7 +33,7 @@
               <el-col>
                 <el-form-item label="结构名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.structureName"
                     placeholder="请输入结构名称"
                   />
                 </el-form-item>
@@ -40,7 +42,7 @@
                 <el-form-item label="数据格式" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.china"
+                    v-model="tableForm.datatype"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -60,7 +62,7 @@
               <el-col>
                 <el-form-item label="事件标识" size="default">
                   <el-input
-                    v-model="tableForm.englin"
+                    v-model="tableForm.eventID"
                     placeholder="请输入事件标识"
                   />
                 </el-form-item>
@@ -69,7 +71,7 @@
                 <el-form-item label="描述" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.two"
+                    v-model="tableForm.dataDescribe"
                     placeholder="请输入备注"
                   />
                 </el-form-item>
@@ -85,6 +87,15 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const router = useRouter();
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
@@ -92,35 +103,15 @@ const msgTitle = ref<String>("新增数据结构"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗\
 const tableOptionser = ref<Array>([]); //弹窗下拉
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-  time: "",
+  dataStructureID: "",
+  structureName: "",
+  datatype: "",
+  eventID: "",
+  dataDescribe: "",
+  event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -153,16 +144,16 @@ const addForm = () => {
   msgTitle.value = "新增数据结构";
   flag.value = true;
   type.value = "";
+  tableForm.event = 1;
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForm.dataStructureID = "";
+  tableForm.structureName = "";
+  tableForm.datatype = "";
+  tableForm.eventID = "";
+  tableForm.dataDescribe = "";
 };
 //编辑
 // const editDialog = (data) => {
@@ -182,20 +173,29 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑数据结构";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
-    // tableForm.text1 = index.text1;
-    // tableForm.text2 = index.text2;
+    tableForm.event = 2;
+    tableForm.dataStructureID = index.dataStructureID;
+    tableForm.structureName = index.structureName;
+    tableForm.datatype = index.datatype;
+    tableForm.eventID = index.eventID;
+    tableForm.dataDescribe = index.dataDescribe;
   } else if (param === 3) {
     msgTitle.value = "删除数据结构";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.dataStructureID = index.dataStructureID;
+    tableForm.structureName = index.structureName;
+    tableForm.datatype = index.datatype;
+    tableForm.eventID = index.eventID;
+    tableForm.dataDescribe = index.dataDescribe;
   } else if (param === 4) {
-    router.push({ path: "/systemSettings/datastructureTerm" });
+    router.push({
+      path: "/systemSettings/datastructureTerm",
+      query: {
+        dataStructureID: index.dataStructureID,
+      },
+    });
   }
 };
 //删除
@@ -204,10 +204,95 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.structureTabId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/systemSettings/log/index.vue

@@ -98,7 +98,7 @@ const loadDisabled = computed(() => loading.value || noMore.value)
 //表头
 const tableColumns = ref<TableColumn[]>([])
 //列表
-const tableData = ref<any>([])
+const tableData = ref<any[]>([])
 const resetTable = () => {
   page = 0
   loading.value = false
@@ -128,12 +128,10 @@ const getTableData = async () => {
       if (listValues.length === 0) {
         page--
         noMore.value = true
-        return
       }
-      tableData.push(...listValues)
-    } else {
-      page--
+      tableData.value.push(...listValues)
       loading.value = false
+    } else {
       throw new Error('获取数据失败')
     }
   } catch (error: any) {
@@ -177,15 +175,13 @@ const timeSelectHandler = () => {
 }
 
 const progressList = ref<progressItem[]>([])
-onMounted(() => {
-  progressList.value.push(
-    ...Array.from({ length: 3 }).map(() => ({
-      logType: '更新 Github 模板',
-      resultCode: '989665554',
-      logTime: '2022-4-26 15:48:55',
-    }))
-  )
-})
+progressList.value.push(
+  ...Array.from({ length: 3 }).map(() => ({
+    logType: '更新 Github 模板',
+    resultCode: '989665554',
+    logTime: '2022-4-26 15:48:55',
+  }))
+)
 const rowClickHandler = (row, column, event) => {
   progressList.value = []
   if (row.logObject) {

src/views/systemSettings/messageTemplate/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -23,21 +23,26 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item label="名称" size="default">
-                  <el-input v-model="tableForm.name" placeholder="请输入名称" />
+                <el-form-item label="消息标题" size="default">
+                  <el-input
+                    v-model="tableForm.newsTitle"
+                    placeholder="请输入名称"
+                  />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="描述" size="default">
+                <el-form-item label="消息内容" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.china"
-                    placeholder="请输入描述"
+                    v-model="tableForm.newContent"
+                    placeholder="请输入消息内容"
                   />
                 </el-form-item>
               </el-col>
@@ -52,33 +57,27 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增消息模板"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
+  newsId: "",
+  newsTitle: "",
+  newContent: "",
+  event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "中国国际航空",
-    china: "国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -103,17 +102,15 @@ const tableBtnGroup = ref([
 const addForm = () => {
   msgTitle.value = "新增消息模板";
   flag.value = true;
+  tableForm.event = 1;
   type.value = "";
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForm.newsId = "";
+  tableForm.newsTitle = "";
+  tableForm.newContent = "";
 };
 //编辑
 // const editDialog = (data) => {
@@ -133,16 +130,18 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑消息模板";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
+    tableForm.event = 2;
+    tableForm.newsId = index.newsId;
+    tableForm.newsTitle = index.newsTitle;
+    tableForm.newContent = index.newContent;
   } else if (param === 3) {
     msgTitle.value = "删除消息模板";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.newsId = index.newsId;
+    tableForm.newsTitle = index.newsTitle;
+    tableForm.newContent = index.newContent;
   } else if (param === 4) {
   }
 };
@@ -152,14 +151,99 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.messageQueryTabId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {
-  width: 50px;
+  width: 80px;
 }
 .app-containers {
   height: calc(100vh - 180px);

src/views/systemSettings/protocolManagement/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -24,6 +24,8 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
@@ -31,7 +33,7 @@
               <el-col>
                 <el-form-item label="协议名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.protocolName"
                     placeholder="请输入协议名称"
                   />
                 </el-form-item>
@@ -40,15 +42,23 @@
                 <el-form-item label="类名" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.china"
+                    v-model="tableForm.className"
                     placeholder="请输入类名"
                   />
                 </el-form-item>
               </el-col>
+              <!-- <el-col>
+                <el-form-item label="协议类型" size="default">
+                  <el-input
+                    v-model="tableForm.protocolType"
+                    placeholder="请输入协议类型"
+                  />
+                </el-form-item>
+              </el-col> -->
               <el-col>
                 <el-form-item label="读方法名" size="default">
                   <el-input
-                    v-model="tableForm.englin"
+                    v-model="tableForm.rmethodName"
                     placeholder="请输入读方法名"
                   />
                 </el-form-item>
@@ -56,7 +66,7 @@
               <el-col>
                 <el-form-item label="写方法名" size="default">
                   <el-input
-                    v-model="tableForm.two"
+                    v-model="tableForm.smethodName"
                     placeholder="请输入写方法名"
                   />
                 </el-form-item>
@@ -65,7 +75,7 @@
                 <el-form-item label="文件名及路径" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.three"
+                    v-model="tableForm.filePath"
                     placeholder="请输入文件名及路径"
                   />
                 </el-form-item>
@@ -81,42 +91,31 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增协议管理"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
+  protocolID: "",
+  protocolName: "",
+  protocolType: "",
+  filePath: "",
+  className: "",
+  rmethodName: "",
+  smethodName: "",
+  event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -145,34 +144,45 @@ const addForm = () => {
   msgTitle.value = "新增协议管理";
   flag.value = true;
   type.value = "";
+  tableForm.event = 1;
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForm.protocolID = "";
+  tableForm.protocolName = "";
+  tableForm.protocolType = "";
+  tableForm.filePath = "";
+  tableForm.className = "";
+  tableForm.rmethodName = "";
+  tableForm.smethodName = "";
 };
-//编辑
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
     msgTitle.value = "编辑协议管理";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
+    tableForm.event = 2;
+    tableForm.protocolID = index.protocolID;
+    tableForm.protocolName = index.protocolName;
+    tableForm.protocolType = index.protocolType;
+    tableForm.filePath = index.filePath;
+    tableForm.className = index.className;
+    tableForm.rmethodName = index.rmethodName;
+    tableForm.smethodName = index.smethodName;
   } else if (param === 3) {
     msgTitle.value = "删除协议管理";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.protocolID = index.protocolID;
+    tableForm.protocolName = index.protocolName;
+    tableForm.protocolType = index.protocolType;
+    tableForm.filePath = index.filePath;
+    tableForm.className = index.className;
+    tableForm.rmethodName = index.rmethodName;
+    tableForm.smethodName = index.smethodName;
   } else if (param === 4) {
   }
 };
@@ -182,10 +192,95 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.sysProtoTabId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/systemSettings/queryTemplate/index.vue

@@ -17,6 +17,16 @@
           @btnClick="btnClick"
         />
       </div>
+      <Dialog
+        :flag="flag"
+        :type="type"
+        :msgTitle="msgTitle"
+        @resetForm="resetForm"
+        @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
+      >
+      </Dialog>
     </div>
   </div>
 </template>
@@ -24,7 +34,8 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
-import { Query } from "@/api/webApi";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
 const router = useRouter();
 const dataId = ref<String>("4"); //请求id
 const page = ref<number>(0); //分页参数
@@ -33,18 +44,22 @@ const noMore = ref<Boolean>(false);
 const rowTitle = ref<String>("");
 const tableCols = ref([]); //表头数据
 const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增查询模板"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableOptionser = ref<Array>([]); //弹窗下拉
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
+  queryConditionType: "",
+  queryTemplateID: "",
+  queryTemplateName: "",
+  queryTemplateDescribe: "",
+  dataSourceName: "",
+  queryTemplate: "",
+  serviceName: "",
+  pageRows: "",
+  event: "",
 }); //弹窗内容
 //列表
 const tableData = ref([]);
@@ -106,6 +121,15 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "删除查询模板";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.queryConditionType = index.queryConditionType;
+    tableForm.queryTemplateID = index.queryTemplateID;
+    tableForm.queryTemplateName = index.queryTemplateName;
+    tableForm.queryTemplateDescribe = index.queryTemplateDescribe;
+    tableForm.dataSourceName = index.dataSourceName;
+    tableForm.queryTemplate = index.queryTemplate;
+    tableForm.serviceName = index.serviceName;
+    tableForm.pageRows = index.pageRows;
   } else if (param === 4) {
     router.push({ path: "/systemSettings/queryTemplateColumn" });
   }
@@ -116,6 +140,10 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
@@ -156,6 +184,50 @@ const getQuery = async () => {
     page.value--;
   }
 };
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code === "0") {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
 onMounted(() => {
   getQuery();
 });

src/views/systemSettings/queryTemplate/queryTemplateAdd.vue

@@ -92,7 +92,7 @@
 
 <script setup lang="ts">
 import Minheader from "@/components/minheader/index.vue";
-import { Query, myQuery } from "@/api/webApi";
+import { Query, myQuery, GeneralDataReception } from "@/api/webApi";
 import { ElMessage } from "element-plus";
 const router = useRouter();
 const asShOW = ref<boolean>(false);
@@ -104,6 +104,7 @@ const ruleForm = reactive({
   submitID: null,
   queryTemplate: "",
   pageRows: null,
+  event: 1,
 }); //内容
 //保存
 const preserForm = async () => {
@@ -113,7 +114,7 @@ const preserForm = async () => {
   };
   delete params.serviceID;
   try {
-    const res = await Query({
+    const res = await GeneralDataReception({
       serviceId: SERVICE_ID.sysQueryTabId,
       dataContent: JSON.stringify(params),
     });

src/views/systemSettings/serviceManagement/index.vue

@@ -19,8 +19,8 @@
             </div>
           </div>
         </div>
-      </template></Minheader
-    >
+      </template>
+    </Minheader>
     <div class="integration__cont" ref="chartDom"></div>
     <Dialog
       width="1200px"
@@ -41,8 +41,11 @@
                 size="default"
                 type="datetime"
                 placeholder="选择开始日期时间"
-              >
-              </el-date-picker>
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :clearable="false"
+                @change="timeSelectHandler"
+              />
             </div>
             <div class="interfaceLog_head_time_end r16">
               <el-date-picker
@@ -50,13 +53,16 @@
                 size="default"
                 type="datetime"
                 placeholder="选择结束日期时间"
-              >
-              </el-date-picker>
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                :clearable="false"
+                @change="timeSelectHandler"
+              />
             </div>
             <Search
-              @getSearchData="getSearchData"
-              :isTitle="false"
-              @clearSearchData="clearSearchData"
+              :is-title="false"
+              @get-search-data="getSearchData"
+              @clear-search-data="clearSearchData"
             />
           </div>
         </div>
@@ -64,23 +70,26 @@
           <el-row :gutter="24">
             <el-col :span="19">
               <DataTable
-                :tableHeader="state.list"
+                :tableHeader="tableColumns"
                 :tableData="tableData"
                 :tableProperty="{ rowKey: 'ID' }"
+                @load="load"
+                @row-click="rowClickHandler"
               />
             </el-col>
             <el-col :span="5">
               <div class="interfaceLog_content_progress">
                 <el-timeline>
                   <el-timeline-item
-                    v-for="(item, index) in preDatas"
+                    v-for="(item, index) in progressList"
                     :key="index"
                   >
                     <div class="list">
                       <div class="list_status"></div>
-                      <div class="list_title">{{ item.title }}</div>
-                      <div class="list_code">{{ item.code }}</div>
-                      <div class="list_time">{{ item.time }}</div>
+                      <div class="list_title">{{ item.logType }}</div>
+                      <div class="list_code">{{ item.resultCode }}</div>
+                      <div class="list_time">{{ item.logTime }}</div>
+                      <!-- <div class="list_detial">{{ item.resultDetails }}</div> -->
                     </div>
                   </el-timeline-item>
                 </el-timeline>
@@ -93,130 +102,69 @@
   </div>
 </template>
 <script setup lang="ts">
-import Minheader from "@/components/minheader/index.vue";
-import DataTable from "@/components/tableTemp/index.vue";
-import Dialog from "@/components/dialog/index.vue";
-import { provide } from "vue";
-import * as echarts from "echarts";
-import img1 from "@/assets/integr/jiekou_blue.png";
-import img2 from "@/assets/integr/jiekou_red.png";
-import img3 from "@/assets/integr/pull_blue.png";
-import img4 from "@/assets/integr/kafka_blue.png";
-import img5 from "@/assets/integr/push_blue.png";
-import img6 from "@/assets/integr/save_blue.png";
-import img7 from "@/assets/integr/mysql_blue.png";
-import img8 from "@/assets/integr/pull_red.png";
-provide("echarts", echarts);
-const chartDom = ref(null);
-const myChart = ref(null);
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("查看日志"); //弹窗标题
+import Minheader from '@/components/minheader/index.vue'
+import DataTable from '@/components/tableTemp/index.vue'
+import Dialog from '@/components/dialog/index.vue'
+import { Ref, provide } from 'vue'
+import * as echarts from 'echarts'
+import _ from 'lodash'
+import { ElMessage } from 'element-plus'
+import { Query } from '@/api/dataIntegration'
+import img1 from '@/assets/integr/jiekou_blue.png'
+import img2 from '@/assets/integr/jiekou_red.png'
+import img3 from '@/assets/integr/pull_blue.png'
+import img4 from '@/assets/integr/kafka_blue.png'
+import img5 from '@/assets/integr/push_blue.png'
+import img6 from '@/assets/integr/save_blue.png'
+import img7 from '@/assets/integr/mysql_blue.png'
+import img8 from '@/assets/integr/pull_red.png'
+
+let serviceID: number
+
+
+provide('echarts', echarts)
+const chartDom = ref<HTMLDivElement | null>(null)
+const myChart = ref<Ref<echarts.ECharts> | null>(null)
+const flag = ref(false) //弹窗开关
+const type = ref('') //判断是否删除
+const msgTitle = ref('查看日志') //弹窗标题
 const getAssetsFile = (url: string) => {
-  return new URL(`../assets/integr/${url}`, import.meta.url).href;
-};
-const datas = ref<Array>([]);
-const desc = ref<number>(300);
+  return new URL(`../assets/integr/${url}`, import.meta.url).href
+}
+const datas = ref<any[]>([])
+const resizeDelay = 300
 //默认节点
 // const defaultImg = getAssetsFile("jiekou_blue.png");
-const defaultImg = "image://" + reactive(img1);
+const defaultImg = 'image://' + img1
 //默认节点-错误
-const defaultImgError = "image://" + reactive(img2);
-
+const defaultImgError = 'image://' + img2
 //拉取节点
-const pullImg = "image://" + reactive(img3);
-
+const pullImg = 'image://' + img3
 //拉取节点-错误
-const pullImgError = "image://" + reactive(img8);
-
+const pullImgError = 'image://' + img8
 //kafka节点
-const kafkaImg = "image://" + reactive(img4);
-
+const kafkaImg = 'image://' + img4
 //kafka节点-错误
-const kafkaImgError = getAssetsFile("kafka_red.png");
-
+const kafkaImgError = getAssetsFile('kafka_red.png')
 //推送节点
-const pushImg = "image://" + reactive(img5);
-
+const pushImg = 'image://' + img5
 //推送节点-错误
-const pushImgError = "image://" + getAssetsFile("push_red.png");
-
+const pushImgError = 'image://' + getAssetsFile('push_red.png')
 //存储节点
-const saveImg = "image://" + reactive(img6);
-
+const saveImg = 'image://' + img6
 //存储节点-错误
-const saveImgError = getAssetsFile("save_red.png");
-
+const saveImgError = getAssetsFile('save_red.png')
 //存储节点
-const mysqlImg = "image://" + reactive(img7);
-
+const mysqlImg = 'image://' + img7
 //存储节点-错误
-const mysqlImgError = getAssetsFile("mysql_red.png");
-
-const timeStart = ref<String>("");
-const timeEnd = ref<String>("");
-const preDatas = ref<Array>([]);
-//列表
-const tableData = ref([
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-    two: "测试",
-    three: "测试",
-  },
-]);
-//表头
-const state = reactive({
-  list: [
-    { label: "用户", key: "name" },
-    { label: "发生时间", key: "china" },
-    { label: "发生位置", key: "englin" },
-    { label: "成败代码", key: "two" },
-    { label: "成败详情", key: "three" },
-  ],
-  listLoading: true,
-});
-for (let i = 0; i < 10; i++) {
-  const element = {
-    action: "采集",
-    dataNumber: "000120220307201211011201",
-    sourceDataNumber: "BSM",
-    time: "2022-03-07 20:00:12",
-    result: i % 2 == 0 ? true : false,
-    details: "数据格式不正确",
-  };
-  const obj = {
-    title: "更新 Github 模板",
-    code: "989665554",
-    time: "2022-4-26 15:48:55",
-    id: i,
-  };
-  tableData.value.push(element);
-  preDatas.value.push(obj);
-}
-preDatas.value.splice(5, 10);
+const mysqlImgError = getAssetsFile('mysql_red.png')
 const nodeDataList = ref([
   {
-    name: "星盟SBH",
-    linkTargetName: "Kafka",
-    linkValue: " ",
+    name: '星盟SBH',
+    linkTargetName: 'Kafka',
+    linkValue: ' ',
     coordConfig: {
-      level: "0",
+      level: '0',
     },
     value: [10, 245],
     draggable: false,
@@ -359,20 +307,20 @@ const nodeDataList = ref([
   //   value: [80, 100],
   // },
   {
-    name: "Kafka",
-    linkTargetName: "BSMBPM报文解析",
-    linkValue: " ",
-    coordConfig: { level: "3" },
+    name: 'Kafka',
+    linkTargetName: 'BSMBPM报文解析',
+    linkValue: ' ',
+    coordConfig: { level: '3' },
     symbolSize: 60,
     symbol: kafkaImg,
     draggable: false,
     value: [40, 245],
   },
   {
-    name: "BSMBPM报文解析",
-    linkTargetName: "BSM",
-    linkValue: " ",
-    coordConfig: { level: "3" },
+    name: 'BSMBPM报文解析',
+    linkTargetName: 'BSM',
+    linkValue: ' ',
+    coordConfig: { level: '3' },
     symbolSize: 60,
     symbol: pullImgError,
     draggable: false,
@@ -431,70 +379,70 @@ const nodeDataList = ref([
   //   value: [120, 140],
   // },
   {
-    name: "BSM",
-    linkTargetName: "解析服务",
-    linkValue: " ",
-    coordConfig: { level: "4" },
+    name: 'BSM',
+    linkTargetName: '解析服务',
+    linkValue: ' ',
+    coordConfig: { level: '4' },
     symbolSize: 60,
     symbol: defaultImg,
     draggable: false,
     value: [100, 245],
   },
   {
-    name: "BPM",
-    linkTargetName: "推送节点",
-    linkValue: " ",
-    coordConfig: { level: "4" },
+    name: 'BPM',
+    linkTargetName: '推送节点',
+    linkValue: ' ',
+    coordConfig: { level: '4' },
     symbolSize: 60,
     symbol: defaultImg,
     draggable: false,
     value: [100, 200],
   },
   {
-    name: "航班",
-    linkTargetName: "解析服务",
-    linkValue: " ",
-    coordConfig: { level: "4" },
+    name: '航班',
+    linkTargetName: '解析服务',
+    linkValue: ' ',
+    coordConfig: { level: '4' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [160, 120],
   },
   {
-    name: "行李投诉",
-    linkTargetName: "解析服务",
-    linkValue: " ",
-    coordConfig: { level: "4" },
+    name: '行李投诉',
+    linkTargetName: '解析服务',
+    linkValue: ' ',
+    coordConfig: { level: '4' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [160, 90],
   },
   {
-    name: "旅客",
-    linkTargetName: "解析服务",
-    linkValue: " ",
-    coordConfig: { level: "4" },
+    name: '旅客',
+    linkTargetName: '解析服务',
+    linkValue: ' ',
+    coordConfig: { level: '4' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [160, 60],
   },
   {
-    name: "推送节点",
-    linkTargetName: "首都机场BHS ",
-    linkValue: " ",
-    coordConfig: { level: "5" },
+    name: '推送节点',
+    linkTargetName: '首都机场BHS ',
+    linkValue: ' ',
+    coordConfig: { level: '5' },
     symbolSize: 60,
     symbol: pushImg,
     draggable: false,
     value: [200, 160],
   },
   {
-    name: "推送节点 ",
-    linkTargetName: "星盟SBH ",
-    linkValue: " ",
-    coordConfig: { level: "5" },
+    name: '推送节点 ',
+    linkTargetName: '星盟SBH ',
+    linkValue: ' ',
+    coordConfig: { level: '5' },
     symbolSize: 60,
     symbol: pushImg,
     draggable: false,
@@ -504,10 +452,10 @@ const nodeDataList = ref([
     value: [200, 160],
   },
   {
-    name: "推送节点  ",
-    linkTargetName: "局方公共平台 ",
-    linkValue: " ",
-    coordConfig: { level: "5" },
+    name: '推送节点  ',
+    linkTargetName: '局方公共平台 ',
+    linkValue: ' ',
+    coordConfig: { level: '5' },
     symbolSize: 60,
     symbol: pushImg,
     draggable: false,
@@ -517,10 +465,10 @@ const nodeDataList = ref([
     value: [200, 160],
   },
   {
-    name: "推送节点   ",
-    linkTargetName: "行李推送事件",
-    linkValue: " ",
-    coordConfig: { level: "5" },
+    name: '推送节点   ',
+    linkTargetName: '行李推送事件',
+    linkValue: ' ',
+    coordConfig: { level: '5' },
     symbolSize: 60,
     symbol: pushImg,
     draggable: false,
@@ -530,10 +478,10 @@ const nodeDataList = ref([
     value: [200, 160],
   },
   {
-    name: "推送节点    ",
-    linkTargetName: "ES",
-    linkValue: " ",
-    coordConfig: { level: "5" },
+    name: '推送节点    ',
+    linkTargetName: 'ES',
+    linkValue: ' ',
+    coordConfig: { level: '5' },
     symbolSize: 60,
     symbol: pushImg,
     draggable: false,
@@ -543,105 +491,105 @@ const nodeDataList = ref([
     value: [200, 160],
   },
   {
-    name: "解析服务",
-    linkTargetName: " Kafka",
-    linkValue: " ",
-    coordConfig: { level: "5" },
+    name: '解析服务',
+    linkTargetName: ' Kafka',
+    linkValue: ' ',
+    coordConfig: { level: '5' },
     symbolSize: 60,
     symbol: pushImg,
     draggable: false,
     value: [200, 100],
   },
   {
-    name: "首都机场BHS ",
-    linkTargetName: "首都机场BHS ",
-    linkValue: " ",
-    coordConfig: { level: "6" },
+    name: '首都机场BHS ',
+    linkTargetName: '首都机场BHS ',
+    linkValue: ' ',
+    coordConfig: { level: '6' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [240, 220],
   },
   {
-    name: "星盟SBH ",
-    linkTargetName: "星盟SBH ",
-    linkValue: " ",
-    coordConfig: { level: "6" },
+    name: '星盟SBH ',
+    linkTargetName: '星盟SBH ',
+    linkValue: ' ',
+    coordConfig: { level: '6' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [240, 190],
   },
   {
-    name: "局方公共平台 ",
-    linkTargetName: "局方公共平台 ",
-    linkValue: " ",
-    coordConfig: { level: "6" },
+    name: '局方公共平台 ',
+    linkTargetName: '局方公共平台 ',
+    linkValue: ' ',
+    coordConfig: { level: '6' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [240, 160],
   },
   {
-    name: "行李推送事件",
-    linkTargetName: "行李推送事件",
-    linkValue: " ",
-    coordConfig: { level: "6" },
+    name: '行李推送事件',
+    linkTargetName: '行李推送事件',
+    linkValue: ' ',
+    coordConfig: { level: '6' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [240, 130],
   },
   {
-    name: "ES",
-    linkTargetName: "ES",
-    linkValue: " ",
-    coordConfig: { level: "6" },
+    name: 'ES',
+    linkTargetName: 'ES',
+    linkValue: ' ',
+    coordConfig: { level: '6' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [240, 100],
   },
   {
-    name: " Kafka",
-    linkTargetName: "存储服务",
-    linkValue: " ",
-    coordConfig: { level: "6" },
+    name: ' Kafka',
+    linkTargetName: '存储服务',
+    linkValue: ' ',
+    coordConfig: { level: '6' },
     symbolSize: 30,
     symbol: defaultImg,
     draggable: false,
     value: [240, 70],
   },
   {
-    name: "存储服务",
-    linkTargetName: "Mysql",
-    linkValue: " ",
-    coordConfig: { level: "7" },
+    name: '存储服务',
+    linkTargetName: 'Mysql',
+    linkValue: ' ',
+    coordConfig: { level: '7' },
     symbolSize: 60,
     symbol: saveImg,
     draggable: false,
     value: [280, 160],
   },
   {
-    name: "Mysql",
-    linkTargetName: "Mysql",
-    linkValue: " ",
-    coordConfig: { level: "8" },
+    name: 'Mysql',
+    linkTargetName: 'Mysql',
+    linkValue: ' ',
+    coordConfig: { level: '8' },
     symbolSize: 60,
     symbol: mysqlImg,
     draggable: false,
     value: [340, 160],
   },
-]);
+])
 const options = reactive({
   itemStyle: {
     normal: {
-      color: "#67C23A",
+      color: '#67C23A',
     },
     shadowBlur: 0,
   },
   textStyle: {
-    color: "#444",
+    color: '#444',
     fontSize: 16,
     fontWeight: 600,
   },
@@ -654,75 +602,63 @@ const options = reactive({
   legend: [
     {
       formatter: function (name) {
-        return echarts.format.truncateText(name, 200, "12px", "…");
+        return echarts.format.truncateText(name, 200, '12px', '…', {})
       },
       tooltip: {
         show: true,
       },
-      selectedMode: "false",
+      selectedMode: 'false',
       bottom: 20,
     },
   ],
   animationDuration: 500,
-  animationEasingUpdate: "quinticInOut",
+  animationEasingUpdate: 'quinticInOut',
   xAxis: {
     show: false,
-    type: "value",
+    type: 'value',
   },
   yAxis: {
     show: false,
-    type: "value",
+    type: 'value',
   },
   series: [
     {
-      type: "graph",
-      coordinateSystem: "cartesian2d",
+      type: 'graph',
+      coordinateSystem: 'cartesian2d',
       //圆形上面的文字
       label: {
-        normal: {
-          position: "bottom",
-          show: true,
-          textStyle: {
-            fontSize: 12,
-          },
-        },
+        position: 'bottom',
+        show: true,
+        fontSize: 12,
       },
       itemStyle: {
-        normal: {
-          color: "#409eff",
-        },
+        color: '#409eff',
+
         shadowBlur: 0,
       },
       lineStyle: {
-        normal: {
-          width: 0,
-          shadowColor: "none",
-          color: "#ff0000",
-        },
+        width: 0,
+        shadowColor: 'none',
+        color: '#ff0000',
       },
-      data: [],
-      links: [],
+      data: <any[]>[],
+      links: <any[]>[],
     },
   ],
-});
-const handle = () => {
-  if (myChart) {
-    myChart.resize();
-  }
-};
-const getCoordDataList = () => {
-  let coorDataDict = {};
+})
+const getCoordDataList = (): any[] => {
+  let coorDataDict = {}
   let defaultConfig = {
-    type: "lines", //块1,2...n到节点A,B...N
-    coordinateSystem: "cartesian2d",
+    type: 'lines', //块1,2...n到节点A,B...N
+    coordinateSystem: 'cartesian2d',
     // animationDelay: 10000,
     z: 1,
     effect: {
       show: true,
       smooth: true,
       trailLength: 0,
-      symbol: "arrow",
-      color: "#92A7D5",
+      symbol: 'arrow',
+      color: '#92A7D5',
       symbolSize: 10,
       period: 3,
       delay: 1500,
@@ -731,83 +667,192 @@ const getCoordDataList = () => {
     lineStyle: {
       normal: {
         curveness: 0,
-        color: "#92A7D5",
+        color: '#92A7D5',
         width: 1,
       },
     },
     data: [],
-  };
-  nodeDataList.value.map((item) => {
+  }
+  nodeDataList.value.map(item => {
     if (item.coordConfig !== undefined) {
       if (!(item.coordConfig.level in coorDataDict)) {
-        let coorConfig = JSON.parse(JSON.stringify(defaultConfig));
+        let coorConfig = JSON.parse(JSON.stringify(defaultConfig))
         if (item.coordConfig.lineStyle !== undefined) {
-          coorConfig.lineStyle = item.coordConfig.lineStyle;
+          coorConfig.lineStyle = item.coordConfig.lineStyle
         }
         if (item.coordConfig.effect !== undefined) {
-          coorConfig.effect = item.coordConfig.effect;
+          coorConfig.effect = item.coordConfig.effect
         }
-        coorDataDict[item.coordConfig.level] = coorConfig;
+        coorDataDict[item.coordConfig.level] = coorConfig
       }
 
       let coordData = [
         item.value,
-        nodeDataList.value.filter((i) => i.name == item.linkTargetName)[0]
+        nodeDataList.value.filter(i => i.name == item.linkTargetName)[0]
           .value ||
-          nodeDataList.value.filter((i) => i.name == item.linkTargetName)[1]
+          nodeDataList.value.filter(i => i.name == item.linkTargetName)[1]
             .value,
-      ];
+      ]
       coorDataDict[item.coordConfig.level].data.push({
         coords: coordData,
-      });
+      })
       if (item.coordConfig.bilateral) {
         coorDataDict[item.coordConfig.level].data.push({
           coords: coordData.reverse(),
-        });
+        })
       }
     }
-  });
-  return Object.values(coorDataDict);
-};
-nodeDataList.value.map((item) => {
+  })
+  return Object.values(coorDataDict)
+}
+nodeDataList.value.forEach(item => {
   datas.value.push({
     source: item.name,
     value: item.linkValue,
     target: item.linkTargetName,
-  });
-});
+  })
+})
 const resizeHandler = () => {
-  myChart.resize();
-};
+  myChart.value?.resize()
+}
 onMounted(() => {
-  options.series[0].data = nodeDataList;
-  options.series[0].links = datas;
-  options.series = options.series.concat(getCoordDataList());
-  myChart.value = echarts.init(chartDom.value);
-  myChart.value.setOption(options, true);
-  window.addEventListener("resize", resizeHandler);
-});
-//新增
-const addJournalForm = () => {
-  msgTitle.value = "查看日志";
-  flag.value = true;
-};
-//取消
-const resetForm = () => {
-  flag.value = false;
-};
-// console.log(nodeDataList.value);
-// options.value.series[0].data = nodeDataList.value;
-// options.value.series[0].links = datas.value;
-// options.value.series = options.value.series.concat(getCoordDataList());
-// myChart = echarts.init(document.getElementById("map"));
-// myChart.value.setOption(options.value);
+  options.series[0].data = nodeDataList.value
+  options.series[0].links = datas.value
+  options.series.push(...getCoordDataList())
+  myChart.value = echarts.init(chartDom.value as HTMLDivElement)
+  myChart.value.setOption(options as echarts.EChartOption, true)
+  window.addEventListener('resize', _.debounce(resizeHandler, resizeDelay))
+})
 // // 事件
 // myChart.on("click", (params) => {
 //   console.log(params);
 // });
-// 监听页面缩放 防止dom重复渲染
-// window.addEventListener("resize", _.debounce(handle, desc));
+
+//新增
+const addJournalForm = () => {
+  msgTitle.value = '查看日志'
+  flag.value = true
+}
+//取消
+const resetForm = () => {
+  flag.value = false
+}
+
+const getSearchData = (text: string) => {
+  console.log(text)
+}
+const clearSearchData = () => {}
+
+type TableColumn = {
+  label: string
+  key: string
+}
+let page = 0
+const loading = ref(false)
+const noMore = ref(false)
+const loadDisabled = computed(() => loading.value || noMore.value)
+//表头
+const tableColumns = ref<TableColumn[]>([])
+//列表
+const tableData = ref<any[]>([])
+const resetTable = () => {
+  page = 0
+  loading.value = false
+  noMore.value = false
+  tableData.value = []
+}
+const getTableData = async () => {
+  try {
+    loading.value = true
+    const {
+      code,
+      returnData: { columnSet, listValues },
+    } = await Query({
+      id: DATACONTENT_ID.sysServiceTopTable,
+      needPage: ++page,
+      dataContent: [serviceID, timeStart.value, timeEnd.value],
+    })
+    if (Number(code) === 0) {
+      tableColumns.value = columnSet.map(column => ({
+        label: column.columnLabel,
+        key: column.columnName,
+        ...column,
+      }))
+      if (listValues.length === 0) {
+        page--
+        noMore.value = true
+      }
+      tableData.value.push(...listValues)
+      loading.value = false
+    } else {
+      throw new Error('获取数据失败')
+    }
+  } catch (error: any) {
+    page--
+    loading.value = false
+    ElMessage.error(error.message)
+  }
+}
+const load = () => {
+  if (loadDisabled.value) {
+    return
+  }
+  getTableData()
+}
+
+const getToday = () => {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = now.getMonth() + 1
+  const date = now.getDate()
+  return `${year}-${month}-${date}`
+}
+const today = getToday()
+const timeStart = ref(`${today} 00:00:00`)
+const timeEnd = ref(`${today} 23:59:59`)
+const timeSelectHandler = () => {
+  const startTime = new Date(timeStart.value).getTime()
+  const endTime = new Date(timeEnd.value).getTime()
+  if (startTime > endTime) {
+    ElMessage.error('开始时间不能大于结束时间')
+    timeEnd.value = ''
+    return
+  }
+  if (startTime < endTime - (3 * 24 * 60 * 60 - 1) * 1000) {
+    ElMessage.error('间隔时间不能大于三天')
+    timeEnd.value = ''
+    return
+  }
+  resetTable()
+  getTableData()
+}
+
+type progressItem = {
+  logType: string
+  resultCode: string
+  logTime: string
+  resultDetails?: string
+}
+const progressList = ref<progressItem[]>([])
+progressList.value.push(
+  ...Array.from({ length: 3 }).map(() => ({
+    logType: '更新 Github 模板',
+    resultCode: '989665554',
+    logTime: '2022-4-26 15:48:55',
+  }))
+)
+const rowClickHandler = (row, column, event) => {
+  progressList.value = []
+  if (row.logObject) {
+    tableData.value.forEach(record => {
+      if (record.logObject == row.logObject) {
+        progressList.value.push(record)
+      }
+    })
+  } else {
+    progressList.value.push(row)
+  }
+}
 </script>
 <style lang="scss" scoped>
 .integration__cont__map__cont {

src/views/systemSettings/sourceTube/index.vue

@@ -4,13 +4,13 @@
       <Minheader :is-auth="true" :is-statuser="true" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
-            <div class="manageTitle">数据源服务</div>
+            <div class="manageTitle">数据源管理</div>
           </div>
         </template></Minheader
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -23,6 +23,8 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
@@ -30,7 +32,7 @@
               <el-col>
                 <el-form-item label="数据源名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.dataSourceName"
                     placeholder="请输入数据源名称"
                   />
                 </el-form-item>
@@ -39,7 +41,7 @@
                 <el-form-item label="协议名称" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.china"
+                    v-model="tableForm.protocolName"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -60,7 +62,7 @@
                 <el-form-item label="连接参数" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.englin"
+                    v-model="tableForm.connectConfig"
                     placeholder="请输入连接参数"
                   />
                 </el-form-item>
@@ -76,37 +78,30 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增数据源服务"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableOptionser = ref<Array>([]); //弹窗下拉
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
+  dataSourceID: "",
+  protocolID: "",
+  dataSourceName: "",
+  connectConfig: "",
+  protocolName: "",
+  event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -130,19 +125,19 @@ const tableBtnGroup = ref([
 ]);
 //新增
 const addForm = () => {
-  msgTitle.value = "新增数据源服务";
+  msgTitle.value = "新增数据源";
+  tableForm.event = 1;
   flag.value = true;
   type.value = "";
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForm.dataSourceID = "";
+  tableForm.protocolID = "";
+  tableForm.dataSourceName = "";
+  tableForm.connectConfig = "";
+  tableForm.protocolName = "";
 };
 //编辑
 // const editDialog = (data) => {
@@ -159,19 +154,25 @@ const resetForm = () => {
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
-    msgTitle.value = "编辑数据源服务";
+    msgTitle.value = "编辑数据源";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
+    tableForm.event = 2;
+    tableForm.dataSourceID = index.dataSourceID;
+    tableForm.protocolID = index.protocolID;
+    tableForm.dataSourceName = index.dataSourceName;
+    tableForm.connectConfig = index.connectConfig;
+    tableForm.protocolName = index.protocolName;
   } else if (param === 3) {
-    msgTitle.value = "删除数据源服务";
+    msgTitle.value = "删除数据源";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.dataSourceID = index.dataSourceID;
+    tableForm.protocolID = index.protocolID;
+    tableForm.dataSourceName = index.dataSourceName;
+    tableForm.connectConfig = index.connectConfig;
+    tableForm.protocolName = index.protocolName;
   } else if (param === 4) {
   }
 };
@@ -181,10 +182,95 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.sourceDataTabId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/systemSettings/sourceservice/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -115,6 +115,16 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const asShow = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const router = useRouter();
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除

src/views/systemSettings/warningEdit/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="airportInfo">
     <div class="headerBox">
-      <Minheader :is-Preser="true" :is-statuser="true">
+      <Minheader :is-Preser="true" :is-statuser="true" @preserForm="preserForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">报警预警场景</div>
@@ -10,15 +10,15 @@
       >
       <div class="diacont">
         <el-form :model="tableForm" class="w100 fw">
-          <div class="outersurface pd30">
+          <!-- <div class="outersurface pd30">
             <el-form-item label="策略名称" size="default">
               <el-input v-model="tableForm.name" placeholder="请输入策略名称" />
             </el-form-item>
-          </div>
+          </div> -->
           <div class="outersurface pd30">
             <el-form-item label="航司二字码" size="default">
               <el-input
-                v-model="tableForm.china"
+                v-model="tableForm.IATACode"
                 placeholder="请输入航司二字码"
               />
             </el-form-item>
@@ -27,7 +27,7 @@
             <el-form-item label="起飞机场" size="default">
               <el-select
                 style="width: 100%"
-                v-model="tableForm.englin"
+                v-model="tableForm.departmentAirport"
                 class="input-shadow"
                 filterable
                 default-first-option
@@ -48,7 +48,7 @@
             <el-form-item label="降落机场" size="default">
               <el-select
                 style="width: 100%"
-                v-model="tableForm.two"
+                v-model="tableForm.landingAirport"
                 class="input-shadow"
                 filterable
                 default-first-option
@@ -67,23 +67,36 @@
           </div>
           <div class="outersurface">
             <el-form-item label="航班号" size="default">
-              <el-input v-model="tableForm.three" placeholder="请输入航班号" />
+              <el-input
+                v-model="tableForm.flightNo"
+                placeholder="请输入航班号"
+              />
             </el-form-item>
           </div>
-          <div class="outertwowid pd30">
-            <el-form-item label="起止时间" size="default">
+          <div class="outersurface pd30">
+            <el-form-item label="生效时间" size="default">
               <el-date-picker
-                v-model="tableForm.time"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-              />
+                v-model="tableForm.startDate"
+                :rows="1"
+                type="datetime"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
             </el-form-item>
           </div>
-          <div class="outerthreewid">
-            <el-form-item label="备注" size="default">
-              <el-input v-model="tableForm.text" placeholder="请输入备注" />
+          <div class="outersurface pd30">
+            <el-form-item label="失效时间" size="default">
+              <el-date-picker
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                v-model="tableForm.endDate"
+                :rows="1"
+                type="datetime"
+                placeholder="选择日期时间"
+              >
+              </el-date-picker>
             </el-form-item>
           </div>
         </el-form>
@@ -106,7 +119,7 @@
     </div>
     <div class="containers scroll-y">
       <DataTable
-        :tableHeader="state.list"
+        :tableHeader="tableCols"
         :tableData="tableData"
         :tableBtnGroup="tableBtnGroup"
         :tableProperty="{ rowKey: 'ID' }"
@@ -120,6 +133,8 @@
       :msgTitle="msgTitle"
       @resetForm="resetForm"
       @delRest="delRest"
+      @submitForm="submitForm"
+      @delRemove="delRemove"
     >
       <div class="diacont">
         <el-form :model="tableForms">
@@ -127,7 +142,7 @@
             <el-col :span="12">
               <el-form-item label="策略名称" size="default">
                 <el-input
-                  v-model="tableForms.name"
+                  v-model="tableForms.StrategyName"
                   placeholder="请输入策略名称"
                 />
               </el-form-item>
@@ -136,7 +151,7 @@
               <el-form-item label="计算依据" size="default">
                 <el-select
                   style="width: 100%"
-                  v-model="tableForms.china"
+                  v-model="tableForms.calculationBasis"
                   class="input-shadow"
                   filterable
                   default-first-option
@@ -156,7 +171,7 @@
             <el-col :span="12">
               <el-form-item label="预警时长" size="default">
                 <el-input
-                  v-model="tableForms.englin"
+                  v-model="tableForms.warningDuration"
                   placeholder="请输入预警时长"
                 />
               </el-form-item>
@@ -164,7 +179,7 @@
             <el-col :span="12">
               <el-form-item label="报警时长" size="default">
                 <el-input
-                  v-model="tableForms.two"
+                  v-model="tableForms.alarmDuration"
                   placeholder="请输入报警时长"
                 />
               </el-form-item>
@@ -173,7 +188,7 @@
               <el-form-item label="开始节点" size="default">
                 <el-select
                   style="width: 100%"
-                  v-model="tableForms.three"
+                  v-model="tableForms.beginNode"
                   class="input-shadow"
                   filterable
                   default-first-option
@@ -194,7 +209,7 @@
               <el-form-item label="开始位置" size="default">
                 <el-select
                   style="width: 100%"
-                  v-model="tableForms.text"
+                  v-model="tableForms.beginPosition"
                   class="input-shadow"
                   filterable
                   default-first-option
@@ -215,7 +230,7 @@
               <el-form-item label="结束节点" size="default">
                 <el-select
                   style="width: 100%"
-                  v-model="tableForms.text1"
+                  v-model="tableForms.endNode"
                   class="input-shadow"
                   filterable
                   default-first-option
@@ -236,7 +251,7 @@
               <el-form-item label="结束位置" size="default">
                 <el-select
                   style="width: 100%"
-                  v-model="tableForms.text2"
+                  v-model="tableForms.endPosition"
                   class="input-shadow"
                   filterable
                   default-first-option
@@ -264,56 +279,46 @@
 import Minheader from "@/components/minheader/index.vue";
 import DataTable from "@/components/tableTemp/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const router = useRouter();
+const route = useRoute();
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-  time: "",
+  alarmSceneId: "",
+  IATACode: "",
+  departmentAirport: "",
+  landingAirport: "",
+  flightNo: "",
+  startDate: "",
+  endDate: "",
+  event: 2,
 }); //报警预警场景
 const tableForms = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-  text1: "",
-  text2: "",
+  alarmStrategyID: "",
+  StrategyName: "",
+  calculationBasis: "",
+  warningDuration: "",
+  alarmDuration: "",
+  beginNode: "",
+  beginPosition: "",
+  endNode: "",
+  endPosition: "",
+  alarmSceneId: route.query.alarmSceneId,
+  event: "",
 }); //弹窗内容
 const tableOptionser = ref<Array>([]); //下拉
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增报警预警策略"); //弹窗标题
 //列表
-const tableData = ref([
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -345,16 +350,24 @@ const addForm = () => {
   msgTitle.value = "新增报警预警策略";
   flag.value = true;
   type.value = "";
+  tableForms.event = 1;
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForms.alarmStrategyID = "";
+  tableForms.StrategyName = "";
+  tableForms.calculationBasis = "";
+  tableForms.warningDuration = "";
+  tableForms.alarmDuration = "";
+  tableForms.beginNode = "";
+  tableForms.beginPosition = "";
+  tableForms.endNode = "";
+  tableForms.endPosition = "";
+};
+const delRemove = () => {
+  tableForms.event = 3;
+  generalDataReception(tableForms);
 };
 //删除
 const delRest = () => {
@@ -366,21 +379,180 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑报警预警策略";
     flag.value = true;
     type.value = "";
-    tableForms.name = index.name;
-    tableForms.china = index.china;
-    tableForms.englin = index.englin;
-    tableForms.two = index.two;
-    tableForms.three = index.three;
-    tableForms.text = index.text;
-    tableForms.text1 = index.text1;
-    tableForms.text2 = index.text2;
+    tableForms.event = 2;
+    tableForms.alarmStrategyID = index.alarmStrategyID;
+    tableForms.StrategyName = index.StrategyName;
+    tableForms.calculationBasis = index.calculationBasis;
+    tableForms.warningDuration = index.warningDuration;
+    tableForms.alarmDuration = index.alarmDuration;
+    tableForms.beginNode = index.beginNode;
+    tableForms.beginPosition = index.beginPosition;
+    tableForms.endNode = index.endNode;
+    tableForms.endPosition = index.endPosition;
   } else if (param === 3) {
     msgTitle.value = "删除报警预警策略";
     flag.value = true;
     type.value = "del";
+    tableForms.event = 3;
+    tableForms.alarmStrategyID = index.alarmStrategyID;
+    tableForms.StrategyName = index.StrategyName;
+    tableForms.calculationBasis = index.calculationBasis;
+    tableForms.warningDuration = index.warningDuration;
+    tableForms.alarmDuration = index.alarmDuration;
+    tableForms.beginNode = index.beginNode;
+    tableForms.beginPosition = index.beginPosition;
+    tableForms.endNode = index.endNode;
+    tableForms.endPosition = index.endPosition;
   } else if (param === 4) {
   }
 };
+//获取预警报警场景(按照ID)
+const sysServiceWarn = async () => {
+  try {
+    let arr = [route.query.alarmSceneId];
+    // arr.push(this.$route.query.id);
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.sysServiceWarnId,
+      dataContent: arr,
+    });
+    if (code === "0") {
+      tableForm.alarmSceneId = returnData.listValues[0].alarmSceneId
+        ? returnData.listValues[0].alarmSceneId
+        : "";
+      tableForm.IATACode = returnData.listValues[0].IATACode
+        ? returnData.listValues[0].IATACode
+        : "";
+      tableForm.departmentAirport = returnData.listValues[0].departmentAirport
+        ? returnData.listValues[0].departmentAirport
+        : "";
+      tableForm.landingAirport = returnData.listValues[0].landingAirport
+        ? returnData.listValues[0].landingAirport
+        : "";
+      tableForm.flightNo = returnData.listValues[0].flightNo
+        ? returnData.listValues[0].flightNo
+        : "";
+      tableForm.startDate = returnData.listValues[0].startDate
+        ? returnData.listValues[0].startDate
+        : "";
+      tableForm.endDate = returnData.listValues[0].endDate
+        ? returnData.listValues[0].endDate
+        : "";
+    } else {
+      // this.page--;
+      // this.$message.error.message;
+      // this.loading = false;
+    }
+  } catch (error) {
+    // this.page--;
+    // this.loading = false;
+  }
+};
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.sysServiceStrategyId,
+      needPage: ++page.value,
+      dataContent: [route.query.alarmSceneId],
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForms);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    let obj = {
+      alarmSceneId: route.query.alarmSceneId,
+    };
+    data = {
+      ...data,
+      ...obj,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+//编辑数据
+const preserForm = async () => {
+  tableForm.event = 2;
+  generalDataReceptions(tableForm);
+};
+//表格-增/删/改
+const generalDataReceptions = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code, message } = await GeneralDataReception({
+      serviceId: route.query.submitID,
+      dataContent: JSON.stringify(data),
+    });
+    if (code === "0") {
+      ElMessage.success(`操作成功`);
+      router.push({ path: "/systemSettings/warningSet" });
+    } else {
+      ElMessage.error(`操作失败`);
+    }
+  } catch (error) {}
+};
+sysServiceWarn();
+getQuery();
 </script>
 
 <style lang="scss" scoped>

src/views/systemSettings/warningSet/index.vue

@@ -15,7 +15,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -29,22 +29,24 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <!-- <el-col :span="12">
                 <el-form-item label="策略名称" size="default">
                   <el-input
                     v-model="tableForm.name"
                     placeholder="请输入策略名称"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="航司二字码" size="default">
                   <el-input
-                    v-model="tableForm.china"
+                    v-model="tableForm.IATACode"
                     placeholder="请输入航司二字码"
                   />
                 </el-form-item>
@@ -53,7 +55,7 @@
                 <el-form-item label="起飞机场" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.englin"
+                    v-model="tableForm.departmentAirport"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -74,7 +76,7 @@
                 <el-form-item label="降落机场" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.two"
+                    v-model="tableForm.landingAirport"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -94,23 +96,38 @@
               <el-col>
                 <el-form-item label="航班号" size="default">
                   <el-input
-                    v-model="tableForm.three"
+                    v-model="tableForm.flightNo"
                     placeholder="请输入航班号"
                   />
                 </el-form-item>
               </el-col>
-              <el-col>
-                <el-form-item label="起止时间" size="default">
+              <el-col :span="12">
+                <el-form-item label="生效时间" size="default">
                   <el-date-picker
-                    v-model="tableForm.time"
-                    type="daterange"
-                    range-separator="-"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                  />
+                    v-model="tableForm.startDate"
+                    :rows="1"
+                    type="datetime"
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    placeholder="选择日期时间"
+                  >
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col>
+              <el-col :span="12">
+                <el-form-item label="失效时间" size="default">
+                  <el-date-picker
+                    format="YYYY-MM-DD HH:mm:ss"
+                    value-format="YYYY-MM-DD HH:mm:ss"
+                    v-model="tableForm.endDate"
+                    :rows="1"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col>
                 <el-form-item label="备注" size="default">
                   <el-input
                     type="textarea"
@@ -118,7 +135,7 @@
                     placeholder="请输入备注"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
           </el-form>
         </div>
@@ -130,48 +147,33 @@
 import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
+const page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const router = useRouter();
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增告警预警维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗\
 const tableOptionser = ref<Array>([]); //弹窗下拉
+const submitID = ref<String>("");
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-  time: "",
+  IATACode: "",
+  departmentAirport: "",
+  landingAirport: "",
+  flightNo: "",
+  startDate: "",
+  endDate: "",
+  event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -196,11 +198,24 @@ const tableBtnGroup = ref([
     param: 3,
   },
 ]);
+//获取弹框-下拉数据
+const getSelectData = async (id, name) => {
+  const { code, returnData } = await Query({
+    id,
+    dataContent: name ? [name] : name === null ? [null] : [],
+  });
+  if (code == 0) {
+    tableOptionser.value = returnData.listValues;
+  } else {
+    tableOptionser.value = [];
+  }
+};
 //新增
 const addForm = () => {
   msgTitle.value = "新增告警预警维护";
   flag.value = true;
   type.value = "";
+  tableForm.event = 1;
 };
 //取消
 const resetForm = () => {
@@ -227,11 +242,24 @@ const resetForm = () => {
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
-    router.push({ path: "/systemSettings/warningEdit" });
+    router.push({
+      path: "/systemSettings/warningEdit",
+      query: {
+        alarmSceneId: index.alarmSceneId,
+        submitID: submitID.value,
+      },
+    });
   } else if (param === 3) {
     msgTitle.value = "删除告警预警维护";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.IATACode = index.IATACode;
+    tableForm.departmentAirport = index.departmentAirport;
+    tableForm.landingAirport = index.landingAirport;
+    tableForm.flightNo = index.flightNo;
+    tableForm.startDate = index.startDate;
+    tableForm.endDate = index.endDate;
   } else if (param === 4) {
   }
 };
@@ -241,10 +269,98 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.sysServiceWarningId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      submitID.value = returnData.submitID;
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      returnData.columnSet.forEach((item) => {
+        if (item.listqueryTemplateID && item.columnName === "landingAirport") {
+          getSelectData(item.listqueryTemplateID);
+        }
+      });
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {