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

build/index.js

@@ -24,9 +24,9 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
   )
 
   app.listen(port, function () {
-    console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
+    // console.log(chalk.green(`> Preview at  http://localhost:${port}${publicPath}`))
     if (report) {
-      console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
+      // console.log(chalk.green(`> Report at  http://localhost:${port}${publicPath}report.html`))
     }
 
   })

public/config.js

@@ -1,7 +1,7 @@
 window.PLATFROM_CONFIG = {
   baseNewUrl: "http://10.211.67.163:16300", //登录前的http请求地址
   baseUrl: "http://10.211.67.163:16300", // 4A-http请求地址
-  appSecret: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
+  appKeyString: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
   appId: "q7kdjmmaf0kerwpf", //appid
   baseURLCA: "http://10.211.67.163:16300", // 登录后的http请求地址-测试
   baggageMessageURL: "/openApi/query",

public/config_1.js

@@ -1,124 +0,0 @@
-var PLATFROM_CONFIG = {}
-// PLATFROM_CONFIG.baseNewUrl = "http://192.168.3.74:9006"; //登录前的http请求地址
-// PLATFROM_CONFIG.baseUrl = "http://106.14.243.117:9111"; // 4A-http请求地址
-PLATFROM_CONFIG.baseNewUrl = 'http://10.211.67.177:8043' //登录前的http请求地址
-PLATFROM_CONFIG.baseUrl = 'http://10.211.67.177:8043' // 4A-http请求地址
-// PLATFROM_CONFIG.baseUrl = "http://10.211.66.25:8074"; // http请求地址
-PLATFROM_CONFIG.appSecret = '9inu7zpllz1folzsljm498dcpi0lsog1' //appSecret
-PLATFROM_CONFIG.appId = 'q7kdjmmaf0kerwpf' //appid
-// PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:9114";
-// PLATFROM_CONFIG.baseURLCA = "http://106.14.243.117:8093";
-// PLATFROM_CONFIG.baseURLCA = "http://cssc.free.idcfengye.com";
-// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.17:8080";
-// PLATFROM_CONFIG.baseURLCA = "http://192.168.3.243:8093";
-// PLATFROM_CONFIG.baseURLCA = "http://ts.free.idcfengye.com";
-PLATFROM_CONFIG.baseURLCA = "http://192.168.3.74:18064"; // 登录后的http请求地址
-// PLATFROM_CONFIG.baseURLCA = 'http://10.211.67.177:8043' // 登录后的http请求地址
-
-const DATACONTENT_ID = {
-  /***-----登录------***/
-  loginId: 36, //登录-获取权限-id
-
-  /***-----高级查询------***/
-  baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
-  advacedQueryId: 30, //高级查询-数据查询-id
-
-  /***-----账号管理------***/
-  accountTableId: 38, //账号管理-首页-列表
-  accountRoleId: 43, //账号管理-根据id查角色
-  accountDetailsId: 45, //账号管理-根据id查详情
-
-  /***-----角色管理------***/
-  roleTableId: 41, //角色管理-首页-列表
-  roleDetailsId: 48, //角色管理-根据id查详情
-  roleAuthId: 42, //角色管理-根据id查权限
-
-  /***-----权限管理------***/
-  authTreeId: 40, //权限管理-权限树
-
-  /***-----系统设置------***/
-  sysSourceId: 13, //系统设置-数据源-id
-  sysProtoTabId: 1, //系统设置-协议管理-表格-id
-  sysServiceTabId: 2, //系统设置-服务管理-表格-id
-  sysServiceOutTabId: 7, //系统设置-服务管理-编辑-输出-表格-id
-  sysServiceJqTabId: 3, //系统设置-服务管理-编辑-部署机器-表格-id
-  sysQueryTabId: 4, //系统设置-查询模板-表格-id
-  sysQueryEditId: 24, //系统设置-查询模板-编辑-根据id获取服务
-  sysQueryChildTabId: 25, //系统设置-查询模板-列设置-表格-id
-  sysQueryChildEditTabId: 26, //系统设置-查询模板-列设置-表格-编辑-id
-  sysDataTabId: 5, //系统设置-数据结构-表格-id
-  sysDataChildTabId: 9, //系统设置-数据结构-数据项-表格-id
-  sysLogTabId: 12, //系统设置-数据结构-数据项-表格-id
-  sysDataEditId: 30, //系统设置-数据结构-数据项-表格-编辑-id
-  sysServiceXyId: 15, //系统设置-服务管理-新增服务-新增数据来源-id
-  sysServiceEditId: 23, //系统设置-服务管理-编辑服务-根据id获取服务
-  sysServiceTopId: 32, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
-  sysServiceTopTableId: 31, //系统设置-服务管理-服务拓扑-查看日志id
-
-  /***-----进港管理------***/
-  arrivalAirId: 67, //进港管理-机场选择-id
-  arrivalTableId: 38, //进港管理-表格-id
-
-  /***-----离港管理------***/
-  departureAirMainId: 65, //离港管理-机场选择-id
-  departureTableMainId: 66, //离港管理-表格-id
-
-  /***-----离港管理===>中转进港------***/
-  departureAirId: 72, //离港管理-机场选择-id
-  departureAviJoinId: 71, //离港管理-进港承运航司-id
-  departureAviLeaveId: 74, //离港管理-离港承运航司-id
-  departureTableId: 69, //离港管理-表格-id
-
-  /***-----离港管理===>中转离港------***/
-  departureAirLtId: 72, //离港管理-机场选择-id
-  departureAviJoinLtId: 71, //离港管理-进港承运航司-id
-  departureAviLeaveLtId: 74, //离港管理-离港承运航司-id
-  departureTableLtId: 68, //离港管理-表格-id
-
-  /***-----基础数据------***/
-  deployNodeId: 54, //基础数据-节点信息维护-获取二级节点(表格)-id
-  deployNodeThreeId: 64, //基础数据-节点信息维护-获取三级节点-id
-  airlineTableId: 52, //基础数据-航司信息维护-表格-id
-  airportTableId: 57, //基础数据-机场信息维护-表格-id
-  airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
-  bagTableId: 55, //基础数据-特殊行李维护-表格-id
-
-  // 数据统计
-  // inOrOutId: 246,//获取进离岗下拉ID
-  // AirlineId: 247,//获取航线下拉ID
-  // AreaId: 248,//获取大区下拉ID
-  // AirportId: 249,//获取航站下拉ID
-  // TerminalId: 250,//获取航站楼下拉ID
-  // byAreaId: 244,//根据大区统计ID
-  // byOtherId: 243,//获取大区以外统计ID
-  inOrOutId: 52, //获取进离岗下拉ID
-  AirlineId: 53, //获取航线下拉ID
-  AreaId: 54, //获取大区下拉ID
-  AirportId: 55, //获取航站下拉ID
-  TerminalId: 56, //获取航站楼下拉ID
-  byAreaId: 50, //根据大区统计ID
-  byOtherId: 63, //获取大区以外统计ID
-  baggageStatistics: 73, // 获取行李统计
-  nodeStatistics: 252 // 获取节点统计
-}
-
-const SERVICE_ID = {
-  /***-----账号管理------***/
-  accountScId: 17, //账号管理-增删改-id
-  roleScId: 16, //账号管理-角色授权-增删改-id
-
-  /***-----角色管理------***/
-  roleMsgId: 14, //角色管理-增删改-id
-  roleMsgTreeId: 15, //角色管理-权限树-增删改-id
-  roleMsgAuthId: 20, //角色管理-权限树规则-增删改-id
-
-  /***-----权限项管理------***/
-  authScId: 13, //权限项管理-增删改-id
-
-  sysProtoTabId: 1, //系统设置-协议管理-表格-增删改-id
-  sysServiceAddId: 3, //系统设置-服务管理-新增服务-提交-id/服务管理-编辑服务-保存-id
-  sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框-id
-  sysQueryTabId: 5, //系统设置-查询模板-表格-增删改-id
-  sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交-id
-  sysDataTabId: 11 //系统设置-数据结构-数据项-表格-增删改-id
-}

src/api/user.js

@@ -1,24 +0,0 @@
-import request from '@/utils/request'
-
-export function login(data) {
-  return request({
-    url: '/vue-admin-template/user/login',
-    method: 'post',
-    data
-  })
-}
-
-export function getInfo(token) {
-  return request({
-    url: '/vue-admin-template/user/info',
-    method: 'get',
-    params: { token }
-  })
-}
-
-export function logout() {
-  return request({
-    url: '/vue-admin-template/user/logout',
-    method: 'post'
-  })
-}

src/components/Table/index.vue

@@ -337,17 +337,6 @@
                         v-model="tableForm[item.columnName]"
                       ></el-input>
                     </template>
-                    <template v-else-if="item.dataType == 'datetime'">
-                      <el-date-picker
-                        value-format="yyyy-MM-dd HH:mm:ss"
-                        v-model="tableForm[item.columnName]"
-                        :rows="1"
-                        type="datetime"
-                        placeholder="选择日期时间"
-                        @change="inputChangeHandler(item.columnName)"
-                      >
-                      </el-date-picker>
-                    </template>
                     <template v-else>
                       <el-input
                         size="small"
@@ -404,12 +393,7 @@ import { setTableFilters } from "@/utils/table";
 import Dialog from "@/layout/components/Dialog/index.vue";
 import NoData from "@/components/nodata";
 import { translateDataToTreeAllTreeMsg } from "@/utils/validate";
-import {
-  Query,
-  GeneralDataReception,
-  Start,
-  Stop,
-} from "@/api/dataIntegration";
+import { Query, GeneralDataReception, Start, Stop } from "@/api/dataIntegration";
 export default {
   name: "DataTable",
   props: {
@@ -417,10 +401,6 @@ export default {
       type: Boolean,
       default: true,
     },
-    tableup: {
-      type: Boolean,
-      default: false,
-    },
     //接口ID
     dataId: {
       type: [String, Number],
@@ -581,7 +561,7 @@ export default {
     },
   },
   components: { Dialog, NoData },
-  data() {
+  data () {
     return {
       asShow: true,
       loading: false,
@@ -613,7 +593,7 @@ export default {
     };
   },
   computed: {
-    dataTableContentStyle() {
+    dataTableContentStyle () {
       const style = {};
       if (this.minHeight) {
         style["min-height"] = this.minHeight;
@@ -624,30 +604,22 @@ export default {
       return style;
     },
     //设置表头-下拉-箭头样式
-    arrowClass() {
+    arrowClass () {
       return function (prop) {
         let classString = "";
         if (this.colShowFilter === prop) {
           return "arrow-active";
         }
-        if (
-          Object.entries(this.tableDataFilters).find(
-            ([key, arr]) => this.filterValues[prop]
-          )
-        ) {
+        if (Object.entries(this.tableDataFilters).find(([key, arr]) => this.filterValues[prop])) {
           classString += "arrow-blue";
         }
         return classString;
       };
     },
     //设置表头-下拉-选中数据
-    filteredTableData() {
+    filteredTableData () {
       if (this.isTree) {
-        this.tableData = translateDataToTreeAllTreeMsg(
-          this.tableData,
-          "parentID",
-          "companyID"
-        );
+        this.tableData = translateDataToTreeAllTreeMsg(this.tableData, "parentID", "companyID");
       }
       return this.tableData.filter((item) => {
         let flag = true;
@@ -659,35 +631,35 @@ export default {
         return flag;
       });
     },
-    btnAuthAdd() {
+    btnAuthAdd () {
       if (this.roles.includes(this.authAdd)) {
         return true;
       } else {
         return false;
       }
     },
-    btnAuthEdit() {
+    btnAuthEdit () {
       if (this.roles.includes(this.authEdit)) {
         return true;
       } else {
         return false;
       }
     },
-    btnAuthDel() {
+    btnAuthDel () {
       if (this.roles.includes(this.authDel)) {
         return true;
       } else {
         return false;
       }
     },
-    btnAuthWithnodeSet() {
+    btnAuthWithnodeSet () {
       if (this.roles.includes(this.authWithnodeSet)) {
         return true;
       } else {
         return false;
       }
     },
-    btnAuthWithlodSet() {
+    btnAuthWithlodSet () {
       if (this.roles.includes(this.authWithlodSet)) {
         return true;
       } else {
@@ -697,7 +669,7 @@ export default {
   },
   watch: {
     dataContent: {
-      handler(val) {
+      handler (val) {
         if (val) {
           if (val.companyID) {
             this.resetTable();
@@ -718,14 +690,14 @@ export default {
     //   },
     // },
   },
-  mounted() {
+  mounted () {
     this.getQuery();
   },
-  updated() {
+  updated () {
     this.$refs["table"]?.doLayout();
   },
   methods: {
-    load() {
+    load () {
       //
       if (!this.isTree) {
         if (this.noMore || this.loading) {
@@ -734,7 +706,7 @@ export default {
         this.getQuery();
       }
     },
-    resetTable() {
+    resetTable () {
       this.page = 0;
       this.noMore = false;
       this.tableData = [];
@@ -774,13 +746,13 @@ export default {
         });
       }
     },
-    inputChangeHandler(data) {
+    inputChangeHandler (data) {
       if (this.tableForm[data] === "") {
         this.tableForm[data] = null;
       }
     },
     //获取表格数据
-    async getQuery() {
+    async getQuery () {
       try {
         this.loading = true;
         const { code, returnData } = await Query({
@@ -794,9 +766,7 @@ export default {
             this.noMore = true;
             this.loading = false;
           }
-          const titleColumn = returnData.columnSet.find(
-            (item) => item.needShow === 1
-          );
+          const titleColumn = returnData.columnSet.find((item) => item.needShow === 1);
           if (titleColumn) {
             this.rowTitle = titleColumn.columnName;
           }
@@ -815,10 +785,11 @@ export default {
       } catch (error) {
         this.page--;
         this.loading = false;
+
       }
     },
     //表格-增/删/改
-    async generalDataReception(data) {
+    async generalDataReception (data) {
       try {
         data = {
           ...data,
@@ -844,6 +815,7 @@ export default {
           this.tableForm = {};
         }
       } catch (error) {
+
         this.flag = false;
         this.rmFlag = false;
         this.tableObj = {};
@@ -851,18 +823,18 @@ export default {
       }
     },
     // 表格勾选
-    toggleRowSelection(row, isSelected) {
+    toggleRowSelection (row, isSelected) {
       this.$refs["table"].toggleRowSelection(row, isSelected);
     },
     // 表格初始勾选
-    selectTableRows(tableData, selectFlagName) {
+    selectTableRows (tableData, selectFlagName) {
       tableData.forEach((row) => {
         this.$refs["table"].toggleRowSelection(row, !!row[selectFlagName]);
       });
       this.$emit("selectionAll", this.$refs.table.selection);
     },
     //初始化表格
-    initTableData() {
+    initTableData () {
       this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
       //
       // debugger;
@@ -879,9 +851,7 @@ export default {
           // const reqUt = this.getSelectData(item.listqueryTemplateID)
           // reqUts.push(reqUt)
           if (!this.tableOptions[item.columnName]) {
-            this.tableOptions[item.columnName] = await this.getSelectData(
-              item.listqueryTemplateID
-            );
+            this.tableOptions[item.columnName] = await this.getSelectData(item.listqueryTemplateID);
           }
           //
         }
@@ -893,7 +863,7 @@ export default {
       // this.getSelectDataAll(reqUts)
     },
     //获取所有获取弹框-下拉数据-请求状态
-    getSelectDataAll(reqUts) {
+    getSelectDataAll (reqUts) {
       Promise.all(reqUts)
         .then((res) => {
           this.proAll = true;
@@ -915,7 +885,7 @@ export default {
       }
     },
     //重组table-显示名称
-    setTable() {
+    setTable () {
       this.tableArrs.forEach((item) => {
         this.tableOptions[item].forEach((p) => {
           this.tableDataCopy.forEach((msg) => {
@@ -934,7 +904,7 @@ export default {
       this.tableData = this.tableDataCopy;
     },
     //分组
-    tableGroup(tableData) {
+    tableGroup (tableData) {
       const spanArr = [];
       let pos = 0;
       let ifYj = this.tableGroups[0];
@@ -954,14 +924,14 @@ export default {
       this.spanArr = spanArr;
       this.pos = pos;
     },
-    popoverShowHandler(prop) {
+    popoverShowHandler (prop) {
       this.colShowFilter = prop;
     },
-    popoverHideHandler() {
+    popoverHideHandler () {
       this.colShowFilter = "";
     },
     //分组
-    tableSpanMethod({ row, column, rowIndex, columnIndex }) {
+    tableSpanMethod ({ row, column, rowIndex, columnIndex }) {
       if (this.tableGroups.includes(column["property"])) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -972,7 +942,7 @@ export default {
       }
     },
     //合计
-    getSummaries(param) {
+    getSummaries (param) {
       const { columns, data } = param;
       const sums = [];
       columns.forEach((column, index) => {
@@ -996,13 +966,15 @@ export default {
       return sums;
     },
     //弹框-确定
-    handleOk() {
+    handleOk () {
       this.submitClickHandler();
     },
     //滚动
-    tableLoad() {},
+    tableLoad () {
+
+    },
     //表格-新增
-    handleAdd() {
+    handleAdd () {
       // this.flag = true;
       //   this.tableType = "add";
       //   this.tableTitle = "新增";
@@ -1100,11 +1072,16 @@ export default {
           this.tableType = "edit";
           this.tableTitle = "编辑";
         } else {
-          this.$emit("handleEdit", row);
+          this.tableForm = JSON.parse(JSON.stringify(row));
         }
+        this.flag = true;
+        this.tableType = "edit";
+        this.tableTitle = "编辑";
+      } else {
+        this.$emit("handleEdit", row);
       }
     },
-    async queryOriginRow(editId, queryTemplateColumnSetID) {
+    async queryOriginRow (editId, queryTemplateColumnSetID) {
       try {
         const { code, returnData } = await Query({
           id: editId,
@@ -1115,14 +1092,16 @@ export default {
         } else {
           this.$message.error("失败");
         }
-      } catch (error) {}
+      } catch (error) {
+        this.$message.error("失败");
+      }
     },
     //表格-跳转
-    handleHerf(row) {
+    handleHerf (row) {
       alert("跳转");
     },
     // 新增/编辑-确认
-    submitClickHandler() {
+    submitClickHandler () {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
           if (this.tableType == "add") {
@@ -1137,19 +1116,19 @@ export default {
       });
     },
     //表格-删除
-    handleRemove(row) {
+    handleRemove (row) {
       this.rmFlag = true;
       // this.rmTitle = row.className || row.username || row.serviceName || row.queryTemplateName;
       this.rmTitle = row[this.rowTitle];
       this.tableObj = row;
     },
     //表格-删除-确认
-    tableRemove() {
+    tableRemove () {
       this.tableObj.event = 3;
       this.generalDataReception(this.tableObj);
     },
     // 表格-跳转列设置页
-    handleColumnSet(row) {
+    handleColumnSet (row) {
       this.$router.push({
         path: "/systemSettings/queryTemplateChild",
         query: {
@@ -1158,7 +1137,7 @@ export default {
       });
     },
     // 表格-跳转数据项设置页
-    handleItemSet(row) {
+    handleItemSet (row) {
       this.$router.push({
         path: "/systemSettings/datastructureChild",
         query: {
@@ -1167,7 +1146,7 @@ export default {
       });
     },
     // 表格-跳转航站设置页
-    handlelodSet(row) {
+    handlelodSet (row) {
       this.$router.push({
         path: "/BasicsData/airportInfoChild",
         query: {
@@ -1176,7 +1155,7 @@ export default {
       });
     },
     // 表格-节点置页
-    handlenodeSet(row) {
+    handlenodeSet (row) {
       this.$router.push({
         path: "/BasicsData/deployNodeChild",
         query: {
@@ -1185,7 +1164,7 @@ export default {
       });
     },
     // 表格-查看
-    handleLook(row) {
+    handleLook (row) {
       this.$router.push({
         name: "serviceTopology",
         params: {
@@ -1195,21 +1174,21 @@ export default {
       });
     },
     // 表格-启动/停止
-    async stateChangeHandler(row) {
+    async stateChangeHandler (row) {
       const runState = row.runState == "运行" ? 0 : 1;
       const serviceID = row.serviceID;
       // this.changeBtn(runState, serviceID);
       this.changeState(runState, serviceID);
     },
     // 表格-选中行
-    selectHandler(selection, row) {
+    selectHandler (selection, row) {
       this.$emit("selection-change", selection, row);
     },
     // 表格-查询模板预览
-    handlePreview(row) {
+    handlePreview (row) {
       this.$emit("preview", row);
     },
-    async changeBtn(state, id) {
+    async changeBtn (state, id) {
       let res = null;
       // const { code, message } = await GeneralDataReception({
       //   serviceId: 61,
@@ -1232,7 +1211,7 @@ export default {
         this.$message.error(res.message);
       }
     },
-    async changeState(runState, serviceID) {
+    async changeState (runState, serviceID) {
       try {
         const operate = runState ? "start" : "stop";
         const {
@@ -1265,7 +1244,9 @@ export default {
         } else {
           this.$message.error("查询节点失败");
         }
-      } catch (error) {}
+      } catch (error) {
+        this.$message.error("失败");
+      }
     },
   },
 };

src/components/deletepopup/index.vue

@@ -66,5 +66,3 @@ export default {
   },
 };
 </script>
-<style lang="scss">
-</style>

src/components/loginpolicy/index.vue

@@ -185,6 +185,6 @@ export default {
   mounted: function () { },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 @import "./loginpolicy.scss";
 </style>

src/components/navHeader/index.vue

@@ -31,7 +31,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .bf-header {
   width: 100%;
   height: 100%;
@@ -64,4 +64,4 @@ export default {
     align-items: center;
   }
 }
-</style>
+</style>

src/layout/components/Tissuetree/index.vue

@@ -71,7 +71,7 @@ export default {
               部门
             </div>
             <div onClick={()=>this.$router.push({path:'postMenger'})}>岗位</div> <div onClick={()=>this.$router.push({path:'StaffManager'})}>职员</div>
-        
+
           </div>
           <div class="org-per1">
             <div>{data.department}</div>
@@ -93,7 +93,7 @@ export default {
   },
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .tree-content {
   margin-top: 182px;
 }
@@ -105,7 +105,7 @@ export default {
   border-radius: 6px;
 }
 .labelcontent {
- 
+
     position: relative;
 
 }

src/layout/index.vue

@@ -169,7 +169,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/utils/request-4a.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import { getToken, getUserId, getCodeToken } from '@/utils/auth'
 import store from '@/store'
-import MD5 from "blueimp-md5";
 // create an axios instance
 const service = axios.create({
   //baseURL: baseURL, // url = base url + request url
@@ -20,11 +19,11 @@ service.interceptors.request.use(
   config => {
     // config.headers.common["content-type"] = "application/json"
     if (config.istoken) {
-      config.headers['appSecret'] = PLATFROM_CONFIG.appSecret
+      config.headers['appSecret'] = PLATFROM_CONFIG.appKeyString
     }
     if (config.data) {
       config.data['OperatorId'] = getUserId()
-      config.data["token"] = MD5(JSON.stringify(config.data));
+      config.data["token"] = getCodeToken()
     }
     // do something before request is sent
     // config.headers['Content-Type'] = 'text/plain'

src/utils/request-new.js

@@ -2,7 +2,6 @@ import axios from 'axios'
 import { MessageBox, Message } from 'element-ui'
 import { getToken, getUserId, getCodeToken } from '@/utils/auth'
 import store from '@/store'
-import MD5 from "blueimp-md5";
 let isMttoken
 // create an axios instance
 const service = axios.create({
@@ -21,12 +20,12 @@ service.interceptors.request.use(
   config => {
     // config.headers.common["content-type"] = "application/json"
     if (config.istoken) {
-      config.headers['appSecret'] = PLATFROM_CONFIG.appSecret
+      config.headers['appSecret'] = PLATFROM_CONFIG.appKeyString
       isMttoken = config.istoken
     }
     if (config.data) {
       config.data['OperatorId'] = getUserId()
-      config.data["token"] = MD5(JSON.stringify(config.data));
+      config.data["token"] = getCodeToken()
     }
     // do something before request is sent
     // config.headers['Content-Type'] = 'text/plain'

src/utils/table.js

@@ -243,7 +243,7 @@ export function exportToExcel (table, tableName, fileName, headerRowNumber = 1)
     })
     FileSaver.saveAs(new Blob([tableWrite], { type: 'application/octet-stream' }), fileName)
   } catch (error) {
-
+    this.$message.error(error.message);
   }
 }
 

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

@@ -101,7 +101,7 @@ export default {
           that.exceptionlist();
         }
       });
-      // 
+      //
     },
     //删除信息
     handleMove (item) {
@@ -142,7 +142,7 @@ export default {
             this.$message.error(res.message ?? "失败");
           }
         } catch (error) {
-
+          this.$message.error("失败");
         }
         this.EditForm = {};
         this.EditFlag = false;
@@ -164,7 +164,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
 
@@ -196,7 +196,7 @@ export default {
             this.$message.error(res.message ?? "失败");
           }
         } catch (error) {
-
+          this.$message.error("失败");
         }
         this.addFlag = false;
         this.ruleForm = {};
@@ -228,7 +228,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/BasicsData/views/airlineCompany/airlineCompanyInfo.vue

@@ -133,7 +133,7 @@ export default {
             this.$message.error(res.message ?? "失败");
           }
         } catch (error) {
-
+this.$message.error("失败");
         }
       }
     },
@@ -154,7 +154,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
 
@@ -187,7 +187,7 @@ export default {
             this.$message.error(res.message ?? "失败");
           }
         } catch (error) {
-
+          this.$message.error("失败");
         }
         this.closeForm();
       }
@@ -216,7 +216,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

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

@@ -274,7 +274,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     //删除信息

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

@@ -178,7 +178,7 @@ export default {
           this.$message.error(message ?? "获取节点信息数据失败");
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     //节点操作
@@ -195,7 +195,7 @@ export default {
           this.$message.error(message ?? "操作失败");
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     //三级展开获取数据
@@ -225,7 +225,7 @@ export default {
           this.$message.error(message ?? "获取节点信息失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/accountGroupManagement/components/accountHome.vue

@@ -154,7 +154,7 @@ export default {
     //   } else {
     //     obj = this.systemSet
     //   }
-    //   // 
+    //   //
     //   const { PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
     //   this.pwdStruc = PwdStruc
     //   this.pwdLengthBegin = PwdLengthBegin
@@ -182,7 +182,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 新增账号
@@ -200,7 +200,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 获取当前账号信息
@@ -271,7 +271,7 @@ export default {
           this.$message.error(result.$message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     deleteUser (user) {
@@ -327,7 +327,7 @@ export default {
           this.$message.error(result.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
 

src/views/accountManagement/components/accountAuth.vue

@@ -241,7 +241,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/accountManagement/components/accountEdit.vue

@@ -226,7 +226,7 @@ export default {
     } else {
       obj = this.systemSet;
     }
-    // 
+    //
     const { OpenRole, OpenGroup, PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj;
     this.openRole = OpenRole;
     this.openGroup = OpenGroup;
@@ -251,7 +251,7 @@ export default {
           UserId: this.userId,
         });
         if (res.code === 0) {
-          // 
+          //
           const { UserDesc, UserName, GroupList, TacList, AuthList, RoleList, Status } = res.returnData;
           this.accountForm.name = UserName;
           this.accountForm.desc = UserDesc;
@@ -293,7 +293,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     // 获取当前权限树勾选项
@@ -346,7 +346,7 @@ export default {
           this.$message.error(result.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 修改权限规则
@@ -398,7 +398,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 新增账号
@@ -415,7 +415,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/accountManagement/components/accountHome.vue

@@ -205,7 +205,7 @@ export default {
     //   } else {
     //     obj = this.systemSet
     //   }
-    //   // 
+    //   //
     //   const { PwdStruc, PwdLengthBegin, PwdLengthEnd } = obj
     //   this.pwdStruc = PwdStruc
     //   this.pwdLengthBegin = PwdLengthBegin
@@ -304,7 +304,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     // 新增账号
@@ -323,7 +323,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 获取当前账号信息
@@ -396,7 +396,7 @@ export default {
           this.$message.error(result.$message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     deleteUser (user) {
@@ -463,7 +463,7 @@ export default {
           this.$message.error(result.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
 

src/views/advancedQuery/views/advancedHome.vue

@@ -1199,7 +1199,7 @@ export default {
       try {
         const result = await myQuery(DATACONTENT_ID.baggageTypeId)
         this.baggageTypeList = result
-      } catch (error) {}
+      } catch (error) {this.$message.error("失败");}
     },
     // 统计行数
     summaryRow(num) {

src/views/advancedQuery/views/advancedNew.vue

@@ -545,13 +545,13 @@ export default {
       // const bagNo = /^[a-zA-Z]{2}[0-9]{6}$/
       // // 纯字母则为旅客姓名
       // if (az.test(val)) {
-      //   
+      //
       // } else if (azNum.test(val) && top2.test(val)) {
       //   // 字母加数字且前两位为字母则为航班号
-      //   
+      //
       // } else if ((num.test(val) && val.length === 10) || bagNo.test(val)) {
       //   // 纯数字且位数等于10则为行李牌号
-      //   
+      //
       // } else {
       //   this.$message.error('请先输入有效查询信息如航班号、旅客姓名首字母、行李牌号')
       // }
@@ -569,7 +569,7 @@ export default {
           return []
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryTableData () {
@@ -595,7 +595,7 @@ export default {
           this.$message.error('获取表格数据失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
       this.loading = false
     }

src/views/authorityManagement/components/authorityAppAdd.vue

@@ -75,7 +75,7 @@ export default {
   },
   methods: {
     handleRemove (file, fileList) {
-      // 
+      //
     },
     handlePictureCardPreview (file) {
       this.dialogImageUrl = file.url;
@@ -97,7 +97,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     /**

src/views/authorityManagement/components/authorityAppEdit.vue

@@ -129,7 +129,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //应用状态变更
@@ -145,7 +145,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     //应用状态变更
@@ -165,7 +165,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //应用删除
@@ -183,7 +183,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -243,7 +243,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //角色列表
@@ -262,7 +262,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //账号列表
@@ -281,7 +281,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //角色选取
@@ -315,7 +315,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //删除权限
@@ -333,7 +333,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/authorityManagement/components/authorityPowerEdit.vue

@@ -243,7 +243,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     //角色列表
@@ -262,7 +262,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //账号列表
@@ -281,7 +281,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //角色选取
@@ -316,7 +316,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //删除权限
@@ -334,7 +334,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -197,7 +197,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/authorityManagement/components/authorityRoleEdit copy.vue

@@ -248,7 +248,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
   },

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -220,7 +220,7 @@ export default {
           this.loading = false;
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //保存
@@ -385,7 +385,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/baggageManagement/components/arrival/index.vue

@@ -398,7 +398,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     tableRowClassName ({ row, rowIndex }) {

src/views/baggageManagement/components/baggage/index.vue

@@ -649,7 +649,7 @@ export default {
           this.$message.error(message ?? '失败')
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     async queryBasicInfo (queryData = this.queryData) {
@@ -662,7 +662,7 @@ export default {
           this.baggageBasicInfo = baggageBasicInfo[0]
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryDetails (queryData = this.queryData) {
@@ -689,7 +689,7 @@ export default {
         })
         this.initTableData(this.baggageTableData)
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryAirline (queryData = this.queryData) {
@@ -707,7 +707,7 @@ export default {
           this.selectedAirline = ''
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryTrack () {
@@ -733,7 +733,7 @@ export default {
           }
         })
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryMessage (queryData = this.queryData) {
@@ -754,7 +754,7 @@ export default {
         }, [])
         this.messageList = this._.sortBy(messageList, 'ssid')
       } catch (error) {
-
+        this.$message.error("失败");
       }
     }
   }

src/views/baggageManagement/components/container/index.vue

@@ -391,7 +391,7 @@ export default {
         const result = await myQuery(DATACONTENT_ID.containerHistory, ...dataContent)
         this.containerHistory = result
         this.msg = '容器历史默认显示最近' + this.containerHistory[0].k + '条历史，如果需要可联系管理员进行配置'
-      } catch (error) {}
+      } catch (error) {this.$message.error("失败");}
       this.treeLoading = false
     },
     async queryBaggageList(dataContent) {
@@ -401,7 +401,7 @@ export default {
         const result = await myQuery(DATACONTENT_ID.containerBaggage, ...dataContent)
         this.tableData = result
         setTableFilters(this.tableData, this.tableDataFilters)
-      } catch (error) {}
+      } catch (error) {this.$message.error("失败");}
       this.tableLoading = false
     }
   }

src/views/baggageManagement/components/departure/index.vue

@@ -350,7 +350,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     tableRowClassName ({ row, rowIndex }) {

src/views/baggageManagement/components/departureC/index.vue

@@ -375,7 +375,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     tableRowClassName ({ row, rowIndex }) {

src/views/baggageManagement/components/flight/index.vue

@@ -750,7 +750,7 @@ export default {
           this.selectedAirline = this.airlineList[0].value
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     async queryAll (dataContent) {
@@ -785,7 +785,7 @@ export default {
         })
         setTableFilters(this.flightBaggageTableData, this.flightBaggageTableFilters)
       } catch (error) {
-
+        this.$message.error("失败");
       }
       this.fullscreenLoading = false
     }

src/views/baggageManagement/components/transferArrival/index.vue

@@ -463,7 +463,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     // 选择航司
@@ -479,7 +479,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 选择航司
@@ -495,7 +495,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 获取表单下拉框数据

src/views/baggageManagement/components/transferDeparture/index.vue

@@ -441,7 +441,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     // 选择航司
@@ -457,7 +457,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 选择航司
@@ -473,7 +473,7 @@ export default {
           this.$message.error(res.message);
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 获取表单下拉框数据

src/views/login/index.vue

@@ -125,7 +125,7 @@ export default {
     try {
       const res = await gettoken({
         'appid': PLATFROM_CONFIG.appId,
-        'appSecret': PLATFROM_CONFIG.appSecret
+        'appSecret': PLATFROM_CONFIG.appKeyString
       })
       if (res.code == 0 && res.data) {
         setCodeToken(res.data.appToken);
@@ -137,7 +137,7 @@ export default {
         this.$message.error(res.message);
       }
     } catch (error) {
-
+      this.$message.error(error.message);
     }
   },
   methods: {

src/views/queryTemplate/index.vue

@@ -121,7 +121,7 @@ export default {
           that.exceptionlist();
         }
       });
-      // 
+      //
     },
     //删除信息
     handleMove (item) {
@@ -189,7 +189,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
 
@@ -223,7 +223,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/statisticsCharts/components/commonBarStatisticsCharts.vue

@@ -358,7 +358,7 @@ export default {
           this.$message.error(message || '失败')
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     setChartHeight () {

src/views/statisticsCharts/components/commonPieStatisticsCharts.vue

@@ -365,7 +365,7 @@ export default {
           this.$message.error(message || '失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     setChartHeight () {

src/views/statisticsCharts/components/statisticsHeader.vue

@@ -368,7 +368,7 @@ export default {
           this.$message.error(message)
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     }
   }

src/views/statisticsCharts/views/nodeStatisticsCharts.vue

@@ -378,7 +378,7 @@ export default {
           this.$message.error(message ?? '失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryChartsData (data) {
@@ -464,7 +464,7 @@ export default {
           this.$message.error(res.message || '失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     setChartHeight () {
@@ -637,7 +637,7 @@ export default {
           this.$message.error(res.message || '失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     settingHandler () {

src/views/systemSettings/views/machineManagement/machineHome.vue

@@ -158,7 +158,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 新增-弹框
@@ -212,7 +212,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async addSubmit () {
@@ -229,7 +229,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async editSubmit () {
@@ -246,7 +246,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

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

@@ -151,7 +151,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 新增-弹框
@@ -205,7 +205,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async addSubmit () {
@@ -222,7 +222,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async editSubmit () {
@@ -239,7 +239,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

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

@@ -177,7 +177,7 @@ export default {
           that.exceptionlist();
         }
       });
-      // 
+      //
     },
     // 删除信息
     handleMove (item) {
@@ -228,7 +228,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
 
@@ -274,7 +274,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     // 查询模板预览

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

@@ -326,7 +326,7 @@ export default {
         if (bracketsDifference !== 0) {
           throw new Error('左右括号不匹配！')
         }
-        // 
+        //
         this.queryString = queryString
         this.dialogHide()
       } catch (error) {
@@ -381,7 +381,7 @@ export default {
           return []
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     async queryTableData () {
@@ -407,7 +407,7 @@ export default {
           this.$message.error('获取表格数据失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
       this.loading = false
     }

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

@@ -109,7 +109,7 @@ export default {
           this.$message.error(res.message ?? '失败')
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     async getDataSourceList () {

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

@@ -118,7 +118,7 @@ export default {
           this.$message.error(res.message ?? '失败')
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async queryQueryTemplateByID (queryTemplateID) {

src/views/systemSettings/views/serviceManagement/mixins/operate.js

@@ -40,7 +40,7 @@ export default {
           this.$message.error(result.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error(error.message);
       }
     },
     async updateServiceNode (event, deployObject) {
@@ -68,7 +68,7 @@ export default {
           return Promise.reject(result.message);
         }
       } catch (error) {
-
+        this.$message.error(error.message);
       }
     },
     async updateServiceSource (operate, sourceDataID) {
@@ -93,7 +93,7 @@ export default {
           return Promise.reject(result.message);
         }
       } catch (error) {
-
+        this.$message.error(error.message);
       }
     },
     async updateServiceOutput (operate, outputTarget) {
@@ -126,7 +126,7 @@ export default {
           return Promise.reject(result.message);
         }
       } catch (error) {
-
+        this.$message.error(error.message);
       }
     },
   },

src/views/systemSettings/views/serviceManagement/serviceEdi2.vue

@@ -378,7 +378,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/systemSettings/views/serviceManagement/serviceEdit.vue

@@ -563,7 +563,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

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

@@ -221,7 +221,7 @@ export default {
           return []
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     },
     async createService () {
@@ -239,7 +239,7 @@ export default {
           this.$message.error(res.message ?? '失败')
         }
       } catch (error) {
-
+this.$message.error("失败");
       }
     }
   }

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

@@ -310,7 +310,7 @@ export default {
           return [];
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async createService () {
@@ -334,7 +334,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async formService () {
@@ -358,7 +358,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
   },

src/views/systemSettings/views/sourceDataItemManagement/sourceDataItemEdit.vue

@@ -302,7 +302,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     //获取数据项列表
@@ -435,7 +435,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
       this.flag = false;
     },
@@ -497,7 +497,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
 
     },

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

@@ -152,7 +152,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 新增-跳转
@@ -190,7 +190,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 删除-弹框
@@ -214,7 +214,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 重置

src/views/systemSettings/views/targetDataManagement/targetDataEdit.vue

@@ -295,7 +295,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     async getDataList () {
@@ -427,7 +427,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
       this.flag = false;
     },
@@ -486,7 +486,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
 
     },

src/views/systemSettings/views/targetDataManagement/targetDataHome.vue

@@ -158,7 +158,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     showAdd () {
@@ -191,7 +191,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 删除-弹框
@@ -215,7 +215,7 @@ export default {
           this.$message.error(res.message ?? "失败");
         }
       } catch (error) {
-
+        this.$message.error("失败");
       }
     },
     // 重置

src/views/systemSettings/views/warningSet/warningSet.vue

@@ -10,7 +10,7 @@
 <template>
   <div class="airportInfo">
     <!--搜索-->
-    <!-- <div class="nodeLnformation_header">
+    <div class="nodeLnformation_header">
       <Search
         title="报警预警设置"
         @getSearchData="getSearchData"
@@ -52,28 +52,7 @@
           </div>
         </el-col>
       </el-row>
-    </div> -->
-    <div class="wrap">
-      <DataTable
-        :data-id="dataId"
-        :rows="12"
-        labelWidth="100px"
-        :minHeight="70"
-        width="800px"
-        :isStatuser="true"
-        :isAuth="true"
-        authAdd="ss_aim_add"
-        authEdit="ss_aim_cardEdit"
-        authDel="ss_aim_cardDelete"
-        tableHeight="660"
-        :tableup="true"
-      >
-        <template v-slot:header>
-          <div class="status flex-wrap">
-            <div class="manageTitle">报警预警设置</div>
-          </div>
-        </template>
-      </DataTable>
+      <!-- <img v-if="!warningArr.length" src="../../../assets/logo/nodata.png" /> -->
     </div>
     <!--新增/编辑-->
     <Dialog :width="width" :flag="flag">
@@ -252,10 +231,9 @@ import { getQuery } from "@/api/flight";
 import DataTable from "@/components/Table";
 import { Query, GeneralDataReception } from "@/api/dataIntegration";
 export default {
-  components: { Search, Dialog, DataTable },
+  components: { Search, Dialog },
   data() {
     return {
-      dataId: DATACONTENT_ID.sysServiceWarningId,
       flag: false,
       EditDialogVisible: false,
       name: "",
@@ -338,7 +316,7 @@ export default {
     };
   },
   created() {
-    // this.getWarningList();
+    this.getWarningList();
     // this.getAirlines();
     // this.getAirlist();
   },
@@ -582,7 +560,9 @@ export default {
         } else {
           this.$message.error(res.message);
         }
-      } catch (error) {}
+      } catch (error) {
+        this.$message.error("失败");
+      }
     },
   },
 };