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

public/demo.js

@@ -1,12 +1,12 @@
 /* url配置 */
 const PLATFROM_CONFIG = {
-  baseNewUrl: "http://120.26.64.82:8093/", //登录前的http请求地址
-  baseUrl: "http://120.26.64.82:8095/", // 4A-http请求地址
-  appKeyString: "9inu7zpllz1folzsljm498dcpi0lsog1", //appSecret
-  appId: "q7kdjmmaf0kerwpf", //appid
-  baseURLCA: "http://10.211.67.163:16300", // 登录后的http请求地址-测试
-  baggageMessageURL: "/openApi/query",
-};
+  baseNewUrl: 'http://120.26.64.82:8093/', //登录前的http请求地址
+  baseUrl: 'http://120.26.64.82:8095/', // 4A-http请求地址
+  appKeyString: '9inu7zpllz1folzsljm498dcpi0lsog1', //appSecret
+  appId: 'q7kdjmmaf0kerwpf', //appid
+  baseURLCA: 'http://10.211.67.163:16300', // 登录后的http请求地址-测试
+  baggageMessageURL: '/openApi/query',
+}
 
 /* 轮询间隔 */
 const LOOP_INTERVAL = {
@@ -17,7 +17,7 @@ const LOOP_INTERVAL = {
   baggageTrack: 5 * 1000, // 行李跟踪节点信息
   baggageDetails: 5 * 1000, // 行李详情表格
   baggageMessage: 15 * 1000, // 行李原始报文
-};
+}
 
 const DATACONTENT_ID = {
   /***-----登录------***/
@@ -30,6 +30,16 @@ const DATACONTENT_ID = {
   /***-----应用管理------***/
   appTableId: 39, //应用管理
 
+  /***-----数据查询------***/
+  flightTabId: 1803439, //数据查询-航班-表格-id
+  waybillTabId: 1803441, //数据查询-运单-表格-id
+  goodsTabId: 1803440, //数据查询-货物-表格-id
+
+  /***-----高级查询------***/
+  baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id
+  advancedQueryId: 30, //高级查询-数据查询-id
+  advancedQueryNew: 93, //高级查询-数据查询-id
+
   /***-----账号管理------***/
   accountTableId: 78, //账号管理-首页-列表
   accountRoleId: 43, //账号管理-根据id查角色
@@ -74,7 +84,7 @@ const DATACONTENT_ID = {
   sysQueryChildTabId: 25, //系统设置-查询模板-列设置-表格-id
   sysQueryChildEditTabId: 26, //系统设置-查询模板-列设置-表格-编辑-id
   messageQueryTabId: 1803442, //系统设置-消息查询-表格-id
-  
+
   dataSourceOptions: 13, //系统设置-数据源下拉
   serviceOptions: 14, //系统设置-服务下拉
   protocolOptions: 15, //系统设置-协议下拉
@@ -90,30 +100,140 @@ const DATACONTENT_ID = {
   sysServiceDetail: 23, //系统设置-服务管理-编辑服务-根据id获取服务详情
   sysServiceTopologyTable: 31, //系统设置-服务管理-服务拓扑-查看日志
   sysServiceTopology: 32, //系统设置-服务管理-服务拓扑-根据id获取拓扑图
+  sysDataEditId: 57, //系统设置-数据结构-数据项-表格-编辑-id
+  sysServiceNodeListId: 89,
+  sysServiceaddId: 8013, //新增预警报警场景
+  sysServiceStrategyaddId: 8014, //新增预警报警策略
+  /***-----进港管理------***/
+  arrivalAirId: 67, //进港管理-机场选择
+  arrivalTableId: 38, //进港管理-表格
 
-  /***-----数据查询------***/
-  flightTabId: 1803439, //数据查询-航班-表格-id
-  waybillTabId: 1803441, //数据查询-运单-表格-id
-  goodsTabId: 1803440, //数据查询-货物-表格-id
-};
+  /***-----离港管理------***/
+  departureAirMainId: 65, //离港管理-机场选择
+  departureTableMainId: 66, //离港管理-表格
+  departureWarningId: 18040, //离港管理-报警策略
+
+  /***-----中转进港------***/
+  departureAirId: 72, // 中转进港-机场选择
+  departureAviJoinId: 71, // 中转进港-进港承运航司
+  departureAviLeaveId: 74, // 中转进港-离港承运航司
+  departureTableId: 69, // 中转进港-表格
+
+  /***-----中转离港------***/
+  departureAirLtId: 72, // 中转离港-机场选择
+  departureAviJoinLtId: 71, // 中转离港-进港承运航司
+  departureAviLeaveLtId: 74, // 中转离港-离港承运航司
+  departureTableLtId: 68, // 中转离港-表格
+
+  /***-----航班视图------***/
+  flightAirline: 1141, // 航班-航段
+  flightInfo: 1142, // 航班-基础信息
+  flightContainer: 41, // 航班-容器
+  flightBaggage: 1144, // 航班-行李列表
+  abnormalBaggageInfo: 1145,
+
+  /***-----行李视图------***/
+  baggageBasicInfo: 255, // 行李-基础信息
+  baggageAirline: 18009, // 行李-航段
+  baggageTrack: 18010, // 行李-追踪节点
+  baggageDetails: 44, // 行李-详情列表
+  baggageMessage: 3066, // 行李-原始报文
+
+  /***-----容器视图------***/
+  containerHistory: 18026,
+  containerBaggage: 18027,
+
+  /***-----统计分析------***/
+  stOrderId: 18012,
+  stOrderChartId: 18013,
+  stCalId: 18014,
+  stFigntsId: 18015,
+  stSpeedId: 18016,
+  stBaggageId: 18017,
+  stMapId: 18018,
+  stCountryId: 18019,
+  stTerminalId: 18020,
+  stBrsId: 1803429,
+
+  // 数据统计
+  airlineOptions: 1806, // 航线下拉
+  twoCharacterOptions: 1803426, // 二字码下拉
+  termSeleid: 1156, //航站选择下拉
+  areaOptions: 1807, // 大区/基地分公司下拉
+  AirportId: 1808, // 航站下拉
+  TerminalId: 1809, // 航站楼下拉
+  byOther: 1810, // 大区/分公司以外航班统计（全部）
+  byArea: 1811, // 根据大区/分公司航班统计（全部）
+  withBaggageByOther: 1812, // 大区/分公司以外航班统计（有行李）
+  withBaggageByArea: 1814, // 根据大区/分公司航班统计（有行李）
+  baggageByOther: 1815, // 行李统计（全部）
+  baggageByArea: 1816, // 行李统计-分公司（全部）
+  notDelByOther: 1817, // 行李统计（不包含DEL）
+  notDelByArea: 1818, // 行李统计-分公司（不包含DEL）
+  baggagePassengerByOther: 1819, // 行李旅客统计
+  baggagePassengerByArea: 1820, // 行李旅客统计-分公司
+  specialBaggageByOther: 1821, // 特殊行李统计
+  specialBaggageByArea: 1822, // 特殊行李统计-分公司
+  abnormalBaggageByOther: 1823, // 异常行李统计
+  abnormalBaggageByArea: 1824, // 异常行李统计-分公司
+  complaintBaggageByOther: 1825, // 投诉行李统计
+  complaintBaggageByArea: 1826, // 投诉行李统计-分公司
+  compensationBaggageByOther: 1827, // 赔偿行李统计
+  compensationBaggageByArea: 1828, // 赔偿行李统计-分公司
+  compensationByOther: 1829, // 赔偿金额统计
+  compensationByArea: 1830, // 赔偿金额统计-分公司
+  baggageAverageByOther: 1831, // 平均行李统计
+  baggageAverageByArea: 1832, // 平均行李统计-分公司
+  specialBaggageClassificationByOther: 1193, // 特殊行李分类统计
+  specialBaggageClassificationByArea: 1194, // 特殊行李分类统计-分公司
+  flightClassificationByOther: 1195, // 航班分类统计
+  flightClassificationByArea: 1196, // 航班分类统计-分公司
+  compensationClassificationByOther: 1197, // 赔偿分类统计
+  compensationClassificationByArea: 1198, // 赔偿分类统计-分公司
+  passengerNormalClassificationByOther: 1199, // 旅客分类常客统计
+  passengerNormalClassificationByArea: 1200, // 旅客分类常客统计-分公司
+  passengerImportantClassificationByOther: 1201, // 旅客分类要客统计
+  passengerImportantClassificationByArea: 1202, // 旅客分类要客统计-分公司
+  abnormalBaggageClassificationByOther: 1205, // 异常行李分类统计
+  abnormalBaggageClassificationByArea: 1206, // 异常行李分类统计-分公司
+  nodeRange: 1801, // 节点查询范围
+  nodeAirline: 1802, // 节点航线下拉
+  nodeAirport: 1803, // 节点航站下拉
+  nodeAll: 1804, // 节点统计雷达图-全部
+  nodeIn: 1804, // 节点统计雷达图-进港
+  nodeOut: 1804, // 节点统计雷达图-离港
+  nodeExportAirline: 1805, // 节点统计导出-航线
+  nodeExportAirport: 1805, // 节点统计导出-航站
+  nodeAxisDesc: 90, // 节点统计指示器名称解释
+}
 
 const SERVICE_ID = {
-  sysQueryTabId: 5, //系统设置-查询模板-表格-增删改
-  /***-----权限项管理------***/
-  authScId: 13, //权限项管理-增删改
-  /***-----应用管理------***/
-  appScId: 12, //应用管理-增删改
   /***-----账号管理------***/
   accountScId: 17, //账号管理-增删改
   roleScId: 16, //账号管理-角色授权-增删改
+
+  /***-----账号组管理------***/
+  accountGroupScId: 8015, //账号管理-增删改
+
   /***-----角色管理------***/
   roleMsgId: 14, //角色管理-增删改
   roleMsgTreeId: 15, //角色管理-权限树-增删改
   roleMsgAuthId: 20, //角色管理-权限树规则-增删改
-  /***-----账号组管理------***/
-  accountGroupScId: 8015, //账号管理-增删改
 
   /***-----系统设置------***/
+  sysProtoTabId: 1, //系统设置-协议管理-表格-增删改
   sysServiceEdit: 3, //系统设置-服务管理-新增服务-提交/编辑服务-保存
+  sysServiceEditBoxId: 4, //系统设置-服务管理-编辑服务-部署机器-多选框
+  sysQueryTabId: 5, //系统设置-查询模板-表格-增删改
+  sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交
-};
+
+  /***-----应用管理------***/
+  appScId: 12, //应用管理-增删改
+
+  /***-----权限项管理------***/
+  authScId: 13, //权限项管理-增删改
+
+  /***-----离港管理------***/
+  departureScId: 8011, //发送报警预警日志信息
+}

src/router/routes/routes-file-four.ts

@@ -8,13 +8,13 @@ const HomeRoutes = {
   //using el svg icon, the elSvgIcon first when at the same time using elSvgIcon and icon
   meta: { title: '系统配置', elSvgIcon: 'Fold', breadcrumb: false },
   children: [
-    // {
-    //   path: "/systemSettings/securityPolicy",
-    //   name: "SecurityPolicy",
-    //   meta: { title: "安全策略", elSvgIcon: "Fold", icon: "table" },
-    //   component: () =>
-    //     import("@/views/systemSettings/securityPolicy/index.vue"),
-    // },
+    {
+      path: "/systemSettings/securityPolicy",
+      name: "SecurityPolicy",
+      meta: { title: "登录策略", elSvgIcon: "Fold", icon: "table" },
+      component: () =>
+        import("@/views/systemSettings/securityPolicy/index.vue"),
+    },
     {
       path: '/systemSettings/securityPolicyedit',
       name: 'SecurityPolicyedit',
@@ -153,14 +153,14 @@ const HomeRoutes = {
       path: '/systemSettings/sourceserviceEdit',
       name: 'SourceserviceEdit',
       hidden: true,
-      meta: { title: '编辑源数据管理', elSvgIcon: 'Fold', icon: 'table' },
+      meta: { title: '编辑数据源管理', elSvgIcon: 'Fold', icon: 'table' },
       component: () =>
         import('@/views/systemSettings/sourceserviceEdit/index.vue'),
     },
     {
       path: '/systemSettings/sourceTube',
       name: 'SourceTube',
-      meta: { title: '源数据管理', elSvgIcon: 'Fold', icon: 'table' },
+      meta: { title: '数据源管理', elSvgIcon: 'Fold', icon: 'table' },
       component: () => import('@/views/systemSettings/sourceTube/index.vue'),
     },
     {

src/theme/index.scss

@@ -25,7 +25,8 @@
   }
 }
 .el-radio__input.is-checked .el-radio__inner,
-.el-checkbox__input.is-checked .el-checkbox__inner {
+.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
   background: #ac014d;
   border-color: #ac014d;
 }

src/views/dashboard/index.vue

@@ -493,6 +493,11 @@ const showDatePicker = () =>{
         box-sizing: border-box;
         display: flex;
         flex-direction: column;
+        background-image: url("../../assets/home/pic_border.png");
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+        background-position: center center;
+        box-sizing: border-box;
         &-top{
           width: 100%;
           height: 45px;

src/views/systemSettings/queryTemplate/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          btnGroupWidth=" 300px"
+          :btnGroupWidth="width"
           :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
@@ -37,6 +37,7 @@ import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/webApi";
 import { ElMessage } from "element-plus";
+const width = ref('200px')
 const router = useRouter();
 const dataId = ref<String>("4"); //请求id
 const page = ref<number>(0); //分页参数

src/views/userManagement/role/auth.vue

@@ -75,8 +75,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, onBeforeMount, watch } from "vue";
-import { EditRole } from "@/api/apiAuthority";
+import { ref, onBeforeMount, watch } from "vue";
 import { Query, GeneralDataReception } from "@/api/dataIntegration";
 import { translateDataToTreeAll } from "@/utils/validate";
 import { ElMessage, ElTree } from "element-plus";
@@ -98,31 +97,34 @@ const form = ref({
   edit_row_condition: "",
   edit_col_condition: "",
 });
+const maxReq = ref(20);
+const proAll = ref<any>([]);
+const proNum = ref(0);
 const checkObj = ref<any>(null);
 const data = ref<any>([]);
 const newData = ref<any>([]);
 const checkData = ref<any>([]);
-const checkKeys = ref<any>([]);
+const checkKeys = ref<any>([-1]);
+const boxData = ref<any>([]);
 const treeRef = ref<InstanceType<typeof ElTree>>();
 onBeforeMount(() => {
   roleDetails();
   getTree();
-  roleAuths();
 });
 
 watch(
   () => form,
   (newValue) => {
     newData.value.forEach((item) => {
+      if (item.children) {
+        delete item.children;
+      }
       if (item.auth_id == checkObj.value.auth_id) {
         item = Object.assign(item, newValue.value);
-        checkData.value.push(item);
-        const datas = _.unionBy(checkData.value, "auth_id");
-        checkData.value = datas;
       }
     });
     checkKeys.value = [checkObj.value.auth_id];
-    data.value = [tree.setTree(newData.value)];
+    toTree();
   },
   { deep: true }
 );
@@ -142,11 +144,64 @@ const roleDetails = async () => {
   } catch (error) {}
 };
 
+const toTree = () => {
+  data.value = [];
+  const chks = treeRef.value!.getCheckedNodes(false, true);
+  const arr = translateDataToTreeAll(newData.value, "up_auth_id", "auth_id");
+  const items = {
+    auth_id: -1,
+    auth_name: "所有权限",
+    auth_status: 0,
+    up_auth_id: -2,
+    auth_type: 0,
+    children: arr,
+    disabled: true,
+  };
+  data.value = [items];
+  if (chks && chks.length) {
+    checkBox(chks, newData.value);
+  }
+};
+
 //权限树
 const getTree = async () => {
-  const res = await tree.getTree();
-  newData.value = await tree.newData.value;
-  data.value = res.value;
+  try {
+    const { returnData, code } = await Query({
+      id: DATACONTENT_ID.authTreeNewId,
+      dataContent: [sessionStorage.getItem("User_Id")],
+    });
+    if (code == 0 && returnData.listValues) {
+      newData.value = _.cloneDeep(returnData.listValues);
+      toTree();
+      roleAuths();
+    } else {
+    }
+  } catch (error) {}
+  // const res = await tree.getTree();
+  // newData.value = await tree.newData.value;
+  // data.value = res.value;
+};
+
+const checkBox = (arr, all) => {
+  const checks: any = [];
+  const nots = _.cloneDeep(arr);
+  const caps = _.cloneDeep(all);
+  arr.forEach((item) => {
+    checks.push(item.auth_id);
+  });
+  const res = [...caps, ...nots].filter(
+    (item) =>
+      !(
+        caps.some((p) => item.auth_id == p.auth_id) &&
+        nots.some((c) => item.auth_id == c.auth_id)
+      )
+  );
+  treeRef.value!.setCheckedKeys(checks);
+  setTimeout(() => {
+    res.forEach((item) => {
+      treeRef.value!.setChecked(item.auth_id, false, false);
+    });
+  }, 0);
 };
 
 //权限详情
@@ -157,11 +212,8 @@ const roleAuths = async () => {
       dataContent: [role_id],
     });
     if (code == 0 && returnData.listValues) {
-      const datas: any = [];
-      returnData.listValues.forEach((item) => {
-        datas.push(item.auth_id);
-      });
-      treeRef.value!.setCheckedKeys(datas, false);
+      boxData.value.push(returnData.listValues);
+      checkBox(returnData.listValues, newData.value);
     } else {
       ElMessage.error(message);
     }
@@ -170,6 +222,9 @@ const roleAuths = async () => {
 
 const handleNodeClick = (data) => {
   checkObj.value = data;
+  checkData.value.push(_.cloneDeep(data));
+  const datas = _.unionBy(checkData.value, "auth_id");
+  checkData.value = datas;
   const checkNode = checkData.value.filter(
     (item) => item.auth_id == data.auth_id
   );
@@ -192,7 +247,124 @@ const clearFormData = () => {
 
 const currentChange = () => {
   const datas = treeRef.value!.getCheckedNodes(false, true);
-  console.log(datas);
+  datas.forEach((item, index) => {
+    if (item.auth_id == -1) {
+      datas.splice(index, 1);
+    }
+  });
+  boxData.value.push(datas);
+  const data1 = boxData.value[boxData.value.length - 1]; //最后一条数据
+  const data2 = boxData.value[boxData.value.length - 2]; //倒数第二条数据
+  if (data1.length > data2.length) {
+    checksBoxTs(data1, data2, "add");
+  } else {
+    checksBoxTs(data2, data1, "del");
+  }
+};
+
+const checksBoxTs = async (datas, arr, type) => {
+  const res = [...datas, ...arr].filter(
+    (item) =>
+      !(
+        datas.some((p) => item.auth_id == p.auth_id) &&
+        arr.some((c) => item.auth_id == c.auth_id)
+      )
+  );
+  const [msg1, msg2] = [<any>[], <any>[]];
+  if (res && res.length) {
+    for (let i = 0; i < res.length; i++) {
+      delete res[i].children;
+      let obj = <any>{
+        auth_id: res[i].auth_id || res[i].AuthId,
+        role_id: role_id,
+      };
+      let authObj = res[i].AuthList
+        ? Object.assign(_.cloneDeep(obj), res[i].AuthList)
+        : Object.assign(_.cloneDeep(obj), res[i]);
+      if (type == "add") {
+        obj.event = 1;
+        authObj.event = 1;
+        msg1.push(obj);
+        msg2.push(authObj);
+      } else {
+        obj.event = 3;
+        authObj.event = 3;
+        msg1.push(obj);
+        msg2.push(authObj);
+      }
+    }
+    GeneralDataReception({
+      serviceId: SERVICE_ID.roleMsgTreeId,
+      dataContent: JSON.stringify(msg1),
+    }).then((result) => {
+      if (result.code == 0) {
+        if (type == "add") {
+          ElMessage.success("操作权限成功");
+        } else {
+          ElMessage.success("操作权限成功");
+        }
+      } else {
+        if (type == "add") {
+          ElMessage.error("操作权限失败");
+        } else {
+          ElMessage.error("操作权限失败");
+        }
+      }
+    });
+    if (msg2.length > maxReq.value) {
+      foxFunc(msg2);
+    } else {
+      GeneralDataReception({
+        serviceId: SERVICE_ID.roleMsgAuthId,
+        dataContent: JSON.stringify(msg2),
+      }).then((result) => {
+        if (result.code == 0) {
+          if (type == "add") {
+            ElMessage.success("操作规则成功");
+          } else {
+            ElMessage.success("操作规则成功");
+          }
+        } else {
+          if (type == "add") {
+            ElMessage.error("操作规则失败");
+          } else {
+            ElMessage.error("操作规则失败");
+          }
+        }
+      });
+    }
+  } else {
+    // this.$message.error('未选中数据')
+  }
+};
+
+const foxFunc = async (arr?: Array<any>) => {
+  if (proAll.value.length == 0) {
+    proAll.value = _.cloneDeep(arr);
+  }
+  const limit = _.chunk(proAll.value, maxReq.value);
+  const reqUts = [];
+  limit.forEach((item, index) => {
+    const req = GeneralDataReception({
+      serviceId: SERVICE_ID.roleMsgAuthId,
+      dataContent: JSON.stringify(limit[index]),
+    });
+    reqUts.push(req);
+  });
+  const result = Promise.all(reqUts);
+  const resultLen = await result;
+  if (limit.length == resultLen.length) {
+    proAll.value = [];
+    proNum.value = 0;
+    ElMessage.success("操作规则成功");
+  } else {
+    proNum.value += 1;
+    if (proNum.value == 4) {
+      ElMessage.success("网络错误，请稍后重试");
+    } else {
+      foxFunc();
+    }
+  }
 };
 
 const defaultProps = {