zhaoke vor 2 Jahren
Ursprung
Commit
be79cf68fc

+ 27 - 0
public/config.js

@@ -12,3 +12,30 @@ PLATFROM_CONFIG.appId = "q7kdjmmaf0kerwpf"; //appid
 // PLATFROM_CONFIG.baseURLCA = "http://ts.free.idcfengye.com";
 PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
 
+const DATACONTENT_ID = {
+  sysSourceId: 21, //系统设置-数据源-id
+  sysProtoTabId: 1, //系统设置-协议管理-表格-id
+  sysServiceTabId: 2, //系统设置-服务管理-表格-id
+  sysQueryTabId: 4, //系统设置-查询模板-表格-id
+  sysQueryEditId: 43, //系统设置-查询模板-编辑-根据id获取服务
+  sysQueryChildTabId: 44, //系统设置-查询模板-列设置-表格-id
+  sysQueryChildEditTabId: 45, //系统设置-查询模板-列设置-表格-编辑-id
+  sysDataTabId: 5, //系统设置-数据结构-表格-id
+  sysDataChildTabId: 9, //系统设置-数据结构-数据项-表格-id
+  sysLogTabId: 15, //系统设置-数据结构-数据项-表格-id
+  sysDataEditId: 51, //系统设置-数据结构-数据项-表格-编辑-id
+  sysServiceXyId: 23, //系统设置-服务管理-新增服务-新增数据来源-id
+  sysServiceEditId: 39, //系统设置-服务管理-编辑服务-根据id获取服务
+  sysServiceTopId: 206, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
+  sysServiceTopTableId: 127, //系统设置-服务管理-服务拓扑-查看日志id
+  // sysDatasTructureId:
+};
+
+const SERVICE_ID = {
+  sysProtoTabId: 1, //系统设置-协议管理-表格-增删改-id
+  sysServiceAddId: 3, //系统设置-服务管理-新增服务-提交-id/服务管理-编辑服务-保存-id
+  sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框-id
+  sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
+  sysServiceAddXyId: 12, //系统设置-服务管理-新增服务-新增数据源-提交-id
+  sysDataTabId: 11, //系统设置-数据结构-数据项-表格-增删改-id
+};

+ 27 - 3
src/api/dataIntegration.js

@@ -10,7 +10,7 @@
 import request from '@/utils/request'
 import { Message } from 'element-ui'
 
-export function GeneralDataReception(params) {
+export function GeneralDataReception (params) {
   return request({
     url: '/openApi/generalDataReception',
     method: 'post',
@@ -21,7 +21,7 @@ export function GeneralDataReception(params) {
   })
 }
 
-export function Query(params) {
+export function Query (params) {
   return request({
     url: '/openApi/query',
     method: 'post',
@@ -32,6 +32,30 @@ export function Query(params) {
   })
 }
 
+//服务管理-启动
+export function Start (params) {
+  return request({
+    url: '/openApi/start',
+    method: 'post',
+    headers: {
+      'content-type': 'application/json'
+    },
+    data: params
+  })
+}
+
+//服务管理-停止
+export function Stop (params) {
+  return request({
+    url: '/openApi/stop',
+    method: 'post',
+    headers: {
+      'content-type': 'application/json'
+    },
+    data: params
+  })
+}
+
 export const queryMap = {
   protocol: 1,
   node: 2,
@@ -76,7 +100,7 @@ export const queryMap = {
   baggageType: 86
 }
 
-export async function myQuery(id, ...dataContent) {
+export async function myQuery (id, ...dataContent) {
   const params = {
     id,
     dataContent

+ 22 - 15
src/components/Table/index.vue

@@ -131,7 +131,7 @@
 import { setTableFilters } from "@/utils/table";
 import Dialog from "@/layout/components/Dialog/index.vue";
 import NoData from "@/components/nodata";
-import { Query, GeneralDataReception } from "@/api/dataIntegration";
+import { Query, GeneralDataReception, Start, Stop } from "@/api/dataIntegration";
 export default {
   name: "DataTable",
   props: {
@@ -747,28 +747,35 @@ export default {
     },
     // 表格-启动/停止
     async chanheState (row) {
-      const obj = {
-        runState: row.runState == '启动' ? 0 : 1,
-        event: 2,
-        serviceID: row.serviceID
-      }
-      this.changeBtn(obj)
+      const runState = row.runState == '运行' ? 0 : 1
+      const serviceID = row.serviceID
+      this.changeBtn(runState, serviceID)
     },
     // 表格-选中行
     selectHandler (selection, row) {
       this.$emit("selection-change", selection, row);
     },
-    async changeBtn (obj) {
-      const { code, message } = await GeneralDataReception({
-        serviceId: 61,
-        dataContent: JSON.stringify(obj)
-      })
-      if (code == 0) {
-        this.$message.success(message)
+    async changeBtn (state, id) {
+      let res = null
+      // const { code, message } = await GeneralDataReception({
+      //   serviceId: 61,
+      //   dataContent: JSON.stringify(obj)
+      // })
+      if (state) {
+        res = await Start({
+          serviceId: id
+        })
+      } else {
+        res = await Stop({
+          serviceId: id
+        })
+      }
+      if (res.code == 0) {
+        this.$message.success(res.message)
         this.resetTable();
         this.getQuery();
       } else {
-        this.$message.error(message)
+        this.$message.error(res.message)
       }
     }
   },

+ 43 - 133
src/views/systemSettings/views/datastructure/datastructureChild.vue

@@ -1,19 +1,7 @@
 <template>
   <div class="queryItemSettings_home">
     <div class="wrap">
-      <DataTable
-        ref="DataTable"
-        data-id="9"
-        edit-id="51"
-        :data-content="{ dataStructureID }"
-        :rows="12"
-        label-width="140px"
-        :min-height="70"
-        width="800px"
-        :isDialog="false"
-        @handleAdd="handleAdd"
-        @handleEdit="handleEdit"
-      />
+      <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" />
     </div>
     <Dialog :width="width" :flag="flag">
       <div class="dialog-content">
@@ -39,153 +27,75 @@
                 </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>
@@ -194,9 +104,7 @@
           </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>
@@ -206,11 +114,13 @@
 <script>
 import DataTable from "@/components/Table";
 import Dialog from "@/layout/components/Dialog/index.vue";
-import { Query,GeneralDataReception } from "@/api/dataIntegration";
+import { Query, GeneralDataReception } from "@/api/dataIntegration";
 export default {
   components: { DataTable, Dialog },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.sysDataChildTabId,
+      editId: DATACONTENT_ID.sysDataEditId,
       dataStructureID: null,
       flag: false,
       width: "800px",
@@ -264,12 +174,12 @@ export default {
             setlabel: "k",
           },
         ],
-        listValues:[]
+        listValues: []
       },
-      tableType:"add"
+      tableType: "add"
     };
   },
-  created() {
+  created () {
     if (!this.$route.query.dataStructureID) {
       this.$router.push("/systemSettings/datastructure");
       return;
@@ -277,22 +187,22 @@ export default {
     this.dataStructureID = Number(this.$route.query.dataStructureID);
     this.getData()
   },
-  methods:{
-    handleAdd(){
+  methods: {
+    handleAdd () {
       this.flag = true
-      this.tableType= 'add'
+      this.tableType = 'add'
     },
-    handleEdit(row){
-      this.tableTitle="编辑",
-      this.flag = true
-      this.tableType= 'edit'
+    handleEdit (row) {
+      this.tableTitle = "编辑",
+        this.flag = true
+      this.tableType = 'edit'
       this.queryDetial(row.ItemID)
     },
     //弹框-确定
     handleOk () {
       this.submitClickHandler();
     },
-    handleCancel() {
+    handleCancel () {
       this.flag = false;
       this.tableForm = {};
     },
@@ -321,7 +231,7 @@ export default {
           ...this.dataContent
         }
         const { code, message } = await GeneralDataReception({
-          serviceId: 11,
+          serviceId: SERVICE_ID.sysDataTabId,
           dataContent: JSON.stringify(data),
         });
         this.loading = true;
@@ -347,16 +257,16 @@ export default {
         this.tableForm = {};
       }
     },
-    async getData(){
+    async getData () {
       try {
         this.loading = true;
         const { code, returnData } = await Query({
-          id: 21,
+          id: DATACONTENT_ID.sysSourceId,
           dataContent: [],
         });
         if (code == 0) {
-            console.log(returnData)
-            this.tableOptions.listValues = returnData.listValues
+          console.log(returnData)
+          this.tableOptions.listValues = returnData.listValues
         } else {
           this.loading = false;
         }
@@ -365,15 +275,15 @@ export default {
         console.log(error);
       }
     },
-    async queryDetial(id){
+    async queryDetial (id) {
       try {
         const { code, returnData } = await Query({
-          id: 51,
+          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;
         }

+ 5 - 10
src/views/systemSettings/views/datastructure/datastructureHome.vue

@@ -1,22 +1,17 @@
 <template>
   <div class="datastructure_home">
     <div class="wrap">
-      <DataTable
-        data-id="5"
-        :rows="12"
-        labelWidth="130px"
-        :minHeight="70"
-        width="800px"
-        :withItemSet="true"
-      />
+      <DataTable :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() {
-    return {};
+  data () {
+    return {
+      dataId: DATACONTENT_ID.sysDataTabId
+    };
   },
   components: { DataTable },
 };

+ 20 - 56
src/views/systemSettings/views/log/index.vue

@@ -10,62 +10,29 @@
           <el-date-picker v-model="timeEnd" size="small" type="date" placeholder="选择结束日期">
           </el-date-picker>
         </div> -->
-        <el-date-picker
-          v-model="date"
-          size="small"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          :default-time="['00:00:00', '23:59:59']"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @change="dateChange"
-        >
+        <el-date-picker v-model="date" size="small" type="daterange" value-format="yyyy-MM-dd" :default-time="['00:00:00', '23:59:59']" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="dateChange">
         </el-date-picker>
       </div>
       <div class="interfaceLog_head_btn">
-        <Search
-          @getSearchData="getSearchData"
-          :isTitle="false"
-          @clearSearchData="clearSearchData"
-        />
+        <Search @getSearchData="getSearchData" :isTitle="false" @clearSearchData="clearSearchData" />
       </div>
     </div>
     <div class="interfaceLog_content flex-wrap">
-      <el-table
-        v-el-table-infinite-scroll="load"
-        :data="tableData"
-        class="table"
-        border
-        style="width: 100%"
-        @row-click="rowClick"
-        :height="720"
-      >
+      <el-table v-el-table-infinite-scroll="load" :data="tableData" class="table" border style="width: 100%" @row-click="rowClick" :height="720">
         <el-table-column prop="logType" label="日志类型" width="100px">
         </el-table-column>
         <el-table-column prop="logObject" label="日志对象"> </el-table-column>
         <el-table-column prop="logTime" label="日志时间"> </el-table-column>
         <!-- <el-table-column prop="time" label="发生时间">
         </el-table-column> -->
-        <el-table-column
-          prop="logPositionID"
-          label="发生位置"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="logPositionID" label="发生位置" :show-overflow-tooltip="true">
         </el-table-column>
         <el-table-column label="日志结果" width="100px">
           <template slot-scope="scope">
-            <span
-              :class="scope.row.resultCode == '成功' ? 'success' : 'error'"
-              >{{ scope.row.resultCode }}</span
-            >
+            <span :class="scope.row.resultCode == '成功' ? 'success' : 'error'">{{ scope.row.resultCode }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="resultDetails"
-          label="日志详情"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="resultDetails" label="日志详情" :show-overflow-tooltip="true">
         </el-table-column>
       </el-table>
       <div class="interfaceLog_content_progress">
@@ -74,10 +41,7 @@
             <div class="list">
               <div class="list_status"></div>
               <div class="list_title">{{ item.logType }}</div>
-              <div
-                class="list_code"
-                :class="item.resultCode == '成功' ? 'success' : 'error'"
-              >
+              <div class="list_code" :class="item.resultCode == '成功' ? 'success' : 'error'">
                 {{ item.resultCode }}
               </div>
               <div class="list_time">{{ item.logTime }}</div>
@@ -96,7 +60,7 @@ import { Query } from "@/api/dataIntegration";
 export default {
   name: "InterfaceLog",
   components: { Search },
-  data() {
+  data () {
     return {
       timeStart: "",
       timeEnd: "",
@@ -105,27 +69,27 @@ export default {
       date: "",
       keyWords: null,
       preDatas: [],
-      page:0,
-      noMore:false
+      page: 0,
+      noMore: false
     };
   },
-  created() {
+  created () {
     this.getNowTime();
   },
   methods: {
-    load() {
+    load () {
       // console.log("分页");
       if (this.noMore) {
         return;
       }
       this.getQuery();
     },
-    resetTable() {
+    resetTable () {
       this.page = 0;
       this.noMore = false;
       this.tableData = [];
     },
-    rowClick(row, column, event) {
+    rowClick (row, column, event) {
       this.preDatas = [];
       if (row.logObject) {
         this.tableData.forEach((item) => {
@@ -137,13 +101,13 @@ export default {
         this.preDatas.push(row);
       }
     },
-    dateChange() {
+    dateChange () {
       if (this.date != null) {
         this.resetTable();
         this.getQuery();
       }
     },
-    getNowTime() {
+    getNowTime () {
       var now = new Date();
       var year = now.getFullYear(); //得到年份
       var month = now.getMonth(); //得到月份
@@ -160,11 +124,11 @@ export default {
       this.getQuery();
     },
     //获取表格数据
-    async getQuery() {
+    async getQuery () {
       try {
         this.loading = true;
         const { code, returnData } = await Query({
-          id: 15,
+          id: DATACONTENT_ID.sysLogTabId,
           needPage: ++this.page,
           dataContent: [this.date[0] + " 00:00:00", this.date[1] + " 23:59:59"],
         });
@@ -188,12 +152,12 @@ export default {
         console.log(error);
       }
     },
-    getSearchData(val) {
+    getSearchData (val) {
       console.log(val);
       this.keyWords = val;
       this.getQuery();
     },
-    clearSearchData() {},
+    clearSearchData () { },
   },
 };
 </script>

+ 6 - 5
src/views/systemSettings/views/protocolManagement/protocolHome.vue

@@ -21,7 +21,7 @@
         </div>
       </div> -->
       <div class="protocol-content">
-        <DataTable data-id="1" :rows="12" labelWidth="100px" :minHeight="70" width="800px" :showOverflowTooltip="true"/>
+        <DataTable :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">
@@ -102,6 +102,7 @@ export default {
   components: { Dialog, DataTable },
   data () {
     return {
+      dataId: DATACONTENT_ID.sysProtoTabId,
       dataList: [],
       editDialogVisible: false,
       removeDialogVisible: false,
@@ -131,7 +132,7 @@ export default {
     async getList () {
       try {
         const res = await Query({
-          id: 1,
+          id: DATACONTENT_ID.sysProtoTabId,
           dataContent: []
         });
         if (res.code === "0") {
@@ -183,7 +184,7 @@ export default {
       this.rmObj["operate"] = "3";
       try {
         const res = await GeneralDataReception({
-          serviceId: "1",
+          serviceId: SERVICE_ID.sysProtoTabId,
           dataContent: JSON.stringify(this.rmObj),
         });
         if (res.code === "0") {
@@ -201,7 +202,7 @@ export default {
       this.ruleForm["operate"] = "1";
       try {
         const res = await GeneralDataReception({
-          serviceId: '1',
+          serviceId: SERVICE_ID.sysProtoTabId,
           dataContent: JSON.stringify(this.ruleForm)
         })
         if (res.code === "0") {
@@ -218,7 +219,7 @@ export default {
       this.ruleForm["operate"] = "2";
       try {
         const res = await GeneralDataReception({
-          serviceId: '1',
+          serviceId: SERVICE_ID.sysProtoTabId,
           dataContent: JSON.stringify(this.ruleForm)
         })
         if (res.code === "0") {

+ 18 - 36
src/views/systemSettings/views/queryTemplate/queryTemplate.vue

@@ -8,17 +8,7 @@
 -->
 <template>
   <div class="airportInfo">
-    <DataTable
-      data-id="4"
-      :rows="12"
-      label-width="100px"
-      :min-height="70"
-      width="800px"
-      :show-overflow-tooltip="true"
-      :with-column-set="true"
-      @handleAdd="handleAdd"
-      @handleEdit="handleEdit"
-    />
+    <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" />
     <!--搜索-->
     <!-- <div class="airportInfo-search">
       <Search title="查询模板" @getSearchData="getSearchData" :isSearch="false">
@@ -73,17 +63,8 @@
         </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>
@@ -108,8 +89,9 @@ export default {
     Dialog,
     DataTable
   },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.sysQueryTabId,
       arr: [
         {
           typeName: '名称',
@@ -147,7 +129,7 @@ export default {
     }
   },
   computed: {
-    serachBox() {
+    serachBox () {
       if (this.searchInfo) {
         return this.arr.filter(data => {
           return Object.keys(data).some(key => {
@@ -158,13 +140,13 @@ export default {
       return this.arr
     }
   },
-  created() {
+  created () {
     // this.getAirlines();
     // this.exceptionlist();
   },
   methods: {
     // 异常列表查询
-    async exceptionlist() {
+    async exceptionlist () {
       const params = {
         id: ''
       }
@@ -174,7 +156,7 @@ export default {
       }
     },
     // 搜索
-    getSearchData(val) {
+    getSearchData (val) {
       const that = this
       that.exceptionlist().then(function (data) {
         if (val) {
@@ -186,14 +168,14 @@ export default {
       // console.log(this.searchInfo);
     },
     // 删除信息
-    handleMove(item) {
+    handleMove (item) {
       this.listDate = item
       this.flag = true
       this.rmObj = {
         name: item.queryTemplateName
       }
     },
-    async EditSubmit() {
+    async EditSubmit () {
       let arr = 0
       this.$refs['ruleFormall'].validate(valid => {
         if (valid) {
@@ -218,11 +200,11 @@ export default {
         this.EditFlag = false
       }
     },
-    closeForm() {
+    closeForm () {
       this.$refs.ruleForm.resetFields()
     },
     // 获取模板列表
-    async getAirlines() {
+    async getAirlines () {
       try {
         const res = await Query({
           id: 77,
@@ -239,11 +221,11 @@ export default {
     },
 
     // 新增机场信息-弹框
-    handleAdd() {
+    handleAdd () {
       this.$router.push('/systemSettings/queryTemplateadd')
     },
     // 新增机场信息-弹框
-    handleEdit(item) {
+    handleEdit (item) {
       // this.modid = item;
       // this.EditForm.name = item.typeName;
       // this.EditForm.fullName = item.typeCode;
@@ -255,7 +237,7 @@ export default {
       // this.EditFlag = true;
     },
     // 新增机场信息-弹框-取消
-    resetForm() {
+    resetForm () {
       this.addFlag = false
       this.EditFlag = false
       this.ruleForm.name = ''
@@ -264,7 +246,7 @@ export default {
       this.$refs.ruleFormall.resetFields()
     },
     // 删除
-    async remove(data) {
+    async remove (data) {
       this.listDate.operate = '3'
       try {
         const res = await GeneralDataReception({
@@ -295,7 +277,7 @@ export default {
     background: #eb2f3b;
     border-radius: 50%;
     margin-right: 15px;
-    background: url('../../../../assets/index/ic_close_hint.png') no-repeat;
+    background: url("../../../../assets/index/ic_close_hint.png") no-repeat;
     background-size: 100% 100%;
   }
   .er {

+ 5 - 11
src/views/systemSettings/views/queryTemplate/queryTemplateChild.vue

@@ -1,15 +1,7 @@
 <template>
   <div class="queryItemSettings_home">
     <div class="wrap">
-      <DataTable
-        data-id="44"
-        edit-id="45"
-        :data-content="{ queryTemplateID }"
-        :rows="12"
-        label-width="140px"
-        :min-height="70"
-        width="800px"
-      />
+      <DataTable :data-id="dataId" :edit-id="editId" :data-content="{ queryTemplateID }" :rows="12" label-width="140px" :min-height="70" width="800px" />
     </div>
   </div>
 </template>
@@ -17,12 +9,14 @@
 import DataTable from '@/components/Table'
 export default {
   components: { DataTable },
-  data() {
+  data () {
     return {
+      dataId: DATACONTENT_ID.sysQueryChildTabId,
+      editId: DATACONTENT_ID.sysQueryChildEditTabId,
       queryTemplateID: null
     }
   },
-  created() {
+  created () {
     if (!this.$route.query.queryTemplateID) {
       this.$router.push('/systemSettings/queryTemplate')
       return

+ 27 - 101
src/views/systemSettings/views/queryTemplate/queryTemplateadd.vue

@@ -1,103 +1,38 @@
 <template>
   <div class="queryTemplate">
-    <Search
-      title="新增查询模板"
-      :is-search="false"
-    >
+    <Search title="新增查询模板" :is-search="false">
       <button class="btnAner">测试</button>
-      <button
-        class="btnAn"
-        @click="addSubmit"
-      >保存</button>
+      <button class="btnAn" @click="addSubmit">保存</button>
     </Search>
-    <el-form
-      ref="ruleForm"
-      style="margin-top: 10px"
-      :inline="true"
-      :model="ruleForm"
-      label-width="auto"
-      class="demo-ruleForm"
-    >
-      <el-row
-        :gutter="24"
-        class="b24"
-      >
+    <el-form ref="ruleForm" style="margin-top: 10px" :inline="true" :model="ruleForm" label-width="auto" class="demo-ruleForm">
+      <el-row :gutter="24" class="b24">
         <el-col :span="6">
-          <el-form-item
-            label="查询模板名称"
-            prop="queryTemplateName"
-          >
-            <el-input
-              v-model="ruleForm.queryTemplateName"
-              size="medium"
-              placeholder="请输入查询模板名称"
-              clearable
-            />
+          <el-form-item label="查询模板名称" prop="queryTemplateName">
+            <el-input v-model="ruleForm.queryTemplateName" size="medium" placeholder="请输入查询模板名称" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
-            label="数据源"
-            prop="dataSourceID"
-          >
-            <el-select
-              v-model="ruleForm.dataSourceID"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in dataSourceList"
-                :key="item.dataSourceID"
-                :label="item.dataSourceName"
-                :value="item.dataSourceID"
-              />
+          <el-form-item label="数据源" prop="dataSourceID">
+            <el-select v-model="ruleForm.dataSourceID" placeholder="请选择" clearable>
+              <el-option v-for="item in dataSourceList" :key="item.dataSourceID" :label="item.dataSourceName" :value="item.dataSourceID" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
-            label="服务名称"
-            prop="submitID"
-          >
-            <el-select
-              v-model="ruleForm.submitID"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in serviceList"
-                :key="item.submitID"
-                :label="item.serviceName"
-                :value="item.submitID"
-              />
+          <el-form-item label="服务名称" prop="submitID">
+            <el-select v-model="ruleForm.submitID" placeholder="请选择" clearable>
+              <el-option v-for="item in serviceList" :key="item.submitID" :label="item.serviceName" :value="item.submitID" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
-            label="每页显示"
-            prop="pageRows"
-          >
-            <el-input
-              v-model="ruleForm.pageRows"
-              size="medium"
-              placeholder="请输入每页显示行数"
-              type="number"
-              clearable
-            />
+          <el-form-item label="每页显示" prop="pageRows">
+            <el-input v-model="ruleForm.pageRows" size="medium" placeholder="请输入每页显示行数" type="number" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item
-            label="查询模板描述"
-            prop="queryTemplateDescribe"
-          >
-            <el-input
-              v-model="ruleForm.queryTemplateDescribe"
-              size="medium"
-              placeholder="请输入查询模板描述"
-              clearable
-            />
+          <el-form-item label="查询模板描述" prop="queryTemplateDescribe">
+            <el-input v-model="ruleForm.queryTemplateDescribe" size="medium" placeholder="请输入查询模板描述" clearable />
           </el-form-item>
         </el-col>
         <!-- <el-form-item
@@ -116,16 +51,7 @@
       </el-form-item> -->
         <el-col :span="24">
           <el-form-item label="查询语句">
-            <el-input
-              v-model="ruleForm.queryTemplate"
-              class="desc"
-              type="textarea"
-              resize="none"
-              :autosize="{ minRows: 26, maxRows: 26 }"
-              placeholder="描述内容···"
-              size="small"
-              clearable
-            />
+            <el-input v-model="ruleForm.queryTemplate" class="desc" type="textarea" resize="none" :autosize="{ minRows: 26, maxRows: 26 }" placeholder="描述内容···" size="small" clearable />
           </el-form-item>
         </el-col>
       </el-row>
@@ -139,7 +65,7 @@ export default {
   components: {
     Search
   },
-  data() {
+  data () {
     return {
       ruleForm: {
         queryTemplateName: '',
@@ -159,13 +85,13 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     this.ruleForm.event = 1
     this.getDataSourceList()
     this.queryServiceList()
   },
   methods: {
-    async addSubmit() {
+    async addSubmit () {
       const params = {
         ...this.ruleForm,
         submitID: this.ruleForm.serviceID
@@ -173,7 +99,7 @@ export default {
       delete params.serviceID
       try {
         const res = await GeneralDataReception({
-          serviceId: 5,
+          serviceId: SERVICE_ID.sysQueryTabId,
           dataContent: JSON.stringify(params)
         })
         if (Number(res.code) === 0) {
@@ -186,23 +112,23 @@ export default {
         console.log('错误', error)
       }
     },
-    async getDataSourceList() {
-      const dataSourceList = await this.getSelectOption(21)
+    async getDataSourceList () {
+      const dataSourceList = await this.getSelectOption(DATACONTENT_ID.sysSourceId)
       this.dataSourceList = dataSourceList.map(item => {
         item[item.setlabel] = item.k
         item[item.setvalue] = item.v
         return item
       })
     },
-    async queryServiceList() {
-      const serviceList = await this.getSelectOption(2)
+    async queryServiceList () {
+      const serviceList = await this.getSelectOption(DATACONTENT_ID.sysServiceTabId)
       this.serviceList = serviceList.map(item => {
         item[item.setlabel] = item.k
         item[item.setvalue] = item.v
         return item
       })
     },
-    async getSelectOption(ID) {
+    async getSelectOption (ID) {
       try {
         const { listValues } = await myQuery(ID)
         return listValues
@@ -247,7 +173,7 @@ export default {
           &::-webkit-inner-spin-button {
             -webkit-appearance: none !important;
           }
-          &[type='number'] {
+          &[type="number"] {
             -moz-appearance: textfield !important;
           }
         }

+ 29 - 103
src/views/systemSettings/views/queryTemplate/queryTemplateedit.vue

@@ -1,103 +1,38 @@
 <template>
   <div class="queryTemplate">
-    <Search
-      title="编辑查询模板"
-      :is-search="false"
-    >
+    <Search title="编辑查询模板" :is-search="false">
       <button class="btnAner">测试</button>
-      <button
-        class="btnAn"
-        @click="editSubmit"
-      >保存</button>
+      <button class="btnAn" @click="editSubmit">保存</button>
     </Search>
-    <el-form
-      ref="ruleForm"
-      style="margin-top: 10px"
-      :inline="true"
-      :model="ruleForm"
-      label-width="auto"
-      class="demo-ruleForm"
-    >
-      <el-row
-        :gutter="24"
-        class="b24"
-      >
+    <el-form ref="ruleForm" style="margin-top: 10px" :inline="true" :model="ruleForm" label-width="auto" class="demo-ruleForm">
+      <el-row :gutter="24" class="b24">
         <el-col :span="6">
-          <el-form-item
-            label="查询模板名称"
-            prop="queryTemplateName"
-          >
-            <el-input
-              v-model="ruleForm.queryTemplateName"
-              size="medium"
-              placeholder="请输入查询模板名称"
-              clearable
-            />
+          <el-form-item label="查询模板名称" prop="queryTemplateName">
+            <el-input v-model="ruleForm.queryTemplateName" size="medium" placeholder="请输入查询模板名称" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
-            label="数据源"
-            prop="dataSourceID"
-          >
-            <el-select
-              v-model="ruleForm.dataSourceID"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in dataSourceList"
-                :key="item.dataSourceID"
-                :label="item.dataSourceName"
-                :value="item.dataSourceID"
-              />
+          <el-form-item label="数据源" prop="dataSourceID">
+            <el-select v-model="ruleForm.dataSourceID" placeholder="请选择" clearable>
+              <el-option v-for="item in dataSourceList" :key="item.dataSourceID" :label="item.dataSourceName" :value="item.dataSourceID" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
-            label="服务名称"
-            prop="serviceID"
-          >
-            <el-select
-              v-model="ruleForm.serviceID"
-              placeholder="请选择"
-              clearable
-            >
-              <el-option
-                v-for="item in serviceList"
-                :key="item.serviceID"
-                :label="item.serviceName"
-                :value="item.serviceID"
-              />
+          <el-form-item label="服务名称" prop="serviceID">
+            <el-select v-model="ruleForm.serviceID" placeholder="请选择" clearable>
+              <el-option v-for="item in serviceList" :key="item.serviceID" :label="item.serviceName" :value="item.serviceID" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item
-            label="每页显示"
-            prop="pageRows"
-          >
-            <el-input
-              v-model="ruleForm.pageRows"
-              size="medium"
-              placeholder="请输入每页显示行数"
-              type="number"
-              clearable
-            />
+          <el-form-item label="每页显示" prop="pageRows">
+            <el-input v-model="ruleForm.pageRows" size="medium" placeholder="请输入每页显示行数" type="number" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item
-            label="查询模板描述"
-            prop="queryTemplateDescribe"
-          >
-            <el-input
-              v-model="ruleForm.queryTemplateDescribe"
-              size="medium"
-              placeholder="请输入查询模板描述"
-              clearable
-            />
+          <el-form-item label="查询模板描述" prop="queryTemplateDescribe">
+            <el-input v-model="ruleForm.queryTemplateDescribe" size="medium" placeholder="请输入查询模板描述" clearable />
           </el-form-item>
         </el-col>
         <!-- <el-form-item
@@ -116,16 +51,7 @@
       </el-form-item> -->
         <el-col :span="24">
           <el-form-item label="查询语句">
-            <el-input
-              v-model="ruleForm.queryTemplate"
-              class="desc"
-              type="textarea"
-              resize="none"
-              :autosize="{ minRows: 26, maxRows: 26 }"
-              placeholder="描述内容···"
-              size="small"
-              clearable
-            />
+            <el-input v-model="ruleForm.queryTemplate" class="desc" type="textarea" resize="none" :autosize="{ minRows: 26, maxRows: 26 }" placeholder="描述内容···" size="small" clearable />
           </el-form-item>
         </el-col>
       </el-row>
@@ -139,7 +65,7 @@ export default {
   components: {
     Search
   },
-  data() {
+  data () {
     return {
       queryTemplateID: null,
       ruleForm: {
@@ -160,7 +86,7 @@ export default {
       }
     }
   },
-  created() {
+  created () {
     // this.ruleForm = this.$route.query
     if (this.$route.query.queryTemplateID == null) {
       this.$router.push('/systemSettings/queryTemplate')
@@ -174,7 +100,7 @@ export default {
     this.queryServiceList()
   },
   methods: {
-    async editSubmit() {
+    async editSubmit () {
       const params = {
         ...this.ruleForm,
         submitID: this.ruleForm.serviceID
@@ -182,7 +108,7 @@ export default {
       delete params.serviceID
       try {
         const res = await GeneralDataReception({
-          serviceId: 5,
+          serviceId: SERVICE_ID.sysQueryTabId,
           dataContent: JSON.stringify(params)
         })
         if (Number(res.code) === 0) {
@@ -195,9 +121,9 @@ export default {
         console.log('错误', error)
       }
     },
-    async queryQueryTemplateByID(queryTemplateID) {
+    async queryQueryTemplateByID (queryTemplateID) {
       try {
-        const templateInfo = await myQuery(43, queryTemplateID)
+        const templateInfo = await myQuery(DATACONTENT_ID.sysQueryEditId, queryTemplateID)
         Object.entries(templateInfo.listValues[0]).forEach(([key, value]) => {
           this.ruleForm[key] = value
         })
@@ -205,23 +131,23 @@ export default {
         this.$message.error(error)
       }
     },
-    async getDataSourceList() {
-      const dataSourceList = await this.getSelectOption(21)
+    async getDataSourceList () {
+      const dataSourceList = await this.getSelectOption(DATACONTENT_ID.sysSourceId)
       this.dataSourceList = dataSourceList.map(item => {
         item[item.setlabel] = item.k
         item[item.setvalue] = item.v
         return item
       })
     },
-    async queryServiceList() {
-      const serviceList = await this.getSelectOption(2)
+    async queryServiceList () {
+      const serviceList = await this.getSelectOption(DATACONTENT_ID.sysServiceTabId)
       this.serviceList = serviceList.map(item => {
         item[item.setlabel] = item.k
         item[item.setvalue] = item.v
         return item
       })
     },
-    async getSelectOption(ID) {
+    async getSelectOption (ID) {
       try {
         const { listValues } = await myQuery(ID)
         return listValues
@@ -266,7 +192,7 @@ export default {
           &::-webkit-inner-spin-button {
             -webkit-appearance: none !important;
           }
-          &[type='number'] {
+          &[type="number"] {
             -moz-appearance: textfield !important;
           }
         }

+ 6 - 6
src/views/systemSettings/views/serviceManagement/mixins/operate.js

@@ -17,7 +17,7 @@ const operateMap = {
 
 export default {
   methods: {
-    async updateService() {
+    async updateService () {
       const params = {
         serviceID: this.serviceID,
         ...this.serviceForm,
@@ -25,7 +25,7 @@ export default {
       }
       try {
         const result = await GeneralDataReception({
-          serviceId: 3,
+          serviceId: SERVICE_ID.sysServiceAddId,
           dataContent: JSON.stringify(params)
         })
         if (Number(result.code) === 0) {
@@ -37,7 +37,7 @@ export default {
         console.log('错误', error)
       }
     },
-    async updateServiceNode(event, deployObject) {
+    async updateServiceNode (event, deployObject) {
       const params = {
         event,
         serviceID: this.serviceID
@@ -53,7 +53,7 @@ export default {
       }
       try {
         const result = await GeneralDataReception({
-          serviceId: 4,
+          serviceId: SERVICE_ID.sysServiceEditBoxId,
           dataContent: JSON.stringify(params)
         })
         if (Number(result.code) === 0) {
@@ -65,7 +65,7 @@ export default {
         console.log('错误', error)
       }
     },
-    async updateServiceSource(operate, sourceDataID) {
+    async updateServiceSource (operate, sourceDataID) {
       const params = {
         operate: operateMap[operate],
         serviceID: this.serviceID
@@ -92,7 +92,7 @@ export default {
         console.log('错误', error)
       }
     },
-    async updateServiceOutput(operate, outputTarget) {
+    async updateServiceOutput (operate, outputTarget) {
       const { dataOutputConfig, outputCondition, protocolID, serviceOutputID, targetdataID } = outputTarget
       const params = {
         operate: operateMap[operate]

+ 6 - 6
src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -250,7 +250,7 @@ export default {
   },
   mounted () {
     this.queryServiceByID(this.serviceID)
-    this.getDataSourceList(21)
+    this.getDataSourceList(DATACONTENT_ID.sysSourceId)
   },
   updated () {
     const headerHeight = 80 + 24
@@ -281,7 +281,7 @@ export default {
       }
     },
     addService () {
-      this.getDataSourceList(23)
+      this.getDataSourceList(DATACONTENT_ID.sysServiceXyId)
       this.sourceFormVisible = true
     },
     async machineSelectionChangeHandler (selection, row) {
@@ -297,7 +297,7 @@ export default {
     },
     async getDataSourceList (id) {
       const dataSourceList = await this.getSelectOption(id)
-      if (id == 21) {
+      if (id == DATACONTENT_ID.sysSourceId) {
         this.dataSourceList = dataSourceList.map(item => {
           item[item.setlabel] = item.k
           item[item.setvalue] = item.v
@@ -321,7 +321,7 @@ export default {
       }
     },
     async queryServiceByID (serviceID) {
-      const serviceInfo = await myQuery(39, serviceID)
+      const serviceInfo = await myQuery(DATACONTENT_ID.sysServiceEditId, serviceID)
       Object.entries(serviceInfo.listValues[0]).forEach(([key, value]) => {
         this.serviceForm[key] = value
       })
@@ -336,13 +336,13 @@ export default {
       try {
         this.formLabelAlign['event'] = 1
         const res = await GeneralDataReception({
-          serviceId: 12,
+          serviceId: SERVICE_ID.sysServiceAddXyId,
           dataContent: JSON.stringify(this.formLabelAlign)
         })
         if (Number(res.code) === 0) {
           this.$message.success(res.message ?? '成功')
           this.sourceFormVisible = false
-          this.getDataSourceList(21)
+          this.getDataSourceList(DATACONTENT_ID.sysSourceId)
         } else {
           this.$message.error(res.message ?? '失败')
         }

+ 8 - 7
src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -9,7 +9,7 @@
 <template>
   <div class="service-home">
     <div class="wrap">
-      <DataTable ref="serviceTable" data-id="2" :rows="12" width="800px" label-width="110px" fixedWidth="280px" :min-height="70" :isStatus="true" :is-dialog="false" @handleAdd="showCreateDialog" @handleEdit="btnEditClickHandler">
+      <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">
         <template v-slot:header>
           <div class="status flex-wrap">
             <div class="manageTitle">服务管理</div>
@@ -186,6 +186,7 @@ export default {
       serviceList: [],
       createDialogVisible: false,
       sourceFormVisible: false,
+      dataId: DATACONTENT_ID.sysServiceTabId,
       serviceForm: {
         serviceName: '',
         serviceOutputID: '',
@@ -222,12 +223,12 @@ export default {
   methods: {
     // 新增-弹框
     showCreateDialog () {
-      this.getDataSourceList(21)
+      this.getDataSourceList(DATACONTENT_ID.sysSourceId)
       this.createDialogVisible = true
     },
     //
     addService () {
-      this.getDataSourceList(23)
+      this.getDataSourceList(DATACONTENT_ID.sysServiceXyId)
       this.sourceFormVisible = true
     },
     // 新增-提交
@@ -255,7 +256,7 @@ export default {
     },
     async getDataSourceList (id) {
       const dataSourceList = await this.getSelectOption(id)
-      if (id == 21) {
+      if (id == DATACONTENT_ID.sysSourceId) {
         this.dataSourceList = dataSourceList.map(item => {
           item[item.setlabel] = item.k
           item[item.setvalue] = item.v
@@ -289,7 +290,7 @@ export default {
       try {
         this.serviceForm['event'] = 1
         const res = await GeneralDataReception({
-          serviceId: 3,
+          serviceId: SERVICE_ID.sysServiceAddId,
           dataContent: JSON.stringify(this.serviceForm)
         })
         if (Number(res.code) === 0) {
@@ -313,13 +314,13 @@ export default {
       try {
         this.formLabelAlign['event'] = 1
         const res = await GeneralDataReception({
-          serviceId: 12,
+          serviceId: SERVICE_ID.sysServiceAddXyId,
           dataContent: JSON.stringify(this.formLabelAlign)
         })
         if (Number(res.code) === 0) {
           this.$message.success(res.message ?? '成功')
           this.sourceFormVisible = false
-          this.getDataSourceList(21)
+          this.getDataSourceList(DATACONTENT_ID.sysSourceId)
         } else {
           this.$message.error(res.message ?? '失败')
         }

+ 3 - 2
src/views/systemSettings/views/serviceManagement/serviceTopology.vue

@@ -148,7 +148,7 @@ export default {
       try {
         this.loading = true
         const { code, returnData } = await Query({
-          id: 127,
+          id: DATACONTENT_ID.sysServiceTopTableId,
           dataContent: JSON.stringify([this.id, this.timeStart, this.timeEnd])
         })
         if (code == 0) {
@@ -160,6 +160,7 @@ export default {
           this.loading = false
         }
       } catch (error) {
+        this.loading = false
         console.log(error)
       }
     },
@@ -184,7 +185,7 @@ export default {
     },
     async getTreeData () {
       const { code, returnData } = await Query({
-        id: 206,
+        id: DATACONTENT_ID.sysServiceTopId,
         dataContent: this.treeDatas
       })
       if (code == 0) {

+ 5 - 10
src/views/systemSettings/views/sourceservice/sourceserviceHome.vue

@@ -1,22 +1,17 @@
 <template>
   <div class="sourceservice_home">
     <div class="wrap">
-      <DataTable
-        data-id="6"
-        :rows="12"
-        labelWidth="110px"
-        :showOverflowTooltip="true"
-        :minHeight="70"
-        width="800px"
-      />
+      <DataTable :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() {
-    return {};
+  data () {
+    return {
+      dataId: 6
+    };
   },
   components: { DataTable },
 };