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

src/components/Table/index.vue

@@ -636,7 +636,7 @@ export default {
           this.tableArrs.push(item.columnName);
           // const reqUt = this.getSelectData(item.listqueryTemplateID)
           // reqUts.push(reqUt)
-          if(!this.tableOptions[item.columnName]){
+          if (!this.tableOptions[item.columnName]) {
             this.tableOptions[item.columnName] = await this.getSelectData(
               item.listqueryTemplateID
             );
@@ -972,6 +972,9 @@ export default {
   width: 100%;
   // background-color: #fff;
   // padding: 20px;
+  .data-table-content {
+    height: 100%;
+  }
   ::v-deep .table {
     width: 100%;
     .cell {

src/views/BasicsData/views/BaggageType/BaggageType.vue

@@ -9,7 +9,14 @@
 <template>
   <div class="airportInfo">
     <div class="wrap">
-      <DataTable :data-id="dataId" :rows="12" labelWidth="100px" :minHeight="70" width="800px" />
+      <DataTable
+        :data-id="dataId"
+        :rows="12"
+        labelWidth="100px"
+        :minHeight="70"
+        width="800px"
+        tableHeight="700"
+      />
     </div>
   </div>
 </template>
@@ -28,7 +35,7 @@ import { GeneralDataReception, Query } from "@/api/dataIntegration";
 export default {
   name: "AirportInfo",
   components: { Search, Dialog, DataTable },
-  data () {
+  data() {
     return {
       dataId: DATACONTENT_ID.bagTableId,
       arr: [], //内容数据
@@ -68,12 +75,12 @@ export default {
       modid: "",
     };
   },
-  created () {
+  created() {
     // this.getAirlines();
     // this.exceptionlist();
   },
   computed: {
-    serachBox () {
+    serachBox() {
       if (this.searchInfo) {
         return this.arr.filter((data) => {
           return Object.keys(data).some((key) => {
@@ -88,7 +95,7 @@ export default {
   },
   methods: {
     //异常列表查询
-    async exceptionlist () {
+    async exceptionlist() {
       let params = {
         id: "",
       };
@@ -98,7 +105,7 @@ export default {
       }
     },
     //搜索
-    getSearchData (val) {
+    getSearchData(val) {
       let that = this;
       that.exceptionlist().then(function (data) {
         if (val) {
@@ -110,7 +117,7 @@ export default {
       // console.log(this.searchInfo);
     },
     //删除信息
-    handleMove (item) {
+    handleMove(item) {
       // this.ids = item.id;
       this.listDate = item;
       this.flag = true;
@@ -119,12 +126,12 @@ export default {
       };
     },
     //编辑
-    airEdit (item) {
+    airEdit(item) {
       this.EditForm = item;
       this.EditFlag = true;
     },
     //编辑机场信息-弹框-提交
-    async EditSubmit () {
+    async EditSubmit() {
       let arr = 0;
       this.$refs["ruleFormall"].validate((valid) => {
         if (valid) {
@@ -154,11 +161,11 @@ export default {
         this.EditFlag = false;
       }
     },
-    closeForm () {
+    closeForm() {
       this.$refs.ruleForm.resetFields();
     },
     //获取航司信息列表
-    async getAirlines () {
+    async getAirlines() {
       try {
         const res = await Query({
           id: 78,
@@ -175,11 +182,11 @@ export default {
     },
 
     //新增机场信息-弹框
-    handleAdd () {
+    handleAdd() {
       this.addFlag = true;
     },
     //新增机场信息-弹框-提交
-    async addSubmit () {
+    async addSubmit() {
       let arr = 0;
       this.$refs["ruleForms"].validate((valid) => {
         if (valid) {
@@ -209,7 +216,7 @@ export default {
       }
     },
     //新增机场信息-弹框-取消
-    resetForm () {
+    resetForm() {
       this.addFlag = false;
       this.EditFlag = false;
       this.ruleForm.name = "";
@@ -218,7 +225,7 @@ export default {
       this.EditForm = {};
     },
     //删除
-    async remove () {
+    async remove() {
       this.listDate.operate = "3";
       try {
         const res = await GeneralDataReception({

src/views/BasicsData/views/airport/airportInfo.vue

@@ -40,13 +40,13 @@
         <el-col :span="18">
           <DataTable
             :data-id="dataId"
-            style="min-height: 71.8vh"
             :rows="12"
             labelWidth="100px"
             :minHeight="70"
             width="800px"
             :withlodSet="true"
             :data-content="{ companyID }"
+            tableHeight="680"
           />
         </el-col>
       </el-row>

src/views/BasicsData/views/airport/airportInfoChild.vue

@@ -8,6 +8,7 @@
         label-width="140px"
         :min-height="70"
         width="800px"
+        tableHeight="700"
       />
     </div>
   </div>

src/views/BasicsData/views/deployNode/deployNodeChild.vue

@@ -7,7 +7,8 @@
         :rows="24"
         label-width="80px"
         :min-height="70"
-        width="450px"
+        width="500px"
+        tableHeight="700"
       />
     </div>
   </div>

src/views/BasicsData/views/deployNode/deployNodeHome.vue

@@ -1,6 +1,14 @@
 <template>
   <div class="airportInfo">
-    <DataTable :data-id="dataId" :rows="12" :withnodeSet="true" labelWidth="100px" :minHeight="70" width="800px" />
+    <DataTable
+      :data-id="dataId"
+      :rows="12"
+      :withnodeSet="true"
+      labelWidth="100px"
+      :minHeight="70"
+      width="800px"
+      tableHeight="700"
+    />
   </div>
 </template>
 
@@ -12,7 +20,7 @@ import DataTable from "@/components/Table";
 export default {
   name: "NodeLnformation",
   components: { orgTree, Dialog, DataTable },
-  data () {
+  data() {
     return {
       dataId: DATACONTENT_ID.deployNodeId,
       dataList: {
@@ -48,12 +56,12 @@ export default {
       typeObj: {},
     };
   },
-  created () {
+  created() {
     // this.getTreeData();
   },
   methods: {
     //渲染节点
-    renderContent (h, data) {
+    renderContent(h, data) {
       return (
         <div
           onClick={() => this.renderSub(data)}
@@ -99,15 +107,15 @@ export default {
         </div>
       );
     },
-    onNodeClick (data, e) {
+    onNodeClick(data, e) {
       e.stopPropagation();
       this.rmObj = data;
       this.removeDialogVisible = true;
     },
-    renderSub (data) {
+    renderSub(data) {
       console.log(data, "click");
     },
-    onNodeSub (data, e) {
+    onNodeSub(data, e) {
       e.stopPropagation();
       const { Type, nodeCode } = data;
       this.editDialogTitle = "新增节点信息";
@@ -124,7 +132,7 @@ export default {
       this.ruleForm.locationCode = "";
       this.ruleForm.locationCodeDescribe = "";
     },
-    onNodeEdit (data, e) {
+    onNodeEdit(data, e) {
       e.stopPropagation();
       this.editDialogTitle = "编辑节点信息";
       this.editDialogVisible = true;
@@ -134,7 +142,7 @@ export default {
       this.disFlag = true;
     },
     // 新增/编辑-确认
-    submitClickHandler () {
+    submitClickHandler() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           const { Type } = this.typeObj;
@@ -160,7 +168,7 @@ export default {
       });
     },
     // 重置
-    resetForm (formName) {
+    resetForm(formName) {
       // this.ruleForm = {}
       // if (this.type == 'add') {
       //   this.$refs[formName].resetFields()
@@ -168,12 +176,12 @@ export default {
       this.editDialogVisible = false;
     },
     // 删除-弹框
-    showRemoveDialog (item) {
+    showRemoveDialog(item) {
       this.rmObj = item;
       this.removeDialogVisible = true;
     },
     // 确认删除
-    removeSubmit () {
+    removeSubmit() {
       this.ruleForm = this.rmObj;
       this.ruleForm.operate = "3";
       this.nodeTreeData(21, this.ruleForm);
@@ -181,7 +189,7 @@ export default {
       // this.$message.success('删除成功')
     },
     // 获取二级节点
-    async getTreeData () {
+    async getTreeData() {
       try {
         const { returnData, message } = await getQuery({
           id: DATACONTENT_ID.deployNodeId,
@@ -201,7 +209,7 @@ export default {
       }
     },
     //节点操作
-    async nodeTreeData (serviceId, dataContent) {
+    async nodeTreeData(serviceId, dataContent) {
       try {
         const { message, code } = await generalDataReception({
           serviceId: `${serviceId}`,
@@ -218,7 +226,7 @@ export default {
       }
     },
     //三级展开获取数据
-    async expandData (data) {
+    async expandData(data) {
       try {
         const { returnData, message } = await getQuery({
           id: DATACONTENT_ID.deployNodeThreeId,

src/views/systemSettings/views/datastructure/datastructureChild.vue

@@ -1,7 +1,20 @@
 <template>
   <div class="queryItemSettings_home">
     <div class="wrap">
-      <DataTable ref="DataTable" :data-id="dataId" :edit-id="editId" :data-content="{ dataStructureID }" :rows="12" label-width="140px" :min-height="70" width="800px" :isDialog="false" @handleAdd="handleAdd" @handleEdit="handleEdit" />
+      <DataTable
+        tableHeight="700"
+        ref="DataTable"
+        :data-id="dataId"
+        :edit-id="editId"
+        :data-content="{ dataStructureID }"
+        :rows="12"
+        label-width="140px"
+        :min-height="70"
+        width="800px"
+        :isDialog="false"
+        @handleAdd="handleAdd"
+        @handleEdit="handleEdit"
+      />
     </div>
     <Dialog :width="width" :flag="flag">
       <div class="dialog-content">
@@ -27,75 +40,153 @@
                 </el-col> -->
               <el-col :span="12">
                 <el-form-item label="数据项名称">
-                  <el-input size="small" v-model="tableForm.ItemName"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="tableForm.ItemName"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="数据项类型">
-                  <el-select size="small" clearable style="width: 100%" v-model="tableForm.dataType" placeholder="请选择">
-                    <el-option v-for="item in tableOptions.dataType" :key="item.v" :label="item.k" :value="item.v">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.dataType"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.dataType"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="输出标识符">
-                  <el-input size="small" v-model="tableForm.outputIdentifier"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="tableForm.outputIdentifier"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="描述">
-                  <el-input size="small" v-model="tableForm.ItemDescribe"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="tableForm.ItemDescribe"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="唯一项">
-                  <el-select size="small" clearable style="width: 100%" v-model="tableForm.isKey" placeholder="请选择">
-                    <el-option v-for="item in tableOptions.OptionArr" :key="item.v" :label="item.k" :value="item.v">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.isKey"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.OptionArr"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="必填项">
-                  <el-select size="small" clearable style="width: 100%" v-model="tableForm.isMust" placeholder="请选择">
-                    <el-option v-for="item in tableOptions.OptionArr" :key="item.v" :label="item.k" :value="item.v">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.isMust"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.OptionArr"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="多条拆分">
-                  <el-select size="small" clearable style="width: 100%" v-model="tableForm.isSplite" placeholder="请选择">
-                    <el-option v-for="item in tableOptions.OptionArr" :key="item.v" :label="item.k" :value="item.v">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.isSplite"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.OptionArr"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="取值表达式">
-                  <el-input size="small" type="textarea" v-model="tableForm.computingExpression"></el-input>
+                  <el-input
+                    size="small"
+                    type="textarea"
+                    v-model="tableForm.computingExpression"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="实时计算表达式">
-                  <el-input size="small" type="textarea" v-model="tableForm.calculationExpression"></el-input>
+                  <el-input
+                    size="small"
+                    type="textarea"
+                    v-model="tableForm.calculationExpression"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="计算结果标识符">
-                  <el-input size="small" v-model="tableForm.calcIdentifier"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="tableForm.calcIdentifier"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="计算参数">
-                  <el-input size="small" v-model="tableForm.calcparameter"></el-input>
+                  <el-input
+                    size="small"
+                    v-model="tableForm.calcparameter"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="计算数据源">
-                  <el-select size="small" clearable style="width: 100%" v-model="tableForm.dataSourceID" placeholder="请选择">
-                    <el-option v-for="item in tableOptions.listValues" :key="item.v" :label="item.k" :value="item.v">
+                  <el-select
+                    size="small"
+                    clearable
+                    style="width: 100%"
+                    v-model="tableForm.dataSourceID"
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in tableOptions.listValues"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
+                    >
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -104,7 +195,9 @@
           </el-form>
         </div>
         <div class="foot right t30">
-          <el-button size="medium" @click="handleOk" class="r24" type="primary">确定</el-button>
+          <el-button size="medium" @click="handleOk" class="r24" type="primary"
+            >确定</el-button
+          >
           <el-button @click="handleCancel" size="medium">取消</el-button>
         </div>
       </div>
@@ -117,7 +210,7 @@ import Dialog from "@/layout/components/Dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/dataIntegration";
 export default {
   components: { DataTable, Dialog },
-  data () {
+  data() {
     return {
       dataId: DATACONTENT_ID.sysDataChildTabId,
       editId: DATACONTENT_ID.sysDataEditId,
@@ -174,44 +267,43 @@ export default {
             setlabel: "k",
           },
         ],
-        listValues: []
+        listValues: [],
       },
-      tableType: "add"
+      tableType: "add",
     };
   },
-  created () {
+  created() {
     if (!this.$route.query.dataStructureID) {
       this.$router.push("/systemSettings/datastructure");
       return;
     }
     this.dataStructureID = Number(this.$route.query.dataStructureID);
-    this.getData()
+    this.getData();
   },
   methods: {
-    handleAdd () {
-      this.flag = true
-      this.tableType = 'add'
+    handleAdd() {
+      this.flag = true;
+      this.tableType = "add";
     },
-    handleEdit (row) {
-      this.tableTitle = "编辑",
-        this.flag = true
-      this.tableType = 'edit'
-      this.queryDetial(row.ItemID)
+    handleEdit(row) {
+      (this.tableTitle = "编辑"), (this.flag = true);
+      this.tableType = "edit";
+      this.queryDetial(row.ItemID);
     },
     //弹框-确定
-    handleOk () {
+    handleOk() {
       this.submitClickHandler();
     },
-    handleCancel () {
+    handleCancel() {
       this.flag = false;
       this.tableForm = {};
     },
     // 新增/编辑-确认
-    submitClickHandler () {
+    submitClickHandler() {
       this.loading = true;
       this.$refs["ruleForm"].validate((valid) => {
-        console.log(this.tableForm)
-        this.tableForm['dataStructureID'] = this.dataStructureID;
+        console.log(this.tableForm);
+        this.tableForm["dataStructureID"] = this.dataStructureID;
         if (valid) {
           if (this.tableType == "add") {
             this.tableForm.event = 1;
@@ -224,12 +316,12 @@ export default {
         }
       });
     },
-    async generalDataReception (data) {
+    async generalDataReception(data) {
       try {
         data = {
           ...data,
-          ...this.dataContent
-        }
+          ...this.dataContent,
+        };
         const { code, message } = await GeneralDataReception({
           serviceId: SERVICE_ID.sysDataTabId,
           dataContent: JSON.stringify(data),
@@ -237,7 +329,7 @@ export default {
         this.loading = true;
         if (code == 0) {
           this.$message.success("操作成功");
-          this.$refs['DataTable'].getQuery();
+          this.$refs["DataTable"].getQuery();
           this.flag = false;
           this.rmFlag = false;
           this.tableObj = {};
@@ -257,7 +349,7 @@ export default {
         this.tableForm = {};
       }
     },
-    async getData () {
+    async getData() {
       try {
         this.loading = true;
         const { code, returnData } = await Query({
@@ -265,8 +357,8 @@ export default {
           dataContent: [],
         });
         if (code == 0) {
-          console.log(returnData)
-          this.tableOptions.listValues = returnData.listValues
+          console.log(returnData);
+          this.tableOptions.listValues = returnData.listValues;
         } else {
           this.loading = false;
         }
@@ -275,15 +367,15 @@ export default {
         console.log(error);
       }
     },
-    async queryDetial (id) {
+    async queryDetial(id) {
       try {
         const { code, returnData } = await Query({
           id: DATACONTENT_ID.sysDataEditId,
           dataContent: [id],
         });
         if (code == 0) {
-          console.log(returnData)
-          this.tableForm = JSON.parse(JSON.stringify(returnData.listValues[0]))
+          console.log(returnData);
+          this.tableForm = JSON.parse(JSON.stringify(returnData.listValues[0]));
         } else {
           this.loading = false;
         }
@@ -291,8 +383,8 @@ export default {
         this.loading = false;
         console.log(error);
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/systemSettings/views/datastructure/datastructureHome.vue

@@ -1,16 +1,24 @@
 <template>
   <div class="datastructure_home">
     <div class="wrap">
-      <DataTable :data-id="dataId" :rows="12" labelWidth="130px" :minHeight="70" width="800px" :withItemSet="true" />
+      <DataTable
+        tableHeight="700"
+        :data-id="dataId"
+        :rows="12"
+        labelWidth="130px"
+        :minHeight="70"
+        width="800px"
+        :withItemSet="true"
+      />
     </div>
   </div>
 </template>
 <script>
 import DataTable from "@/components/Table";
 export default {
-  data () {
+  data() {
     return {
-      dataId: DATACONTENT_ID.sysDataTabId
+      dataId: DATACONTENT_ID.sysDataTabId,
     };
   },
   components: { DataTable },

src/views/systemSettings/views/protocolManagement/protocolHome.vue

@@ -21,7 +21,15 @@
         </div>
       </div> -->
       <div class="protocol-content">
-        <DataTable :data-id="dataId" :rows="12" labelWidth="100px" :minHeight="70" width="800px" :showOverflowTooltip="true" />
+        <DataTable
+          tableHeight="680"
+          :data-id="dataId"
+          :rows="12"
+          labelWidth="100px"
+          :minHeight="70"
+          width="800px"
+          :showOverflowTooltip="true"
+        />
         <!-- <el-row :gutter="24">
           <el-col v-for="item in dataList" :key="item.protocolId" :span="4">
             <div class="grid-content">
@@ -44,33 +52,75 @@
         <div class="airportInfoDialog dialog-public-background">
           <div class="title">{{ editDialogTitle }}</div>
           <div class="content">
-            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
+            <el-form
+              ref="ruleForm"
+              :model="ruleForm"
+              :rules="rules"
+              label-width="100px"
+              class="demo-ruleForm"
+            >
               <el-form-item label="协议名称" prop="protocolName">
-                <el-input v-model="ruleForm.protocolName" size="medium" placeholder="请输入协议名称（必填）" />
+                <el-input
+                  v-model="ruleForm.protocolName"
+                  size="medium"
+                  placeholder="请输入协议名称（必填）"
+                />
               </el-form-item>
               <el-form-item label="协议类型" prop="nodeType">
-                <el-select v-model="ruleForm.nodeType" size="small" placeholder="请选择协议类型">
+                <el-select
+                  v-model="ruleForm.nodeType"
+                  size="small"
+                  placeholder="请选择协议类型"
+                >
                   <el-option label="内置" value="1"></el-option>
                   <el-option label="扩展" value="2"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="类名" prop="className">
-                <el-input v-model="ruleForm.className" size="medium" type="textarea" :rows="2" placeholder="请输入类名（必填）" />
+                <el-input
+                  v-model="ruleForm.className"
+                  size="medium"
+                  type="textarea"
+                  :rows="2"
+                  placeholder="请输入类名（必填）"
+                />
               </el-form-item>
               <el-form-item label="读方法名" prop="rmethodName">
-                <el-input v-model="ruleForm.rmethodName" size="medium" placeholder="请输入读方法名（必填）" />
+                <el-input
+                  v-model="ruleForm.rmethodName"
+                  size="medium"
+                  placeholder="请输入读方法名（必填）"
+                />
               </el-form-item>
               <el-form-item label="写方法名" prop="smethodName">
-                <el-input v-model="ruleForm.smethodName" size="medium" placeholder="请输入写方法名（必填）" />
+                <el-input
+                  v-model="ruleForm.smethodName"
+                  size="medium"
+                  placeholder="请输入写方法名（必填）"
+                />
               </el-form-item>
               <el-form-item label="文件名及路径" prop="filePath">
-                <el-input v-model="ruleForm.filePath" size="medium" type="textarea" :rows="3" placeholder="请输入文件名及路径" />
+                <el-input
+                  v-model="ruleForm.filePath"
+                  size="medium"
+                  type="textarea"
+                  :rows="3"
+                  placeholder="请输入文件名及路径"
+                />
               </el-form-item>
             </el-form>
           </div>
           <div class="foot center t30">
-            <el-button size="medium" type="primary" class="r25 r26" @click="submitClickHandler()">提交</el-button>
-            <el-button size="medium" class="r26" @click="resetForm('ruleForm')">取消</el-button>
+            <el-button
+              size="medium"
+              type="primary"
+              class="r25 r26"
+              @click="submitClickHandler()"
+              >提交</el-button
+            >
+            <el-button size="medium" class="r26" @click="resetForm('ruleForm')"
+              >取消</el-button
+            >
           </div>
         </div>
       </Dialog>
@@ -79,13 +129,22 @@
         <div class="airportInfoDialog">
           <div class="del-title">删除协议</div>
           <div class="content er">
-            <div class="log">
-              是否确认删除{{ rmObj.protocolName }}？
-            </div>
+            <div class="log">是否确认删除{{ rmObj.protocolName }}？</div>
           </div>
           <div class="DelFoot right t30">
-            <el-button size="medium" class="r25 r26" type="danger" @click="removeSubmit()">删除</el-button>
-            <el-button size="medium" class="r26" @click="removeDialogVisible = false">取消</el-button>
+            <el-button
+              size="medium"
+              class="r25 r26"
+              type="danger"
+              @click="removeSubmit()"
+              >删除</el-button
+            >
+            <el-button
+              size="medium"
+              class="r26"
+              @click="removeDialogVisible = false"
+              >取消</el-button
+            >
           </div>
         </div>
       </Dialog>
@@ -94,46 +153,52 @@
 </template>
 
 <script>
-import Dialog from '@/layout/components/Dialog/index.vue'
-import { GeneralDataReception, Query } from '@/api/dataIntegration'
-import DataTable from '@/components/Table'
+import Dialog from "@/layout/components/Dialog/index.vue";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
+import DataTable from "@/components/Table";
 export default {
-  name: 'ProtocolHome',
+  name: "ProtocolHome",
   components: { Dialog, DataTable },
-  data () {
+  data() {
     return {
       dataId: DATACONTENT_ID.sysProtoTabId,
       dataList: [],
       editDialogVisible: false,
       removeDialogVisible: false,
       rmObj: {},
-      editDialogTitle: '新增协议',
+      editDialogTitle: "新增协议",
       ruleForm: {
         // 协议信息表单
-        protocolName: '',
-        className: '',
-        rmethodName: '',
-        smethodName: '',
-        filePath: ''
+        protocolName: "",
+        className: "",
+        rmethodName: "",
+        smethodName: "",
+        filePath: "",
       },
       rules: {
         // 协议信息表单验证
-        protocolName: [{ required: true, message: '请输入协议名称', trigger: 'blur' }],
-        className: [{ required: true, message: '请输入类名', trigger: 'blur' }],
-        rmethodName: [{ required: true, message: '请输入读方法名', trigger: 'blur' }],
-        smethodName: [{ required: true, message: '请输入写方法名', trigger: 'blur' }]
-      }
-    }
+        protocolName: [
+          { required: true, message: "请输入协议名称", trigger: "blur" },
+        ],
+        className: [{ required: true, message: "请输入类名", trigger: "blur" }],
+        rmethodName: [
+          { required: true, message: "请输入读方法名", trigger: "blur" },
+        ],
+        smethodName: [
+          { required: true, message: "请输入写方法名", trigger: "blur" },
+        ],
+      },
+    };
   },
-  created () {
+  created() {
     //this.getList()
   },
   methods: {
-    async getList () {
+    async getList() {
       try {
         const res = await Query({
           id: DATACONTENT_ID.sysProtoTabId,
-          dataContent: []
+          dataContent: [],
         });
         if (res.code === "0") {
           this.dataList = res.returnData;
@@ -145,42 +210,42 @@ export default {
       }
     },
     // 新增-弹框
-    showAddDialog () {
-      this.editDialogTitle = '新增协议'
-      this.editDialogVisible = true
+    showAddDialog() {
+      this.editDialogTitle = "新增协议";
+      this.editDialogVisible = true;
     },
     // 编辑-弹框
-    showEditDialog (item) {
-      this.editDialogTitle = '编辑协议'
-      this.ruleForm = item
-      this.editDialogVisible = true
+    showEditDialog(item) {
+      this.editDialogTitle = "编辑协议";
+      this.ruleForm = item;
+      this.editDialogVisible = true;
     },
     // 新增/编辑-确认
-    submitClickHandler () {
-      this.$refs['ruleForm'].validate(valid => {
+    submitClickHandler() {
+      this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (!this.ruleForm.protocolId) {
-            this.addSubmit()
+            this.addSubmit();
           } else {
-            this.editSubmit()
+            this.editSubmit();
           }
-          this.resetForm('ruleForm')
+          this.resetForm("ruleForm");
         }
-      })
+      });
     },
     // 重置
-    resetForm (formName) {
+    resetForm(formName) {
       this.ruleForm = {};
-      this.$refs[formName].resetFields()
-      this.editDialogVisible = false
+      this.$refs[formName].resetFields();
+      this.editDialogVisible = false;
     },
     // 删除-弹框
-    showRemoveDialog (item) {
-      this.rmObj = item
-      this.removeDialogVisible = true
+    showRemoveDialog(item) {
+      this.rmObj = item;
+      this.removeDialogVisible = true;
     },
     // 确认删除
-    async removeSubmit () {
+    async removeSubmit() {
       this.rmObj["operate"] = "3";
       try {
         const res = await GeneralDataReception({
@@ -190,7 +255,7 @@ export default {
         if (res.code === "0") {
           this.removeDialogVisible = false;
           this.$message.success("删除成功");
-          this.getList()
+          this.getList();
         } else {
           this.$message.error(res.message ?? "失败");
         }
@@ -198,42 +263,42 @@ export default {
         console.log("错误", error);
       }
     },
-    async addSubmit () {
+    async addSubmit() {
       this.ruleForm["operate"] = "1";
       try {
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.sysProtoTabId,
-          dataContent: JSON.stringify(this.ruleForm)
-        })
+          dataContent: JSON.stringify(this.ruleForm),
+        });
         if (res.code === "0") {
-          this.$message.success(res.message ?? '成功')
-          this.getList()
+          this.$message.success(res.message ?? "成功");
+          this.getList();
         } else {
-          this.$message.error(res.message ?? '失败')
+          this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
     },
-    async editSubmit () {
+    async editSubmit() {
       this.ruleForm["operate"] = "2";
       try {
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.sysProtoTabId,
-          dataContent: JSON.stringify(this.ruleForm)
-        })
+          dataContent: JSON.stringify(this.ruleForm),
+        });
         if (res.code === "0") {
-          this.$message.success(res.message ?? '成功')
-          this.getList()
+          this.$message.success(res.message ?? "成功");
+          this.getList();
         } else {
-          this.$message.error(res.message ?? '失败')
+          this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/systemSettings/views/queryTemplate/queryTemplate.vue

@@ -8,7 +8,18 @@
 -->
 <template>
   <div class="airportInfo">
-    <DataTable :data-id="dataId" :rows="12" label-width="100px" :min-height="70" width="800px" :show-overflow-tooltip="true" :with-column-set="true" @handleAdd="handleAdd" @handleEdit="handleEdit" />
+    <DataTable
+      tableHeight="700"
+      :data-id="dataId"
+      :rows="12"
+      label-width="100px"
+      :min-height="70"
+      width="800px"
+      :show-overflow-tooltip="true"
+      :with-column-set="true"
+      @handleAdd="handleAdd"
+      @handleEdit="handleEdit"
+    />
     <!--搜索-->
     <!-- <div class="airportInfo-search">
       <Search title="查询模板" @getSearchData="getSearchData" :isSearch="false">
@@ -63,8 +74,16 @@
           ？
         </div>
         <div class="DelFoot right t30">
-          <el-button size="medium" class="r25 buwitch" type="danger" @click="remove()">删除</el-button>
-          <el-button size="medium" class="r26" @click="flag = false">取消</el-button>
+          <el-button
+            size="medium"
+            class="r25 buwitch"
+            type="danger"
+            @click="remove()"
+            >删除</el-button
+          >
+          <el-button size="medium" class="r26" @click="flag = false"
+            >取消</el-button
+          >
         </div>
       </div>
     </Dialog>
@@ -72,31 +91,31 @@
 </template>
 <script>
 // import Search from '@/layout/components/Search/index.vue'
-import Dialog from '@/layout/components/Dialog/index.vue'
-import { findarrays } from '@/utils/validate'
+import Dialog from "@/layout/components/Dialog/index.vue";
+import { findarrays } from "@/utils/validate";
 // import { AirlinesInquiry } from '@/api/SystemSettings'
 import {
   exceptiontype,
-  exceptionadd
+  exceptionadd,
   // exceptiondel
-} from '@/api/acquisition'
-import { GeneralDataReception, Query } from '@/api/dataIntegration'
-import DataTable from '@/components/Table'
+} from "@/api/acquisition";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
+import DataTable from "@/components/Table";
 export default {
-  name: 'AirportInfo',
+  name: "AirportInfo",
   components: {
     // Search,
     Dialog,
-    DataTable
+    DataTable,
   },
-  data () {
+  data() {
     return {
       dataId: DATACONTENT_ID.sysQueryTabId,
       arr: [
         {
-          typeName: '名称',
-          typeCode: '测试'
-        }
+          typeName: "名称",
+          typeCode: "测试",
+        },
       ], // 内容数据
       flag: false, // 删除弹框开关
       addFlag: false, // 新增机场信息弹框开关
@@ -106,167 +125,173 @@ export default {
       listDate: {},
       rmObj: {
         // 删除内容
-        name: ''
+        name: "",
       },
       ruleForm: {
         // 新增机场信息表单
-        name: '',
-        fullName: '',
-        code: ''
+        name: "",
+        fullName: "",
+        code: "",
       },
       EditForm: {
-        name: '',
-        fullName: '',
-        code: ''
+        name: "",
+        fullName: "",
+        code: "",
       },
       rules: {
         // 新增机场信息表单验证
-        name: [{ required: true, message: '请输入航司简称', trigger: 'blur' }],
-        fullName: [{ required: true, message: '请输入航司全称', trigger: 'blur' }],
-        code: [{ required: true, message: '请输入航司二字码', trigger: 'blur' }]
+        name: [{ required: true, message: "请输入航司简称", trigger: "blur" }],
+        fullName: [
+          { required: true, message: "请输入航司全称", trigger: "blur" },
+        ],
+        code: [
+          { required: true, message: "请输入航司二字码", trigger: "blur" },
+        ],
       },
-      modid: ''
-    }
+      modid: "",
+    };
   },
   computed: {
-    serachBox () {
+    serachBox() {
       if (this.searchInfo) {
-        return this.arr.filter(data => {
-          return Object.keys(data).some(key => {
-            return String(data[key]).toLowerCase().indexOf(this.searchInfo) > -1
-          })
-        })
+        return this.arr.filter((data) => {
+          return Object.keys(data).some((key) => {
+            return (
+              String(data[key]).toLowerCase().indexOf(this.searchInfo) > -1
+            );
+          });
+        });
       }
-      return this.arr
-    }
+      return this.arr;
+    },
   },
-  created () {
+  created() {
     // this.getAirlines();
     // this.exceptionlist();
   },
   methods: {
     // 异常列表查询
-    async exceptionlist () {
+    async exceptionlist() {
       const params = {
-        id: ''
-      }
-      const result = await exceptiontype(params)
+        id: "",
+      };
+      const result = await exceptiontype(params);
       if (Number(result.code) === 0) {
-        this.arr = result.returnData
+        this.arr = result.returnData;
       }
     },
     // 搜索
-    getSearchData (val) {
-      const that = this
+    getSearchData(val) {
+      const that = this;
       that.exceptionlist().then(function (data) {
         if (val) {
-          that.arr = findarrays(that.arr, 'typeName', val)
+          that.arr = findarrays(that.arr, "typeName", val);
         } else {
-          that.exceptionlist()
+          that.exceptionlist();
         }
-      })
+      });
       // console.log(this.searchInfo);
     },
     // 删除信息
-    handleMove (item) {
-      this.listDate = item
-      this.flag = true
+    handleMove(item) {
+      this.listDate = item;
+      this.flag = true;
       this.rmObj = {
-        name: item.queryTemplateName
-      }
+        name: item.queryTemplateName,
+      };
     },
-    async EditSubmit () {
-      let arr = 0
-      this.$refs['ruleFormall'].validate(valid => {
+    async EditSubmit() {
+      let arr = 0;
+      this.$refs["ruleFormall"].validate((valid) => {
         if (valid) {
-          arr = 1
+          arr = 1;
         } else {
-          arr = 0
-          return false
+          arr = 0;
+          return false;
         }
-      })
+      });
       if (arr === 1) {
         const params = {
           id: this.modid.id,
           typeName: this.EditForm.name,
-          typeCode: this.EditForm.fullName
-        }
-        const result = await exceptionadd(params)
+          typeCode: this.EditForm.fullName,
+        };
+        const result = await exceptionadd(params);
         if (Number(result.code) === 0) {
-          this.$message.success('成功')
-          this.exceptionlist()
-          this.$refs.ruleFormall.resetFields()
+          this.$message.success("成功");
+          this.exceptionlist();
+          this.$refs.ruleFormall.resetFields();
         }
-        this.EditFlag = false
+        this.EditFlag = false;
       }
     },
-    closeForm () {
-      this.$refs.ruleForm.resetFields()
+    closeForm() {
+      this.$refs.ruleForm.resetFields();
     },
     // 获取模板列表
-    async getAirlines () {
+    async getAirlines() {
       try {
         const res = await Query({
           id: 77,
-          dataContent: []
-        })
-        if (res.code === '0') {
-          this.arr = res.returnData
+          dataContent: [],
+        });
+        if (res.code === "0") {
+          this.arr = res.returnData;
         } else {
-          this.$message.error(res.message ?? '失败')
+          this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
     },
 
     // 新增机场信息-弹框
-    handleAdd () {
-      this.$router.push('/systemSettings/queryTemplateadd')
+    handleAdd() {
+      this.$router.push("/systemSettings/queryTemplateadd");
     },
     // 新增机场信息-弹框
-    handleEdit (item) {
+    handleEdit(item) {
       // this.modid = item;
       // this.EditForm.name = item.typeName;
       // this.EditForm.fullName = item.typeCode;
       this.$router.push({
-        path: '/systemSettings/queryTemplateedit',
-        query: { queryTemplateID: item.queryTemplateID }
-      })
+        path: "/systemSettings/queryTemplateedit",
+        query: { queryTemplateID: item.queryTemplateID },
+      });
       // this.EditForm.code = item.code2;
       // this.EditFlag = true;
     },
     // 新增机场信息-弹框-取消
-    resetForm () {
-      this.addFlag = false
-      this.EditFlag = false
-      this.ruleForm.name = ''
-      this.ruleForm.fullName = ''
-      this.$refs.ruleForms.resetFields()
-      this.$refs.ruleFormall.resetFields()
+    resetForm() {
+      this.addFlag = false;
+      this.EditFlag = false;
+      this.ruleForm.name = "";
+      this.ruleForm.fullName = "";
+      this.$refs.ruleForms.resetFields();
+      this.$refs.ruleFormall.resetFields();
     },
     // 删除
-    async remove (data) {
-      this.listDate.operate = '3'
+    async remove(data) {
+      this.listDate.operate = "3";
       try {
         const res = await GeneralDataReception({
           serviceId: 5,
-          dataContent: JSON.stringify(this.listDate)
-        })
-        if (res.code === '0') {
-          this.$message.success(res.message ?? '成功')
-          this.flag = false
-          this.listDate = {}
-          this.getAirlines()
+          dataContent: JSON.stringify(this.listDate),
+        });
+        if (res.code === "0") {
+          this.$message.success(res.message ?? "成功");
+          this.flag = false;
+          this.listDate = {};
+          this.getAirlines();
         } else {
-          this.$message.error(res.message ?? '失败')
+          this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -9,7 +9,20 @@
 <template>
   <div class="service-home">
     <div class="wrap">
-      <DataTable ref="serviceTable" :data-id="dataId" :rows="12" width="800px" label-width="110px" fixedWidth="280px" :min-height="70" :isStatus="true" :is-dialog="false" @handleAdd="showCreateDialog" @handleEdit="btnEditClickHandler">
+      <DataTable
+        ref="serviceTable"
+        tableHeight="680"
+        :data-id="dataId"
+        :rows="12"
+        width="800px"
+        label-width="110px"
+        fixedWidth="280px"
+        :min-height="70"
+        :isStatus="true"
+        :is-dialog="false"
+        @handleAdd="showCreateDialog"
+        @handleEdit="btnEditClickHandler"
+      >
         <template v-slot:header>
           <div class="status flex-wrap">
             <div class="manageTitle">服务管理</div>
@@ -23,16 +36,36 @@
         <div class="dialog-create">
           <div class="title">新增服务</div>
           <main class="content">
-            <el-form ref="serviceForm" class="service-form" :model="serviceForm" :rules="serviceFormRules" label-position="right" label-width="82px" size="mini">
+            <el-form
+              ref="serviceForm"
+              class="service-form"
+              :model="serviceForm"
+              :rules="serviceFormRules"
+              label-position="right"
+              label-width="82px"
+              size="mini"
+            >
               <el-row :gutter="36" type="flex">
                 <el-col :span="12">
                   <el-form-item label="服务名称" prop="serviceName">
-                    <el-input v-model="serviceForm.serviceName" placeholder="请输入服务名称" clearable />
+                    <el-input
+                      v-model="serviceForm.serviceName"
+                      placeholder="请输入服务名称"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="前序输出编号" label-width="114px" prop="serviceOutputID">
-                    <el-input v-model="serviceForm.serviceOutputID" placeholder="请输入前序输出编号" clearable />
+                  <el-form-item
+                    label="前序输出编号"
+                    label-width="114px"
+                    prop="serviceOutputID"
+                  >
+                    <el-input
+                      v-model="serviceForm.serviceOutputID"
+                      placeholder="请输入前序输出编号"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
@@ -57,24 +90,52 @@
                   <div class="flex">
                     <el-form-item label="数据来源" prop="dataSourceID">
                       <el-select v-model="serviceForm.dataSourceID" clearable>
-                        <el-option v-for="dataSource in dataSourceList" :key="dataSource.dataSourceID" :value="dataSource.dataSourceID" :label="dataSource.dataSourceName" />
+                        <el-option
+                          v-for="dataSource in dataSourceList"
+                          :key="dataSource.dataSourceID"
+                          :value="dataSource.dataSourceID"
+                          :label="dataSource.dataSourceName"
+                        />
                       </el-select>
                     </el-form-item>
-                    <el-button style="height:28px;line-height: 0px;" size="small" @click="addService" type="primary">新增</el-button>
+                    <el-button
+                      style="height: 28px; line-height: 0px"
+                      size="small"
+                      @click="addService"
+                      type="primary"
+                      >新增</el-button
+                    >
                   </div>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="生命周期ID键名" prop="lifeCycleCol" label-width="114px">
-                    <el-input v-model="serviceForm.lifeCycleCol" placeholder="请输入生命周期ID键名" clearable />
+                  <el-form-item
+                    label="生命周期ID键名"
+                    prop="lifeCycleCol"
+                    label-width="114px"
+                  >
+                    <el-input
+                      v-model="serviceForm.lifeCycleCol"
+                      placeholder="请输入生命周期ID键名"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
                   <el-form-item label="采集线程" prop="threads">
-                    <el-input v-model="serviceForm.threads" type="number" placeholder="请输入采集线程数" clearable />
+                    <el-input
+                      v-model="serviceForm.threads"
+                      type="number"
+                      placeholder="请输入采集线程数"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="数据类型" prop="datatype" label-width="114px">
+                  <el-form-item
+                    label="数据类型"
+                    prop="datatype"
+                    label-width="114px"
+                  >
                     <el-select v-model="serviceForm.datatype" clearable>
                       <el-option label="JSON" :value="1" />
                       <el-option label="XML" :value="2" />
@@ -84,41 +145,90 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="取值规则" prop="computingMethod">
-                    <el-input v-model="serviceForm.computingMethod" placeholder="请输入取值规则" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
+                    <el-input
+                      v-model="serviceForm.computingMethod"
+                      placeholder="请输入取值规则"
+                      type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 4 }"
+                      resize="none"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="检测规则" prop="validationExpression">
-                    <el-input v-model="serviceForm.validationExpression" placeholder="请输入检测规则" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
+                    <el-input
+                      v-model="serviceForm.validationExpression"
+                      placeholder="请输入检测规则"
+                      type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 4 }"
+                      resize="none"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="启动时间" prop="startTime">
-                    <el-date-picker v-model="serviceForm.startTime" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择启动时间" />
+                    <el-date-picker
+                      v-model="serviceForm.startTime"
+                      type="datetime"
+                      format="yyyy-MM-dd HH:mm"
+                      value-format="yyyy-MM-dd HH:mm"
+                      placeholder="请选择启动时间"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="停止时间" prop="stopTime">
-                    <el-date-picker v-model="serviceForm.stopTime" type="datetime" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="请选择停止时间" />
+                    <el-date-picker
+                      v-model="serviceForm.stopTime"
+                      type="datetime"
+                      format="yyyy-MM-dd HH:mm"
+                      value-format="yyyy-MM-dd HH:mm"
+                      placeholder="请选择停止时间"
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item label="失败重试次数" prop="retryCount" label-width="100px">
-                    <el-input v-model="serviceForm.retryCount" type="number" placeholder="请输入重试次数" clearable />
+                  <el-form-item
+                    label="失败重试次数"
+                    prop="retryCount"
+                    label-width="100px"
+                  >
+                    <el-input
+                      v-model="serviceForm.retryCount"
+                      type="number"
+                      placeholder="请输入重试次数"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="循环次数" prop="loopCount">
-                    <el-input v-model="serviceForm.loopCount" type="number" placeholder="请输入循环次数" clearable />
+                    <el-input
+                      v-model="serviceForm.loopCount"
+                      type="number"
+                      placeholder="请输入循环次数"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="循环频率" prop="frequencyCount">
-                    <el-input v-model="serviceForm.frequencyCount" type="number" placeholder="请输入循环频率" clearable />
+                    <el-input
+                      v-model="serviceForm.frequencyCount"
+                      type="number"
+                      placeholder="请输入循环频率"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                  <el-form-item label="循环频率单位" prop="frequencyUnit" label-width="100px">
+                  <el-form-item
+                    label="循环频率单位"
+                    prop="frequencyUnit"
+                    label-width="100px"
+                  >
                     <el-select v-model="serviceForm.frequencyUnit" clearable>
                       <el-option label="天" :value="24 * 60 * 60 * 1000" />
                       <el-option label="小时" :value="60 * 60 * 1000" />
@@ -130,15 +240,30 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="服务描述" prop="serviceDescribe">
-                    <el-input v-model="serviceForm.serviceDescribe" placeholder="请输入描述" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" resize="none" clearable />
+                    <el-input
+                      v-model="serviceForm.serviceDescribe"
+                      placeholder="请输入描述"
+                      type="textarea"
+                      :autosize="{ minRows: 4, maxRows: 4 }"
+                      resize="none"
+                      clearable
+                    />
                   </el-form-item>
                 </el-col>
               </el-row>
             </el-form>
           </main>
           <div class="foot">
-            <el-button size="medium" type="primary" class="r25 r26" @click="createSubmitHandler">提交</el-button>
-            <el-button size="medium" class="r26" @click="hideCreateDialog">取消</el-button>
+            <el-button
+              size="medium"
+              type="primary"
+              class="r25 r26"
+              @click="createSubmitHandler"
+              >提交</el-button
+            >
+            <el-button size="medium" class="r26" @click="hideCreateDialog"
+              >取消</el-button
+            >
           </div>
         </div>
       </Dialog>
@@ -146,23 +271,56 @@
         <div class="dialog-create">
           <div class="title">新增数据来源</div>
           <div class="content">
-            <el-form ref="sourceForm" label-width="100px" :model="formLabelAlign">
+            <el-form
+              ref="sourceForm"
+              label-width="100px"
+              :model="formLabelAlign"
+            >
               <el-form-item label="数据源名称">
-                <el-input size="small" v-model="formLabelAlign.dataSourceName"></el-input>
+                <el-input
+                  size="small"
+                  v-model="formLabelAlign.dataSourceName"
+                ></el-input>
               </el-form-item>
               <el-form-item label="协议名称">
-                <el-select size="small" style="width:100%;" v-model="formLabelAlign.protocolName" placeholder="请选择活动区域">
-                  <el-option v-for="item in sourceDatas" :key="item.protocolID" :label="item.protocolName" :value="item.protocolID"></el-option>
+                <el-select
+                  size="small"
+                  style="width: 100%"
+                  v-model="formLabelAlign.protocolName"
+                  placeholder="请选择活动区域"
+                >
+                  <el-option
+                    v-for="item in sourceDatas"
+                    :key="item.protocolID"
+                    :label="item.protocolName"
+                    :value="item.protocolID"
+                  ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="连接参数">
-                <el-input size="small" type="textarea" rows="3" v-model="formLabelAlign.connectConfig"></el-input>
+                <el-input
+                  size="small"
+                  type="textarea"
+                  rows="3"
+                  v-model="formLabelAlign.connectConfig"
+                ></el-input>
               </el-form-item>
             </el-form>
           </div>
           <div class="foot">
-            <el-button size="medium" type="primary" @click="formService" class="r25 r26">提交</el-button>
-            <el-button size="medium" class="r26" @click="sourceFormVisible = false">取消</el-button>
+            <el-button
+              size="medium"
+              type="primary"
+              @click="formService"
+              class="r25 r26"
+              >提交</el-button
+            >
+            <el-button
+              size="medium"
+              class="r26"
+              @click="sourceFormVisible = false"
+              >取消</el-button
+            >
           </div>
         </div>
       </Dialog>
@@ -171,171 +329,177 @@
 </template>
 
 <script>
-import Dialog from '@/layout/components/Dialog/index.vue'
-import { GeneralDataReception, Query } from '@/api/dataIntegration'
+import Dialog from "@/layout/components/Dialog/index.vue";
+import { GeneralDataReception, Query } from "@/api/dataIntegration";
 // import { regular } from '@/utils/validate'
-import DataTable from '@/components/Table'
+import DataTable from "@/components/Table";
 export default {
-  name: 'ProtocolHome',
+  name: "ProtocolHome",
   components: {
     Dialog,
-    DataTable
+    DataTable,
   },
-  data () {
+  data() {
     return {
       serviceList: [],
       createDialogVisible: false,
       sourceFormVisible: false,
       dataId: DATACONTENT_ID.sysServiceTabId,
       serviceForm: {
-        serviceName: '',
+        serviceName: "",
         serviceOutputID: null,
         serviceType: null,
         dataSourceID: null,
-        lifeCycleCol: '',
+        lifeCycleCol: "",
         isAsynchronous: 1,
         threads: null,
         datatype: null,
-        computingMethod: '',
-        validationExpression: '',
+        computingMethod: "",
+        validationExpression: "",
         startTime: null,
         stopTime: null,
         retryCount: null,
         loopCount: null,
         frequencyCount: null,
         frequencyUnit: null,
-        serviceDescribe: ''
+        serviceDescribe: "",
       },
       serviceFormRules: {
-        serviceName: [{ required: true, message: '请输入服务名称', trigger: ['change', 'blur'] }]
+        serviceName: [
+          {
+            required: true,
+            message: "请输入服务名称",
+            trigger: ["change", "blur"],
+          },
+        ],
       },
       formLabelAlign: {
-        dataSourceName: '',
-        protocolName: '',
-        connectConfig: ''
+        dataSourceName: "",
+        protocolName: "",
+        connectConfig: "",
       },
       dataSourceList: [],
       sourceDatas: [],
       deleteDialogVisible: false,
-      delObj: {}
-    }
+      delObj: {},
+    };
   },
   methods: {
     // 新增-弹框
-    showCreateDialog () {
-      this.getDataSourceList(DATACONTENT_ID.sysSourceId)
-      this.createDialogVisible = true
+    showCreateDialog() {
+      this.getDataSourceList(DATACONTENT_ID.sysSourceId);
+      this.createDialogVisible = true;
     },
     //
-    addService () {
-      this.getDataSourceList(DATACONTENT_ID.sysServiceXyId)
-      this.sourceFormVisible = true
+    addService() {
+      this.getDataSourceList(DATACONTENT_ID.sysServiceXyId);
+      this.sourceFormVisible = true;
     },
     // 新增-提交
-    createSubmitHandler () {
-      this.$refs['serviceForm'].validate(valid => {
+    createSubmitHandler() {
+      this.$refs["serviceForm"].validate((valid) => {
         if (valid) {
-          this.createService()
+          this.createService();
         }
-      })
+      });
     },
     // 新增-关闭
-    hideCreateDialog () {
-      this.$refs['serviceForm'].resetFields()
-      this.createDialogVisible = false
+    hideCreateDialog() {
+      this.$refs["serviceForm"].resetFields();
+      this.createDialogVisible = false;
     },
     // 编辑-跳转
-    btnEditClickHandler (item) {
+    btnEditClickHandler(item) {
       this.$router.push({
-        path: '/systemSettings/serviceEdit',
-        query: { serviceID: item.serviceID }
-      })
+        path: "/systemSettings/serviceEdit",
+        query: { serviceID: item.serviceID },
+      });
     },
-    getServiceList () {
-      this.$refs['serviceTable'].getQuery()
+    getServiceList() {
+      this.$refs["serviceTable"].getQuery();
     },
-    async getDataSourceList (id) {
-      const dataSourceList = await this.getSelectOption(id)
+    async getDataSourceList(id) {
+      const dataSourceList = await this.getSelectOption(id);
       if (id == DATACONTENT_ID.sysSourceId) {
-        this.dataSourceList = dataSourceList.map(item => {
-          item[item.setlabel] = item.k
-          item[item.setvalue] = item.v
-          return item
-        })
+        this.dataSourceList = dataSourceList.map((item) => {
+          item[item.setlabel] = item.k;
+          item[item.setvalue] = item.v;
+          return item;
+        });
       } else {
-        this.sourceDatas = dataSourceList.map(item => {
-          item[item.setlabel] = item.k
-          item[item.setvalue] = item.v
-          return item
-        })
+        this.sourceDatas = dataSourceList.map((item) => {
+          item[item.setlabel] = item.k;
+          item[item.setvalue] = item.v;
+          return item;
+        });
       }
     },
-    async getSelectOption (id) {
+    async getSelectOption(id) {
       try {
         const { code, returnData, message } = await Query({
           id,
-          dataContent: []
-        })
+          dataContent: [],
+        });
         if (Number(code) === 0) {
-          return returnData.listValues
+          return returnData.listValues;
         } else {
-          this.$message.error(message ?? '失败')
-          return []
+          this.$message.error(message ?? "失败");
+          return [];
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
     },
-    async createService () {
+    async createService() {
       if (!this.serviceForm.serviceOutputID) {
-        this.serviceForm.serviceOutputID = null
+        this.serviceForm.serviceOutputID = null;
       }
       if (!this.serviceForm.dataSourceID) {
-        this.serviceForm.dataSourceID = null
+        this.serviceForm.dataSourceID = null;
       }
       try {
-        this.serviceForm['event'] = 1
+        this.serviceForm["event"] = 1;
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.sysServiceAddId,
-          dataContent: JSON.stringify(this.serviceForm)
-        })
+          dataContent: JSON.stringify(this.serviceForm),
+        });
         if (Number(res.code) === 0) {
-          this.$message.success(res.message ?? '成功')
-          this.hideCreateDialog()
-          this.getServiceList()
+          this.$message.success(res.message ?? "成功");
+          this.hideCreateDialog();
+          this.getServiceList();
         } else {
-          this.$message.error(res.message ?? '失败')
+          this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
     },
-    async formService () {
-      this.sourceDatas.forEach(item => {
+    async formService() {
+      this.sourceDatas.forEach((item) => {
         if (item.protocolID == this.formLabelAlign.protocolName) {
-          this.formLabelAlign.protocolName = item.protocolName
-          this.formLabelAlign.protocolID = item.protocolID
+          this.formLabelAlign.protocolName = item.protocolName;
+          this.formLabelAlign.protocolID = item.protocolID;
         }
-      })
+      });
       try {
-        this.formLabelAlign['event'] = 1
+        this.formLabelAlign["event"] = 1;
         const res = await GeneralDataReception({
           serviceId: SERVICE_ID.sysServiceAddXyId,
-          dataContent: JSON.stringify(this.formLabelAlign)
-        })
+          dataContent: JSON.stringify(this.formLabelAlign),
+        });
         if (Number(res.code) === 0) {
-          this.$message.success(res.message ?? '成功')
-          this.sourceFormVisible = false
-          this.getDataSourceList(DATACONTENT_ID.sysSourceId)
+          this.$message.success(res.message ?? "成功");
+          this.sourceFormVisible = false;
+          this.getDataSourceList(DATACONTENT_ID.sysSourceId);
         } else {
-          this.$message.error(res.message ?? '失败')
+          this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-        console.log('错误', error)
+        console.log("错误", error);
       }
     },
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/views/systemSettings/views/sourceservice/sourceserviceHome.vue

@@ -1,16 +1,24 @@
 <template>
   <div class="sourceservice_home">
     <div class="wrap">
-      <DataTable :data-id="dataId" :rows="12" labelWidth="110px" :showOverflowTooltip="true" :minHeight="70" width="800px" />
+      <DataTable
+        tableHeight="700"
+        :data-id="dataId"
+        :rows="12"
+        labelWidth="110px"
+        :showOverflowTooltip="true"
+        :minHeight="70"
+        width="800px"
+      />
     </div>
   </div>
 </template>
 <script>
 import DataTable from "@/components/Table";
 export default {
-  data () {
+  data() {
     return {
-      dataId: 6
+      dataId: 6,
     };
   },
   components: { DataTable },