修改

public/config.js

@@ -7,6 +7,7 @@ window.SERVICE_ID = {
   authTreeId: 18126, //获取表头
   roleListId: 10024,//角色列表
   userAuthorizationId: 10027,//用户授权
-  depTableId: 185, //机器维护表头
-  serTableId: 203, //服务设置表头
+  depTableId: 185, //机器维护-表头
+  serTableId: 203, //服务设置-表头
+  serTableDataId: 4 //服务设置-算法配置-获取数据源名称
 };

public/staticConfig.js

@@ -1,10 +1,10 @@
 /* url配置 */
 window.PLATFROM_CONFIG = {
-  baseNewUrl: "http://120.26.64.82:8082", //登录前的http请求地址
+  baseNewUrl: "http://10.211.66.23:8082", //登录前的http请求地址
   baseUrl: "http://10.211.67.163:16300", // 4A-http请求地址
   appKeyString: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
   appId: "q7kdjmmaf0kerwpf", //appid
-  baseURLCA: "http://120.26.64.82:8082", // 登录后的http请求地址-测试
+  baseURLCA: "http://10.211.66.23:8082", // 登录后的http请求地址-测试
   baggageMessageURL: "/openApi/query",
   getBase64: 'http://10.211.67.163:8083/getBase64'
 };

src/layout/mixin/publicFunc.js

@@ -45,7 +45,7 @@ export default {
       const flag = Array.isArray(data)
       if (flag) {
         for (let i = 0; i < data.length; i++) {
-          const obj = {}
+          let obj = {}
           if (event == 1) {
             obj.Value = data[i]
           } else if (event == 2) {
@@ -53,8 +53,18 @@ export default {
             obj.filter = {}
             if (Array.isArray(key)) {
               const keys = Object.keys(key[i])
-              obj.filter = key[i]
+              const vals = Object.values(key[i])
+              obj.filter = []
               for (let j = 0; j < keys.length; j++) {
+                const nobj = {
+                  "left": "(",
+                  "column": `${key[i][keys[i]]}`,
+                  "comparator": "=",
+                  "value": `${key[i][vals[i]]}`,
+                  "right": ")",
+                  "connector": "and"
+                }
+                obj.filter.push(nobj)
                 if (obj.Value.hasOwnProperty(keys[j])) {
                   delete obj.Value[keys[j]]
                 }
@@ -66,30 +76,51 @@ export default {
               }
             }
           } else {
-            obj.filter = data[i]
+            obj = data[i]
           }
           datas.push(obj)
         }
       } else {
-        const obj = {}
+        let obj = {}
         if (event == 1) {
           obj.Value = data
         } else if (event == 2) {
           obj.Value = data
-          obj.filter = {}
-          obj.filter[key] = data[key]
+          obj.filter = [{
+            "left": "(",
+            "column": `${key}`,
+            "comparator": "=",
+            "value": `${data[key]}`,
+            "right": ")",
+            "connector": "and"
+          }]
           if (obj.Value[key]) {
             delete obj.Value[key]
           }
         } else {
-          obj.filter = data
+          obj = data
         }
         datas.push(obj)
       }
       return datas
     },
     //查询
-    async getQueryList (id, dataContent = {}, key, pageSize) {
+    async getQueryList (id, dataContent = {}, pageIndex = 1, pageSize = 20) {
+      try {
+        const { code, rowcount, returnData } = await Query({
+          serviceId: id,
+          page: pageIndex,
+          pageSize: pageSize,
+          dataContent: dataContent,
+          event: '0'
+        })
+        return { code, rowcount, returnData }
+      } catch (error) {
+        return []
+      }
+    },
+    //高级查询
+    async getQueryGj (id, dataContent = {}, key, pageSize) {
       try {
         const { code, columnset, returnData } = await Query({
           serviceId: id,
@@ -115,17 +146,13 @@ export default {
           dataContent: this.formatChange(data, event, key),
           event: `${event}`,
         };
-        const { code } =
+        const { code, message } =
           event == 1
             ? await newData(params)
             : event == 2
               ? await modifyData(params)
               : await moveData(params);
-        if (code == 0) {
-          return 1
-        } else {
-          return 0
-        }
+        return { code, message }
       } catch (error) {
         console.log(error)
         return 0

src/views/newBagDetails/components/baggageList.vue

@@ -1,12 +1,203 @@
 <template>
-  <div>行李流程列表</div>
+  <div class="baggageList">
+    <el-table ref="table" :data="baggageTableData" height="100%" size="mini" border fit :header-cell-class-name="headerCellClass" :header-cell-style="{ color: '#101116' }" :cell-class-name="cellClass" :span-method="tableSpanMethod" @cell-click="cellClickHandler">
+      <el-table-column v-for="item in tableColsCopy" :key="item.index" :prop="item.prop" :label="item.name" :align="item.align || 'center'" :width="item.width" show-overflow-tooltip :fixed="item.fixed">
+        <template slot="header">
+          <div class="cell-content">{{ item.name }}</div>
+        </template>
+        <template slot-scope="scope">
+          <div class="cell-content">{{ scope.row[item.prop] }}</div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script>
+import pf from '@/layout/mixin/publicFunc'
+import tableColsMixin from '@/views/flightViewManagement/mixins/tableCols'
 export default {
-
+  name: 'BaggageList',
+  mixins: [pf, tableColsMixin],
+  data () {
+    return {
+      tableCols: [
+        { name: '航班号', prop: 'F1', fixed: true },
+        { name: '航班日期', prop: 'F2', width: 95, fixed: true },
+        // { name: '起飞航站\n起飞时间', prop: 'departureInfo', width: 100 },
+        // { name: '目的航站\n降落时间', prop: 'landingInfo', width: 100 },
+        { name: '旅客舱位', prop: 'U4', width: 70 },
+        { name: '旅客座位号', prop: 'S2' },
+        { name: '值机序号', prop: 'passengerCheckInNumber', width: 70 },
+        { name: '节点标识', prop: 'nodeCode', width: 100 },
+        { name: '节点名称', prop: 'nodeName', width: 70 },
+        { name: '位置标识', prop: 'J8' },
+        { name: '位置描述', prop: 'J6' },
+        { name: '读取时间', prop: 'J5', width: 158 },
+        { name: '结果', prop: 'status', width: 60 },
+        { name: '次级代码', prop: 'J1', width: 70 },
+        { name: '操作人', prop: 'J2', width: 90 },
+        { name: '设备ID', prop: 'J3' },
+        { name: '发往位置', prop: 'J9', width: 70 },
+        { name: '发往位置描述', prop: 'J7', width: 100 },
+        { name: '装载序号', prop: 'Q1', width: 70 },
+        { name: '容器编号', prop: 'U1', width: 110 },
+        { name: '数据来源', prop: 'dataSource' }
+      ],
+      baggageTableData: [],
+      spanArr: [],
+      pos: 0,
+      queryData: {
+        "B2": "3479519535",
+        "F1": "ZH9863",
+        "F2": "2023-02-02"
+      }
+    }
+  },
+  mounted () {
+    this.queryDetails()
+  },
+  methods: {
+    async queryDetails (queryData = this.queryData) {
+      function setDataSource (item) {
+        if (item['b_type'] !== 'BSM') {
+          const resourceCode = item['resourceFile']?.slice(-4)
+          switch (resourceCode) {
+            case '0100':
+              if (
+                (item['DeviceCode'] && item['DeviceCode'].toUpperCase() === 'STARHUB') ||
+                (!item['DeviceCode'] && !['LOAD', 'INFL'].includes(item['nodeCode']))
+              ) {
+                item['dataSource'] = 'Manual Load'
+              } else {
+                item['dataSource'] = 'BRS'
+              }
+              break
+            case '0101':
+              item['dataSource'] = 'RFID'
+              break
+            case '0102':
+              item['dataSource'] = '首都机场'
+              break
+            default:
+              break
+          }
+        }
+      }
+      const dataContent = queryData
+      const newData = Object.entries(dataContent)
+      const datas = []
+      newData.forEach(item => {
+        const obj = {}
+        obj[item[0]] = item[1]
+        datas.push(obj)
+      })
+      try {
+        const baggageDetails = await this.getQueryList(18128, datas, ['B2', 'F1', 'F2'])
+        this.baggageTableData = baggageDetails.map((item, index) => {
+          if (item['dealTime']) {
+            item['dealTime'] = item['dealTime'].replace('T', ' ')
+          }
+          item['departureInfo'] = `${item['departureAirport']}\n${item['departureTime'] ? item['departureTime'].replace('T', '\n') : ''
+            }`
+          item['landingInfo'] = `${item['landingAirport']}\n${item['landingTime'] ? item['landingTime'].replace('T', '\n') : ''
+            }`
+          setDataSource(item)
+          return item
+        })
+        this.initTableData(this.baggageTableData)
+      } catch (error) {
+        this.$message.error('失败')
+      }
+    },
+    initTableData (tableData) {
+      const spanArr = []
+      let pos = 0
+      for (let i = 0; i < tableData.length; i++) {
+        if (i === 0) {
+          spanArr.push(1)
+        } else {
+          if (
+            tableData[i]['F1'] === tableData[i - 1]['F1'] &&
+            tableData[i]['F2'] === tableData[i - 1]['F2'] &&
+            tableData[i]['departureAirport'] === tableData[i - 1]['departureAirport'] &&
+            tableData[i]['landingAirport'] === tableData[i - 1]['landingAirport']
+          ) {
+            spanArr[pos] += 1
+            spanArr.push(0)
+          } else {
+            spanArr.push(1)
+            pos = i
+          }
+        }
+      }
+      this.spanArr = spanArr
+      this.pos = pos
+    },
+    headerCellClass ({ row, column, rowIndex, columnIndex }) {
+      if (['departureInfo', 'landingInfo'].includes(column.property)) {
+        return 'pre-line'
+      }
+    },
+    cellClass ({ row, column, rowIndex, columnIndex }) {
+      const classes = []
+      if (
+        ['flightNO', 'U_Device_ID'].includes(column.property) &&
+        row[column.property] &&
+        row[column.property] !== 'FBULK'
+      ) {
+        classes.push('cell-click')
+      }
+      if (['departureInfo', 'landingInfo'].includes(column.property)) {
+        classes.push('pre-line')
+      }
+      return classes.join(' ')
+    },
+    cellClickHandler (row, column, cell, event) {
+      if (row[column.property] && row[column.property] !== 'FBULK') {
+        switch (column.property) {
+          case 'flightNO':
+            this.$router.push({
+              path: `${this.$route.path.split('/').slice(0, -1).join('/')}/flightView`,
+              query: {
+                flightNO: row.flightNO,
+                flightDate: row.flightDate
+              }
+            })
+            break
+          case 'U_Device_ID':
+            this.$router.push({
+              path: `${this.$route.path.split('/').slice(0, -1).join('/')}/containerView`,
+              query: {
+                flightNO: row.flightNO,
+                flightDate: row.flightDate,
+                departureAirport: row.departureAirport,
+                landingAirport: row.landingAirport,
+                containerID: row.U_Device_ID
+              }
+            })
+            break
+          default:
+            break
+        }
+      }
+    },
+    tableSpanMethod ({ row, column, rowIndex, columnIndex }) {
+      if (['flightNO', 'flightDate', 'departureInfo', 'landingInfo'].includes(column['property'])) {
+        const _row = this.spanArr[rowIndex]
+        const _col = _row > 0 ? 1 : 0
+        return {
+          rowspan: _row,
+          colspan: _col
+        }
+      }
+    },
+  }
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.baggageList {
+  height: 100%;
+}
 </style>

src/views/newBagDetails/components/baggageMessage.vue

@@ -1,12 +1,36 @@
 <template>
-  <div>行李报文</div>
+  <div class="baggageMessage">
+    <template v-if="messageList.length">
+      <el-row :gutter="24" type="flex">
+        <el-col v-for="(message, index) in messageList" :key="index" :span="6">
+          <div class="card">
+            <div class="message-date">{{ message.date }}</div>
+            <div class="message-content">
+              {{ message.dataContent.replaceAll(/[\r\n]{2,}/g, '\n').replaceAll('\\', '') }}
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </template>
+    <template v-else>
+      <el-empty :image-size="1" description="暂无数据" />
+    </template>
+  </div>
 </template>
 
 <script>
 export default {
-
+  name: 'BaggageMessage',
+  data () {
+    return {
+      messageList: [],
+    }
+  }
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.baggageMessage {
+  height: 100%;
+}
 </style>

src/views/newBagDetails/components/baggageView.vue

@@ -1,14 +1,104 @@
 <template>
   <div class="baggageView">
     <el-scrollbar style="height: 100%">
-      <div v-for="item in 10" :key="item" class="baggageView-list">1</div>
+      <div v-for="item in 10" :key="item" class="baggageView-list">
+        <div class="part2">
+          <div class="part2_info">
+            <div class="title">
+              <div class="fightNo">CA1234</div>
+              <div class="fightDate">2023-03-07</div>
+              <div class="fightLine">双流T2 -- 首都T1</div>
+              <div class="fightTime">08:22 -- 10:22</div>
+            </div>
+            <div class="baggage-track-chart">
+              <div class="step-line">
+                <div v-for="(line, index) in 6" :key="index" :class="['step-line-segment', { 'step-line-active': activeStepLine(index) }]" />
+              </div>
+              <div v-for="(item, index) in stepNodes" :key="index" :class="{ 'step-item': true, 'active-item': item.status }">
+                <div class="step-circle">
+                  <span class="step-name">{{ item.nodeName }}</span>
+                </div>
+                <div v-if="item.status" class="step-info">
+                  <div :class="statusClasses(item.status)">{{ item.status }}</div>
+                  <span class="step-time">{{ item.processingTime }}</span>
+                  <div class="step-location">{{ item.locationId }}</div>
+                </div>
+                <div v-else class="step-info">无</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
     </el-scrollbar>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'BaggageView'
+  name: 'BaggageView',
+  data () {
+    return {
+      stepNodes: [],
+    }
+  },
+  computed: {
+    activeStepLine () {
+      return function (index) {
+        // return this.stepNodes[index].status && this.stepNodes[index + 1].status
+        return true
+      }
+    },
+    statusClasses () {
+      return function (status) {
+        const classes = ['step-status']
+        if (typeof status === 'string') {
+          if (status.includes('正常') || status.includes('通过')) {
+            classes.push('step-status-normal')
+          } else {
+            classes.push('step-status-abnormal')
+          }
+        }
+        return classes
+      }
+    },
+  },
+  mounted () {
+    this.resetStepNodes()
+  },
+  methods: {
+    resetStepNodes () {
+      this.stepNodes = [
+        {
+          nodeCode: 'CHECKIN',
+          nodeName: '值机'
+        },
+        {
+          nodeCode: 'SECURITY',
+          nodeName: '安检'
+        },
+        {
+          nodeCode: 'SORT',
+          nodeName: '分拣'
+        },
+        {
+          nodeCode: 'LOAD',
+          nodeName: '装车'
+        },
+        {
+          nodeCode: 'INFL',
+          nodeName: '装机'
+        },
+        {
+          nodeCode: 'UNLOAD',
+          nodeName: '卸机'
+        },
+        {
+          nodeCode: 'ARRIVED',
+          nodeName: '到达'
+        }
+      ]
+    },
+  }
 }
 </script>
 
@@ -22,6 +112,133 @@ export default {
     &:last-child {
       border-bottom: none;
     }
+    .part2 {
+      width: 100%;
+      background: #ffffff;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      align-items: flex-start;
+      .part2_info {
+        flex: 1;
+        display: flex;
+        flex-direction: row;
+        justify-content: flex-start;
+        align-items: flex-start;
+        line-height: 42px;
+
+        .title {
+          width: 160px;
+          margin-right: 30px;
+          font-size: 14px;
+          font-family: Helvetica;
+          font-weight: 400;
+          color: #101116;
+          line-height: 1;
+          .fightNo {
+            font-size: 24px;
+            font-family: Helvetica;
+            font-weight: bold;
+            margin-bottom: 8px;
+          }
+          .fightDate {
+            margin-bottom: 15px;
+          }
+          .fightLine {
+            margin-bottom: 8px;
+          }
+        }
+        .type {
+          font-size: 18px;
+          font-weight: bold;
+          margin-right: 20px;
+          .warn {
+            color: #df3559;
+          }
+          .normal {
+            color: #519f6b;
+          }
+        }
+        .airline {
+          width: 120px;
+          margin-right: 20px;
+        }
+        .baggage-track-chart {
+          flex: 1;
+          height: 124px;
+          position: relative;
+          display: flex;
+          flex-direction: row;
+          justify-content: space-between;
+          width: 100%;
+        }
+        .step-line {
+          width: calc(100% - 80px);
+          height: 10px;
+          position: absolute;
+          top: 16px;
+          right: 0;
+          left: 0;
+          margin: auto;
+          display: flex;
+          .step-line-segment {
+            width: calc(100% / 6);
+            height: 100%;
+            background: #afb4bf;
+            &.step-line-active {
+              background: #2d67e3;
+            }
+          }
+        }
+        .step-item {
+          width: 80px;
+          height: 100%;
+          text-align: center;
+          font-size: 14px;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: flex-start;
+          z-index: 1;
+          font-family: Helvetica, "Microsoft Yahei";
+          .step-circle {
+            width: 42px;
+            height: 42px;
+            border-radius: 50%;
+            background: #aaacb2;
+            .step-name {
+              color: #ffffff;
+              font-size: 14px;
+              font-weight: bold;
+            }
+          }
+          .step-info {
+            margin-top: 8px;
+            color: #101116;
+            line-height: 22px;
+            .step-status {
+              &-normal {
+                color: #4ab36f;
+              }
+              &-abnormal {
+                color: #e9af4b;
+              }
+            }
+            .step-time {
+              white-space: pre-line;
+              font-size: 12px;
+              line-height: 20px;
+            }
+          }
+          &.active-item .step-circle {
+            background: #2d67e3;
+          }
+        }
+      }
+      .btns {
+        margin-top: 6px;
+      }
+    }
   }
 }
 </style>

src/views/newTable/index.vue

@@ -242,7 +242,7 @@ export default {
         sourceObjectName: null,
         datasource_id: null
       },
-      datasource_id: 7,
+      datasource_id: 4,
       dataSourceArrs: []
     };
   },
@@ -317,7 +317,7 @@ export default {
     },
   },
   mounted () {
-    // this.getDataSourceId(this.datasource_id)
+    this.getDataSourceId(SERVICE_ID.serTableDataId)
   },
   updated () {
     this.$refs["table"]?.doLayout();
@@ -326,18 +326,7 @@ export default {
     //获取表头数据
     async getColumnData (id) {
       try {
-        const { code, returnData } = await Query({
-          serviceId: SERVICE_ID.getTableColumnId,
-          dataContent: [{
-            "left": "(",
-            "column": "serviceOutPutId",
-            "comparator": "=",
-            "value": `${SERVICE_ID.serTableId}`,
-            "right": ")",
-            "connector": "and"
-          }],
-          event: '0'
-        });
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.getTableColumnId, { serviceOutPutId: SERVICE_ID.serTableId });
         if (code == 0) {
           if (returnData && returnData.length) {
             const titleColumn = returnData.find(
@@ -444,20 +433,7 @@ export default {
     async getQuery (id) {
       try {
         this.loading = true;
-        const { code, returnData, columnset } = await Query({
-          serviceId: this.dataId,
-          page: ++this.page,
-          pageSize: this.pageSize,
-          dataContent: [{
-            "left": "(",
-            "column": "service_id",
-            "comparator": "=",
-            "value": `${id}`,
-            "right": ")",
-            "connector": "and"
-          }],
-          event: '0'
-        });
+        const { code, returnData } = await this.getQueryList(this.dataId, { service_id: id }, ++this.page, this.pageSize);
         if (code == 0) {
           if (returnData.length === 0) {
             this.page--;
@@ -477,6 +453,7 @@ export default {
           this.$message.error("获取表格数据失败");
         }
       } catch (error) {
+        console.log(error)
         this.page--;
         this.loading = false;
       }
@@ -741,10 +718,7 @@ export default {
       }
     },
     async getDataSourceId (id) {
-      const { code, returnData } = await Query({
-        serviceId: id,
-        dataContent: this.dataContent,
-      });
+      const { code, returnData } = await this.getQueryList(id, this.dataContent);
       if (code == 0) {
         this.dataSourceArrs = returnData
       }
@@ -755,6 +729,7 @@ export default {
       this.tableType = "edit";
       this.tableTitle = "编辑算法配置";
       this.form = JSON.parse(JSON.stringify(row));
+      this.form.isActiveTable = row.isActiveTable == '1' ? true : false
     },
 
     successData () {
@@ -773,13 +748,13 @@ export default {
         if (valid) {
           this.form = Object.assign(this.form, this.dataContent)
           if (this.tableType == "add") {
-            const code = await this.getChangeList(this.dataId, this.form, 1)
-            if (code) {
+            const { code } = await this.getChangeList(this.dataId, this.form, 1)
+            if (code == 0) {
               this.successData()
             }
           } else {
-            const code = await this.getChangeList(this.dataId, this.form, 2, 'library_id')
-            if (code) {
+            const { code } = await this.getChangeList(this.dataId, this.form, 2, 'library_id')
+            if (code == 0) {
               this.successData()
             }
           }
@@ -797,8 +772,8 @@ export default {
     },
     //表格-删除-确认
     async tableRemove () {
-      const code = await this.getChangeList(this.dataId, this.tableObj, 3)
-      if (code) {
+      const { code } = await this.getChangeList(this.dataId, this.tableObj, 3)
+      if (code == 0) {
         this.successData()
       }
     },

src/views/systemSettings/views/newMachine/components/table.vue

@@ -274,16 +274,9 @@ export default {
       try {
         const { code, returnData } = await Query({
           serviceId: SERVICE_ID.getTableColumnId,
-          dataContent: [
-            {
-              "left": "(",
-              "column": "serviceOutPutId",
-              "comparator": "=",
-              "value": `${SERVICE_ID.depTableId}`,
-              "right": ")",
-              "connector": ""
-            }
-          ],
+          dataContent: {
+            "serviceOutPutId": `${SERVICE_ID.depTableId}`,
+          },
           event: '0'
         });
         if (code == 0) {
@@ -396,16 +389,11 @@ export default {
           serviceId: 3,
           page: ++this.page,
           pageSize: this.pageSize,
-          dataContent: [
-            {
-              "left": "(",
-              "column": "workId",
-              "comparator": "=",
-              "value": `${id}`,
-              "right": ")",
-              "connector": ""
-            }
-          ],
+          dataContent:
+          {
+            "workId": `${id}`,
+          }
+          ,
           event: '0'
         });
         if (code == 0) {

src/views/systemSettings/views/newMachine/index.vue

@@ -295,7 +295,7 @@ export default {
     //服务列表-保存
     async handleSave () {
       if (this.dataObj.deployNodeID && this.dataType == 'edit') {
-        const code = await this.getChangeList(this.queryId, this.formInline, 2, 'deployNodeID')
+        const { code } = await this.getChangeList(this.queryId, this.formInline, 2, 'deployNodeID')
         if (code) {
           this.$message.success('操作成功')
           this.resetTable()
@@ -305,7 +305,7 @@ export default {
         }
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].deployNodeID) {
         this.formInline.deployNodeID = this.arrs[this.arrs.length - 1].deployNodeID
-        const code = await this.getChangeList(this.queryId, this.formInline, 2, 'deployNodeID')
+        const { code } = await this.getChangeList(this.queryId, this.formInline, 2, 'deployNodeID')
         if (code) {
           this.$message.success('操作成功')
           this.resetTable()
@@ -314,7 +314,7 @@ export default {
           this.$message.success('操作失败')
         }
       } else if (this.dataType == 'add') {
-        const code = await this.getChangeList(this.queryId, this.formInline, 1)
+        const { code } = await this.getChangeList(this.queryId, this.formInline, 1)
         if (code) {
           this.$message.success('操作成功')
           this.resetTable()
@@ -329,7 +329,7 @@ export default {
     },
     async tableRemove () {
       if (this.dataObj.deployNodeID && this.dataType == 'edit') {
-        const code = await this.getChangeList(this.queryId, this.dataObj, 3)
+        const { code } = await this.getChangeList(this.queryId, this.dataObj, 3)
         if (code) {
           this.$message.success('操作成功')
           this.resetTable()
@@ -347,7 +347,7 @@ export default {
         }
         this.flag = true
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].deployNodeID) {
-        const code = await this.getChangeList(this.queryId, this.arrs[this.arrs.length - 1], 3)
+        const { code } = await this.getChangeList(this.queryId, this.arrs[this.arrs.length - 1], 3)
         if (code) {
           this.$message.success('操作成功')
           this.resetTable()

src/views/systemSettings/views/newService/index.vue

@@ -177,9 +177,11 @@
 import Table from '@/views/newTable/index.vue'
 import Dialog from "@/layout/components/Dialog/index.vue"
 import { Query, newData, modifyData, moveData, start, stop } from "@/api/webApi"
+import pf from '@/layout/mixin/publicFunc'
 import * as _ from 'lodash'
 export default {
   name: 'NewService',
+  mixins: [pf],
   components: { Table, Dialog },
   data () {
     return {
@@ -387,9 +389,14 @@ export default {
         this.formInline.serviceID = this.arrs[this.arrs.length - 1].serviceID
         const obj = {}
         obj.Value = this.formInline
-        obj.filter = {
-          serviceID: this.formInline.serviceID
-        }
+        obj.filter = [{
+          "left": "(",
+          "column": `serviceID`,
+          "comparator": "=",
+          "value": `${this.formInline.serviceID}`,
+          "right": ")",
+          "connector": "and"
+        }]
         if (obj.Value.serviceID) {
           delete obj.Value.serviceID
         }
@@ -405,9 +412,9 @@ export default {
     },
     tableRemove () {
       if (this.dataObj.serviceID && this.dataType == 'edit') {
-        const obj = {}
-        obj.filter = this.dataObj
-        this.generalDataReception(3, [obj])
+        // const obj = {}
+        // obj.filter = this.dataObj
+        this.generalDataReception(3, [this.dataObj])
         this.msgContent = {
           service_id: ''
         }
@@ -420,9 +427,9 @@ export default {
         }
         this.flag = true
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].serviceID) {
-        const obj = {}
-        obj.filter = this.arrs[this.arrs.length - 1]
-        this.generalDataReception(3, [obj])
+        // const obj = {}
+        // obj.filter = this.arrs[this.arrs.length - 1]
+        this.generalDataReception(3, [this.arrs[this.arrs.length - 1]])
         this.msgContent = {
           service_id: ''
         }
@@ -490,15 +497,18 @@ export default {
             ? await start(params)
             : await stop(params);
         if (code == 0) {
-          const obj = {}
-          obj.Value = data
-          obj.filter = {
-            serviceID: data.serviceID
-          }
-          if (obj.Value.serviceID) {
-            delete obj.Value.serviceID
-          }
-          this.generalDataReception(2, [obj])
+          this.resetTable()
+          this.getQuery(this.queryId)
+          this.$message.success("操作成功")
+          // const obj = {}
+          // obj.Value = data
+          // obj.filter = {
+          //   serviceID: data.serviceID
+          // }
+          // if (obj.Value.serviceID) {
+          //   delete obj.Value.serviceID
+          // }
+          // this.generalDataReception(2, [obj])
         } else {
           this.$message.error("操作失败");
         }