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

src/layout/components/ToolBar/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="ToolBar">
     <div class="ToolBar-Head">
-      <div class="flex-wrap">
+      <div class="flex-wrap" style="flex-wrap: wrap">
         <div
           v-for="(item, index) in dataArr"
           @click="routeLink(item, index)"
@@ -87,12 +87,13 @@ export default {
 <style lang="scss" scoped>
 .ToolBar {
   .toolbar-list {
-    margin-right: 24px;
+    margin-right: 19px;
     cursor: pointer;
     background: #ffffff;
     box-shadow: 0px 6px 7px 0px rgba(0, 0, 0, 0.06);
     border-radius: 4px;
-    min-width: 220px;
+    min-width: 160px;
+    margin-bottom: 10px;
     .toolbar-list-bar {
       display: flex;
       align-items: center;

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

@@ -35,55 +35,55 @@ const systemSettingsRoutes = {
             },
           ]
         },
-        {
-          path: '/systemSettings/sourceDataItemManagement',
-          name: 'sourceDataItemManagement',
-          component: { render(c) { return c('router-view') } },
-          redirect: '/systemSettings/sourceDataItemManagement',
-          meta: { title: '源数据管理' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png'),
-          children: [
-            {
-              path: '/systemSettings/sourceDataItemManagement',
-              component: () => import('@/views/systemSettings/views/sourceDataItemManagement/sourceDataItemHome'),
-            },
-            {
-              path: '/systemSettings/sourceDataItemEdit',
-              name: 'sourceDataItemEdit',
-              component: () => import('@/views/systemSettings/views/sourceDataItemManagement/sourceDataItemEdit'),
-              meta: { title: '源数据编辑' },
-              hidden: false,
-              isAlone: true,
-              src: require('@/assets/nav/ic_setting_top@2x.png')
-            },
-          ]
-        },
-        {
-          path: '/systemSettings/targetDataManagement',
-          name: 'targetDataManagement',
-          component: { render(c) { return c('router-view') } },
-          redirect: '/systemSettings/targetDataManagement',
-          meta: { title: '目标数据管理' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png'),
-          children: [{
-            path: '/systemSettings/targetDataManagement',
-            component: () => import('@/views/systemSettings/views/targetDataManagement/targetDataHome'),
-          },
-          {
-            path: '/systemSettings/targetDataEdit',
-            name: 'targetDataEdit',
-            component: () => import('@/views/systemSettings/views/targetDataManagement/targetDataEdit'),
-            meta: { title: '目标数据编辑' },
-            hidden: false,
-            isAlone: true,
-            src: require('@/assets/nav/ic_setting_top@2x.png')
-          },
-          ]
-        },
+        // {
+        //   path: '/systemSettings/sourceDataItemManagement',
+        //   name: 'sourceDataItemManagement',
+        //   component: { render(c) { return c('router-view') } },
+        //   redirect: '/systemSettings/sourceDataItemManagement',
+        //   meta: { title: '源数据管理' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png'),
+        //   children: [
+        //     {
+        //       path: '/systemSettings/sourceDataItemManagement',
+        //       component: () => import('@/views/systemSettings/views/sourceDataItemManagement/sourceDataItemHome'),
+        //     },
+        //     {
+        //       path: '/systemSettings/sourceDataItemEdit',
+        //       name: 'sourceDataItemEdit',
+        //       component: () => import('@/views/systemSettings/views/sourceDataItemManagement/sourceDataItemEdit'),
+        //       meta: { title: '源数据编辑' },
+        //       hidden: false,
+        //       isAlone: true,
+        //       src: require('@/assets/nav/ic_setting_top@2x.png')
+        //     },
+        //   ]
+        // },
+        // {
+        //   path: '/systemSettings/targetDataManagement',
+        //   name: 'targetDataManagement',
+        //   component: { render(c) { return c('router-view') } },
+        //   redirect: '/systemSettings/targetDataManagement',
+        //   meta: { title: '目标数据管理' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png'),
+        //   children: [{
+        //     path: '/systemSettings/targetDataManagement',
+        //     component: () => import('@/views/systemSettings/views/targetDataManagement/targetDataHome'),
+        //   },
+        //   {
+        //     path: '/systemSettings/targetDataEdit',
+        //     name: 'targetDataEdit',
+        //     component: () => import('@/views/systemSettings/views/targetDataManagement/targetDataEdit'),
+        //     meta: { title: '目标数据编辑' },
+        //     hidden: false,
+        //     isAlone: true,
+        //     src: require('@/assets/nav/ic_setting_top@2x.png')
+        //   },
+        //   ]
+        // },
         {
           path: '/systemSettings/protocolManagement',
           name: 'protocolManagement',
@@ -102,30 +102,30 @@ const systemSettingsRoutes = {
           src: require('@/assets/nav/ic_setting_top_default.png'),
           srcer: require('@/assets/nav/ic_setting_top_check.png')
         },
-        {
-          path: '/systemSettings/warningSet',
-          name: 'warningSet',
-          component: { render(c) { return c('router-view') } },
-          redirect: '/systemSettings/warningSet',
-          meta: { title: '报警预警设置' },
-          hidden: true,
-          src: require('@/assets/nav/ic_setting_top_default.png'),
-          srcer: require('@/assets/nav/ic_setting_top_check.png'),
-          children: [{
-            path: '/systemSettings/warningSet',
-            component: () => import('@/views/systemSettings/views/warningSet/warningSet'),
-          },
-          {
-            path: '/systemSettings/warningEdit',
-            name: 'warningEdit',
-            component: () => import('@/views/systemSettings/views/warningSet/warningEdit'),
-            meta: { title: '报警预警设置' },
-            hidden: false,
-            isAlone: true,
-            src: require('@/assets/nav/ic_setting_top@2x.png')
-          },
-          ]
-        },
+        // {
+        //   path: '/systemSettings/warningSet',
+        //   name: 'warningSet',
+        //   component: { render(c) { return c('router-view') } },
+        //   redirect: '/systemSettings/warningSet',
+        //   meta: { title: '报警预警设置' },
+        //   hidden: true,
+        //   src: require('@/assets/nav/ic_setting_top_default.png'),
+        //   srcer: require('@/assets/nav/ic_setting_top_check.png'),
+        //   children: [{
+        //     path: '/systemSettings/warningSet',
+        //     component: () => import('@/views/systemSettings/views/warningSet/warningSet'),
+        //   },
+        //   {
+        //     path: '/systemSettings/warningEdit',
+        //     name: 'warningEdit',
+        //     component: () => import('@/views/systemSettings/views/warningSet/warningEdit'),
+        //     meta: { title: '报警预警设置' },
+        //     hidden: false,
+        //     isAlone: true,
+        //     src: require('@/assets/nav/ic_setting_top@2x.png')
+        //   },
+        //   ]
+        // },
         {
           path: '/systemSettings/queryTemplate',
           name: 'queryTemplate',
@@ -159,6 +159,60 @@ const systemSettingsRoutes = {
           },
           ]
         },
+        {
+          path: '/systemSettings/datastructure',
+          name: 'datastructure',
+          component: () => import('@/views/systemSettings/views/datastructure/datastructureHome'),
+          meta: { title: '数据结构' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png')
+        },
+        {
+          path: '/systemSettings/sourceservice',
+          name: 'sourceservice',
+          component: () => import('@/views/systemSettings/views/sourceservice/sourceserviceHome'),
+          meta: { title: '数据源服务' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png')
+        },
+        {
+          path: '/systemSettings/serviceoutput',
+          name: 'serviceoutput',
+          component: () => import('@/views/systemSettings/views/serviceoutput/serviceoutputHome'),
+          meta: { title: '服务输出' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png')
+        },
+        {
+          path: '/systemSettings/servicedeployment',
+          name: 'servicedeployment',
+          component: () => import('@/views/systemSettings/views/servicedeployment/servicedeploymentHome'),
+          meta: { title: '服务部署' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png')
+        },
+        {
+          path: '/systemSettings/dataStructureItem',
+          name: 'dataStructureItem',
+          component: () => import('@/views/systemSettings/views/dataStructureItem/dataStructureItemHome'),
+          meta: { title: '数据结构项' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png')
+        },
+        {
+          path: '/systemSettings/queryItemSettings',
+          name: 'queryItemSettings',
+          component: () => import('@/views/systemSettings/views/queryItemSettings/queryItemSettingsHome'),
+          meta: { title: '查询项设置' },
+          hidden: true,
+          src: require('@/assets/nav/ic_setting_top_default.png'),
+          srcer: require('@/assets/nav/ic_setting_top_check.png')
+        },
       ]
     }
   ]

src/views/systemSettings/views/dataStructureItem/dataStructureItemHome.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="dataStructureItem_home">
+    <div class="wrap">
+      <DataTable
+        data-id="9"
+        :rows="12"
+        labelWidth="140px"
+        :minHeight="70"
+        width="800px"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+export default {
+  data() {
+    return {};
+  },
+  components: { DataTable },
+};
+</script>
+<style lang="scss" scoped>
+.dataStructureItem-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,44 @@
+<template>
+  <div class="datastructure_home">
+    <div class="wrap">
+      <DataTable
+        data-id="5"
+        :rows="12"
+        labelWidth="130px"
+        :minHeight="70"
+        width="800px"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+export default {
+  data() {
+    return {};
+  },
+  components: { DataTable },
+};
+</script>
+<style lang="scss" scoped>
+.datastructure-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>

src/views/systemSettings/views/queryItemSettings/queryItemSettingsHome.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="queryItemSettings_home">
+    <div class="wrap">
+      <DataTable
+        data-id="10"
+        :rows="12"
+        labelWidth="140px"
+        :minHeight="70"
+        width="800px"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+export default {
+  data() {
+    return {};
+  },
+  components: { DataTable },
+};
+</script>
+<style lang="scss" scoped>
+.queryItemSettings-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>

src/views/systemSettings/views/servicedeployment/servicedeploymentHome.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="servicedeployment_home">
+    <div class="wrap">
+      <DataTable
+        data-id="8"
+        :rows="12"
+        labelWidth="110px"
+        :minHeight="70"
+        width="800px"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+export default {
+  data() {
+    return {};
+  },
+  components: { DataTable },
+};
+</script>
+<style lang="scss" scoped>
+.servicedeployment-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>

src/views/systemSettings/views/serviceoutput/serviceoutputHome.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="serviceoutput_home">
+    <div class="wrap">
+      <DataTable
+        data-id="7"
+        :rows="12"
+        labelWidth="130px"
+        :minHeight="70"
+        width="800px"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+export default {
+  data() {
+    return {};
+  },
+  components: { DataTable },
+};
+</script>
+<style lang="scss" scoped>
+.serviceoutput-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>

src/views/systemSettings/views/sourceDataItemManagement/sourceDataItemHome.vue

@@ -10,10 +10,12 @@
 <template>
   <div class="sourceDataItem-home">
     <div class="wrap">
-      <div class="protocol-header flex">
+      <!-- <div class="protocol-header flex">
         <div class="manageTitle">源数据管理</div>
         <div class="addBtn">
-          <el-button class="button-white" size="small" @click="showAddDialog()">新增</el-button>
+          <el-button class="button-white" size="small" @click="showAddDialog()"
+            >新增</el-button
+          >
         </div>
       </div>
       <div class="protocol-content">
@@ -23,20 +25,24 @@
               <div class="head-line"></div>
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <!-- <div class="name">{{ item.dataName }}</div> -->
-                  <el-tooltip class="item" effect="dark" :content="item.dataName" placement="bottom">
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="item.dataName"
+                    placement="bottom"
+                  >
                     <div class="name">{{ item.dataName }}</div>
                   </el-tooltip>
                   <i class="loger" @click="showEditDialog(item)" />
                 </div>
                 <i class="el-icon-close icon" @click="showRemoveDialog(item)" />
               </div>
-              <div class="disc">{{item.dataTypeText}}</div>
+              <div class="disc">{{ item.dataTypeText }}</div>
             </div>
           </el-col>
         </el-row>
-      </div>
-       <!--新增/编辑-->
+      </div> -->
+      <!--新增/编辑-->
       <Dialog :flag="editDialogVisible" width="466px" :show-flag="true">
         <div class="airportInfoDialog dialog-public-background">
           <div class="title">{{ editDialogTitle }}</div>
@@ -117,8 +123,19 @@
             <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>
@@ -128,24 +145,24 @@
 
 <script>
 import Dialog from "@/layout/components/Dialog/index.vue";
-import { Query ,GeneralDataReception } from '@/api/dataIntegration';
+import { Query, GeneralDataReception } from "@/api/dataIntegration";
 
 export default {
   name: "ProtocolHome",
   components: { Dialog },
-  data () {
+  data() {
     return {
       dataList: [],
       removeDialogVisible: false,
       rmObj: {},
-      editDialogVisible:false,
-      editDialogTitle:"目标数据新增",
+      editDialogVisible: false,
+      editDialogTitle: "目标数据新增",
       ruleForm: {
         // 信息表单
         dataName: "",
         dataDescribe: "",
         computingMethod: "",
-        validationExpression:"",
+        validationExpression: "",
         dataType: "",
       },
       rules: {
@@ -159,32 +176,29 @@ export default {
       },
     };
   },
-  created () {
-    this.getList()
+  created() {
+    this.getList();
   },
   methods: {
     async getList() {
       try {
         const res = await Query({
           id: 4,
-          dataContent: []
+          dataContent: [],
         });
         if (res.code === "0") {
-          res.returnData.forEach(element => {
-            if(element.dataType==1){
-              element['dataTypeText'] = "JSON"
-            }
-            else if(element.dataType==2){
-              element['dataTypeText'] = "XML"
-            }
-            else if(element.dataType==3){
-              element['dataTypeText'] = "REGULA"
-            }
-            else{
-              element['dataTypeText'] = "其他"
+          res.returnData.forEach((element) => {
+            if (element.dataType == 1) {
+              element["dataTypeText"] = "JSON";
+            } else if (element.dataType == 2) {
+              element["dataTypeText"] = "XML";
+            } else if (element.dataType == 3) {
+              element["dataTypeText"] = "REGULA";
+            } else {
+              element["dataTypeText"] = "其他";
             }
           });
-            this.dataList = res.returnData
+          this.dataList = res.returnData;
         } else {
           this.$message.error(res.message ?? "失败");
         }
@@ -193,13 +207,16 @@ export default {
       }
     },
     // 新增-跳转
-    showAddDialog () {
+    showAddDialog() {
       this.editDialogTitle = "新增源数据";
       this.editDialogVisible = true;
     },
     // 编辑-跳转
-    showEditDialog (item) {
-      this.$router.push({path:'/systemSettings/sourceDataItemEdit',query:{id:item.sourceDataID}})
+    showEditDialog(item) {
+      this.$router.push({
+        path: "/systemSettings/sourceDataItemEdit",
+        query: { id: item.sourceDataID },
+      });
     },
     // 新增/编辑-确认
     submitClickHandler() {
@@ -219,7 +236,7 @@ export default {
         });
         if (res.code === "0") {
           this.$message.success(res.message ?? "成功");
-          this.getList()
+          this.getList();
         } else {
           this.$message.error(res.message ?? "失败");
         }
@@ -228,22 +245,22 @@ export default {
       }
     },
     // 删除-弹框
-    showRemoveDialog (item) {
+    showRemoveDialog(item) {
       this.rmObj = item;
       this.removeDialogVisible = true;
     },
     // 确认删除
-    async removeSubmit () {
+    async removeSubmit() {
       this.rmObj["operate"] = "3";
       try {
         const res = await GeneralDataReception({
           serviceId: "4",
-          dataContent:  JSON.stringify(this.rmObj),
+          dataContent: JSON.stringify(this.rmObj),
         });
         if (res.code === "0") {
           this.removeDialogVisible = false;
           this.$message.success("删除成功");
-          this.getList()
+          this.getList();
         } else {
           this.$message.error(res.message ?? "失败");
         }
@@ -253,7 +270,7 @@ export default {
     },
     // 重置
     resetForm(formName) {
-      this.ruleForm = {}
+      this.ruleForm = {};
       this.$refs[formName].resetFields();
       this.editDialogVisible = false;
     },

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

@@ -0,0 +1,44 @@
+<template>
+  <div class="sourceservice_home">
+    <div class="wrap">
+      <DataTable
+        data-id="6"
+        :rows="12"
+        labelWidth="110px"
+        :minHeight="70"
+        width="800px"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import DataTable from "@/components/Table";
+export default {
+  data() {
+    return {};
+  },
+  components: { DataTable },
+};
+</script>
+<style lang="scss" scoped>
+.sourceservice-home {
+  .wrap {
+    padding: 16px 0;
+    .service-header {
+      line-height: 32px;
+      font-size: 14px;
+      .btn-white {
+        border: 1px solid #9ebbf7;
+        background: #f5f7fa;
+        -webkit-box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        box-shadow: 0px 6px 7px 0px rgb(0 0 0 / 6%);
+        border-radius: 4px;
+        font-family: Microsoft YaHei;
+        font-weight: bold;
+        color: #2d67e3;
+      }
+      margin-bottom: 30px;
+    }
+  }
+}
+</style>