Merge remote-tracking branch 'origin/develop_cxy' into develop

9ee703b8 · xinglei · 9efc4bde · c9d12f72 · 9ee703b8 · 9ee703b8
Commit 9ee703b8 authored Jul 18, 2023 by xinglei
19 changed files
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
+{
+    "editor.fontSize": 16
+}
\ No newline at end of file
--- a/packages/graphmod-assets/src/index.js
+++ b/packages/graphmod-assets/src/index.js
@@ -124,211 +124,211 @@ const common = {
  upload: require('./../assets/common/upload.png'),
  tiaoban: require('./../assets/common/tiaoban.png'),
  rightHeader: require('./../assets/common/rightHeader.png'),
-  sousuo: require('./../assets/command/sousuo.png'),
-  shuaxin: require('./../assets/command/shuaxin.png'),
+  // sousuo: require('./../assets/command/sousuo.png'),
+  // shuaxin: require('./../assets/command/shuaxin.png'),
  refresh: require('./../assets/common/refresh.png'),
  submitIcon: require('./../assets/common/submitIcon.png'),
  alertmergeIcon: require('./../assets/common/alertmergeIcon.png')

 };

-const mods = {
-  right: require('./../assets/common/mods/right.png'),
-  filters: require('./../assets/common/mods/filters.png'),
-  addbtn: require('./../assets/common/mods/addbtn.png'),
-  delbtn: require('./../assets/common/mods/delbtn.png'),
-  editbtn: require('./../assets/common/mods/editbtn.png'),
-  import: require('./../assets/common/mods/import.png'),
-  export: require('./../assets/common/mods/export.png'),
-  examine: require('./../assets/common/mods/examine.png'),
-  reject: require('./../assets/common/mods/reject.png'),
-  exit: require('./../assets/common/mods/exit.png'),
-  refresh: require('./../assets/common/mods/refresh.png'),
-  download: require('./../assets/common/mods/download.png'),
-  error: require('./../assets/common/mods/error.png'),
-  running: require('./../assets/common/mods/running.png'),
-  success: require('./../assets/common/mods/success.png'),
-  file: require('./../assets/common/mods/file.png')
-};
-
-const bizCommon = {
-  selectIcon: require('./../assets/common/bizCommon/selectIcon.svg'),
-  timeIcon: require('./../assets/common/bizCommon/timeIcon.svg')
-};
-
-const teamStandingImg = {
-  menus: {
-    edit: require('../assets/teamStanding/menuEdit.png'),
-    delete: require('../assets/teamStanding/menuRemove.png'),
-    building: require('../assets/teamStanding/menuAdd.png')
-  },
-  emptyCard: require('../assets/teamStanding/equip-card.png'),
-  more: require('../assets/teamStanding/more.png'),
-  defaultequip: require('../assets/teamStanding/defaultequip.png'),
-  vehicle: require('../assets/teamStanding/vehicle.png'),
-  close: require('../assets/teamStanding/close.png'),
-  search: require('../assets/teamStanding/search.png'),
-  addBtn: require('../assets/teamStanding/add_btn.png'),
-  notStarted: require('../assets/teamStanding/notStarted.png'),
-  overdue: require('../assets/teamStanding/overdue.png'),
-  underway: require('../assets/teamStanding/underway.png'),
-  unfinished: require('../assets/teamStanding/unfinished.png'),
-  all: require('../assets/teamStanding/all.png'),
-  done: require('../assets/teamStanding/done.png'),
-  building: require('../assets/teamStanding/building.png'),
-  company: require('../assets/teamStanding/company.png'),
-  equipment: require('../assets/teamStanding/equipment.png'),
-  region: require('../assets/teamStanding/region.png'),
-  serviceCompany: require('../assets/teamStanding/building.png'),
-  fireSystemDefault: require('../assets/teamStanding/fire_system_default.png'),
-  fireSystemTree: require('../assets/teamStanding/fire_system.png'),
-  fireEquipment: require('../assets/teamStanding/equipment.png'),
-  fireCar: require('../assets/teamStanding/region.png'),
-  fireVideo: require('../assets/teamStanding/region.png'),
-  fireBuilding: require('../assets/teamStanding/region.png'),
-  noData: require('../assets/teamStanding/nodata.png'),
-  floorImg: require('../assets/teamStanding/floor-img.png'),
-  roomInfo: require('../assets/teamStanding/roomInfo.png'),
-  floorInfo: require('../assets/teamStanding/floorInfo.png'),
-  buildingInfo: require('../assets/teamStanding/buildingInfo.png'),
-  riskIcon: require('../assets/teamStanding/riskIcon.png'),
-  closeAlarmInfo: require('../assets/teamStanding/closeAlarmInfo.png'),
-  noImg: require('../assets/teamStanding/noImg.png'),
-  noVideoImg: require('../assets/teamStanding/noVideoImg.png'),
-  oneColumn: require('./../assets/teamStanding/oneColumn.png'),
-  twoColumns: require('./../assets/teamStanding/twoColumns.png'),
-  threeColumns: require('./../assets/teamStanding/threeColumns.png'),
-  fourColumns: require('./../assets/teamStanding/fourColumns.png'),
-  groupAdd: require('./../assets/teamStanding/groupAdd.png'),
-  groupDelete: require('./../assets/teamStanding/groupDelete.png'),
-  groupUp: require('./../assets/teamStanding/groupUp.png'),
-  groupDown: require('./../assets/teamStanding/groupDown.png'),
-  optionDelete: require('./../assets/teamStanding/optionDelete.png')
-};
-const url = 'http://39.98.246.31:8888/';
-const httpImg = {
-  star: `${url}group1/M00/00/3E/rBq-8F-g_vyAZoi3AAAsj-WKk6w683.png`,
-  mapBannerBg: `${url}group1/M00/00/3E/rBq-8F-g_yyAZ07BAAAQ8NlYqMY104.png`,
-  platBg: `${url}group1/M00/00/3E/rBq-8F-g_7GAYs_JAAO7Wxm-fSM881.png`,
-  personIcon: `${url}group1/M00/00/3E/rBq-8F-g_2OARGwNAAANhswExzA005.png`,
-  processBg: `${url}group1/M00/00/3E/rBq-8F-g_0mALBlXAABmXJsxFpg946.png`
-};
-
-const fireEquipmentImg = {
-  save: require('./../assets/teamStanding/f_save.png'),
-  add: require('./../assets/teamStanding/add.png')
-};
-
-const bizImg = {
-  close: require('./../assets/eleManage/detail/close.png'),
-  return: require('./../assets/eleManage/detail/return.png'),
-  secondTitle1: require('./../assets/eleManage/detail/secondTitle1.png'),
-  secondTitle2: require('./../assets/eleManage/detail/secondTitle2.png'),
-  secondTitle3: require('./../assets/eleManage/detail/secondTitle3.png'),
-  secondTitle4: require('./../assets/eleManage/detail/secondTitle4.png'),
-  RPNr: require('./../assets/eleManage/detail/RPNr.png'),
-  locate: require('./../assets/eleManage/detail/locate.png')
-};
-
-const videoImg = {
-  monitor: require('./../assets/teamStanding/video/monitor.png'),
-  vdos: require('./../assets/teamStanding/video/vdos.png'),
-  header: require('./../assets/teamStanding/video/title-header.png'),
-  one: require('./../assets/teamStanding/video/1.png'),
-  four: require('./../assets/teamStanding/video/4.png'),
-  nine: require('./../assets/teamStanding/video/9.png'),
-  point: require('./../assets/teamStanding/point.png'),
-  vdo: require('./../assets/teamStanding/video/vdo.jpg')
-};
-
-const precontrol = {
-  undone: require('./../assets/precontrol/undone.png'),
-  sjsc_top_arrow_green: require('./../assets/precontrol/sjsc/top-arrow-green.png'),
-  sjsc_top_arrow_red: require('./../assets/precontrol/sjsc/top-arrow-red.png'),
-  sjsc_right_arrow_green: require('./../assets/precontrol/sjsc/right_arrow_green.png'),
-  sjsc_right_arrow_red: require('./../assets/precontrol/sjsc/right_arrow_red.png'),
-  sjsc_left_arrow_green: require('./../assets/precontrol/sjsc/left_arrow_green.png'),
-  sjsc_left_arrow_red: require('./../assets/precontrol/sjsc/left_arrow_red.png'),
-  sjsc_bottom_arrow_green: require('./../assets/precontrol/sjsc/bottom_arrow_green.png'),
-  sjsc_bottom_arrow_red: require('./../assets/precontrol/sjsc/bottom_arrow_red.png'),
-  bottom_bad_grey: require('./../assets/precontrol/sjsc/bottom_bad_grey.png'),
-  sjsc_right30_arrow_green: require('./../assets/precontrol/sjsc/right30_arrow_green.png'),
-  sjsc_right30_arrow_red: require('./../assets/precontrol/sjsc/right30_arrow_red.png'),
-  sjsc_rightf30_arrow_green: require('./../assets/precontrol/sjsc/rightf30_arrow_green.png'),
-  sjsc_rightf30_arrow_grey: require('./../assets/precontrol/sjsc/rightf30_arrow_grey.png'),
-  sjsc_rightf30_arrow_red: require('./../assets/precontrol/sjsc/rightf30_arrow_red.png'),
-  sjsc_left30_arrow_green: require('./../assets/precontrol/sjsc/left30_arrow_green.png'),
-  sjsc_left30_arrow_red: require('./../assets/precontrol/sjsc/left30_arrow_red.png'),
-  sjsc_right60_arrow_green: require('./../assets/precontrol/sjsc/right60_arrow_green.png'),
-  sjsc_right60_arrow_red: require('./../assets/precontrol/sjsc/right60_arrow_red.png'),
-  sjsc_left60_arrow_green: require('./../assets/precontrol/sjsc/left60_arrow_green.png'),
-  sjsc_left60_arrow_red: require('./../assets/precontrol/sjsc/left60_arrow_red.png'),
-  select_green: require('./../assets/precontrol/select-green.png'),
-  avatar: require('./../assets/precontrol/avatar.png'),
-  default_avatar: require('./../assets/precontrol/default_avatar.png'),
-  risk_icon: require('./../assets/precontrol/risk_icon.png'),
-  endtask: require('./../assets/precontrol/endtask.png'),
-  complete_task: require('./../assets/precontrol/complete_task.png'),
-  todo_task: require('./../assets/precontrol/todo_task.png'),
-  small_image: require('./../assets/precontrol/small_image.png'),
-  tips: require('./../assets/precontrol/tips.png'),
-  task_undone_bg: require('./../assets/precontrol/task_undone_bg.png'),
-  qualified: require('./../assets/precontrol/qualified.png'),
-  no_qualified: require('./../assets/precontrol/no_qualified.png'),
-  work_bg: require('./../assets/precontrol/work_bg.png'),
-  look_over: require('./../assets/precontrol/look_over.png'),
-  risk: require('./../assets/precontrol/risk.png'),
-  task_risk_bg: require('./../assets/precontrol/task_risk_bg.png'),
-  salary_complete: require('./../assets/precontrol/salary_complete.png'),
-  salary_warn: require('./../assets/precontrol/salary_warn.png'),
-  salary_error: require('./../assets/precontrol/salary_error.png'),
-  salary_tip: require('./../assets/precontrol/salary_tip.png'),
-  powerdo: require('./../assets/precontrol/powerdo.png'),
-  view: require('./../assets/precontrol/view.png'),
-  org: require('./../assets/precontrol/org.png'),
-  org_selected: require('./../assets/precontrol/org_selected.png')
-};
-
-const digitalPlan = {
-  baohu: require('./../assets/emergencyHandle/baohu.svg'),
-  defaultPlan: require('./../assets/emergencyHandle/defaultPlan.svg'),
-  doc: require('./../assets/emergencyHandle/doc.svg'),
-  plan: require('./../assets/emergencyHandle/plan.svg'),
-  rule: require('./../assets/emergencyHandle/rule.svg'),
-  treeRoot: require('./../assets/emergencyHandle/treeRoot.svg'),
-  add: require('./../assets/emergencyHandle/add.svg'),
-  delete: require('./../assets/emergencyHandle/delete.svg'),
-  log: require('./../assets/emergencyHandle/log.png'),
-  auto: require('./../assets/emergencyHandle/auto.svg'),
-  all: require('./../assets/emergencyHandle/all.svg'),
-  handle: require('./../assets/emergencyHandle/handle.svg')
-};
-
-const command = {
-  noplay: require('./../assets/command/audio-noplay.png'),
-  playing: require('./../assets/command/audio-playing.gif')
-};
-const jcs119 = {
-  helpTip: require('./../assets/jcs119/helpTip.json'),
-  standardTelephone: require('./../assets/jcs119/standardTelephone.json')
-};
-
-const mcb = {
-  import: require('./../assets/mcb/import.png'),
-  close: require('./../assets/mcb/close.png')
-};
+// const mods = {
+//   right: require('./../assets/common/mods/right.png'),
+//   filters: require('./../assets/common/mods/filters.png'),
+//   addbtn: require('./../assets/common/mods/addbtn.png'),
+//   delbtn: require('./../assets/common/mods/delbtn.png'),
+//   editbtn: require('./../assets/common/mods/editbtn.png'),
+//   import: require('./../assets/common/mods/import.png'),
+//   export: require('./../assets/common/mods/export.png'),
+//   examine: require('./../assets/common/mods/examine.png'),
+//   reject: require('./../assets/common/mods/reject.png'),
+//   exit: require('./../assets/common/mods/exit.png'),
+//   refresh: require('./../assets/common/mods/refresh.png'),
+//   download: require('./../assets/common/mods/download.png'),
+//   error: require('./../assets/common/mods/error.png'),
+//   running: require('./../assets/common/mods/running.png'),
+//   success: require('./../assets/common/mods/success.png'),
+//   file: require('./../assets/common/mods/file.png')
+// };
+//
+// const bizCommon = {
+//   selectIcon: require('./../assets/common/bizCommon/selectIcon.svg'),
+//   timeIcon: require('./../assets/common/bizCommon/timeIcon.svg')
+// };
+//
+// const teamStandingImg = {
+//   menus: {
+//     edit: require('../assets/teamStanding/menuEdit.png'),
+//     delete: require('../assets/teamStanding/menuRemove.png'),
+//     building: require('../assets/teamStanding/menuAdd.png')
+//   },
+//   emptyCard: require('../assets/teamStanding/equip-card.png'),
+//   more: require('../assets/teamStanding/more.png'),
+//   defaultequip: require('../assets/teamStanding/defaultequip.png'),
+//   vehicle: require('../assets/teamStanding/vehicle.png'),
+//   close: require('../assets/teamStanding/close.png'),
+//   search: require('../assets/teamStanding/search.png'),
+//   addBtn: require('../assets/teamStanding/add_btn.png'),
+//   notStarted: require('../assets/teamStanding/notStarted.png'),
+//   overdue: require('../assets/teamStanding/overdue.png'),
+//   underway: require('../assets/teamStanding/underway.png'),
+//   unfinished: require('../assets/teamStanding/unfinished.png'),
+//   all: require('../assets/teamStanding/all.png'),
+//   done: require('../assets/teamStanding/done.png'),
+//   building: require('../assets/teamStanding/building.png'),
+//   company: require('../assets/teamStanding/company.png'),
+//   equipment: require('../assets/teamStanding/equipment.png'),
+//   region: require('../assets/teamStanding/region.png'),
+//   serviceCompany: require('../assets/teamStanding/building.png'),
+//   fireSystemDefault: require('../assets/teamStanding/fire_system_default.png'),
+//   fireSystemTree: require('../assets/teamStanding/fire_system.png'),
+//   fireEquipment: require('../assets/teamStanding/equipment.png'),
+//   fireCar: require('../assets/teamStanding/region.png'),
+//   fireVideo: require('../assets/teamStanding/region.png'),
+//   fireBuilding: require('../assets/teamStanding/region.png'),
+//   noData: require('../assets/teamStanding/nodata.png'),
+//   floorImg: require('../assets/teamStanding/floor-img.png'),
+//   roomInfo: require('../assets/teamStanding/roomInfo.png'),
+//   floorInfo: require('../assets/teamStanding/floorInfo.png'),
+//   buildingInfo: require('../assets/teamStanding/buildingInfo.png'),
+//   riskIcon: require('../assets/teamStanding/riskIcon.png'),
+//   closeAlarmInfo: require('../assets/teamStanding/closeAlarmInfo.png'),
+//   noImg: require('../assets/teamStanding/noImg.png'),
+//   noVideoImg: require('../assets/teamStanding/noVideoImg.png'),
+//   oneColumn: require('./../assets/teamStanding/oneColumn.png'),
+//   twoColumns: require('./../assets/teamStanding/twoColumns.png'),
+//   threeColumns: require('./../assets/teamStanding/threeColumns.png'),
+//   fourColumns: require('./../assets/teamStanding/fourColumns.png'),
+//   groupAdd: require('./../assets/teamStanding/groupAdd.png'),
+//   groupDelete: require('./../assets/teamStanding/groupDelete.png'),
+//   groupUp: require('./../assets/teamStanding/groupUp.png'),
+//   groupDown: require('./../assets/teamStanding/groupDown.png'),
+//   optionDelete: require('./../assets/teamStanding/optionDelete.png')
+// };
+// const url = 'http://39.98.246.31:8888/';
+// const httpImg = {
+//   star: `${url}group1/M00/00/3E/rBq-8F-g_vyAZoi3AAAsj-WKk6w683.png`,
+//   mapBannerBg: `${url}group1/M00/00/3E/rBq-8F-g_yyAZ07BAAAQ8NlYqMY104.png`,
+//   platBg: `${url}group1/M00/00/3E/rBq-8F-g_7GAYs_JAAO7Wxm-fSM881.png`,
+//   personIcon: `${url}group1/M00/00/3E/rBq-8F-g_2OARGwNAAANhswExzA005.png`,
+//   processBg: `${url}group1/M00/00/3E/rBq-8F-g_0mALBlXAABmXJsxFpg946.png`
+// };
+//
+// const fireEquipmentImg = {
+//   save: require('./../assets/teamStanding/f_save.png'),
+//   add: require('./../assets/teamStanding/add.png')
+// };
+//
+// const bizImg = {
+//   close: require('./../assets/eleManage/detail/close.png'),
+//   return: require('./../assets/eleManage/detail/return.png'),
+//   secondTitle1: require('./../assets/eleManage/detail/secondTitle1.png'),
+//   secondTitle2: require('./../assets/eleManage/detail/secondTitle2.png'),
+//   secondTitle3: require('./../assets/eleManage/detail/secondTitle3.png'),
+//   secondTitle4: require('./../assets/eleManage/detail/secondTitle4.png'),
+//   RPNr: require('./../assets/eleManage/detail/RPNr.png'),
+//   locate: require('./../assets/eleManage/detail/locate.png')
+// };
+//
+// const videoImg = {
+//   monitor: require('./../assets/teamStanding/video/monitor.png'),
+//   vdos: require('./../assets/teamStanding/video/vdos.png'),
+//   header: require('./../assets/teamStanding/video/title-header.png'),
+//   one: require('./../assets/teamStanding/video/1.png'),
+//   four: require('./../assets/teamStanding/video/4.png'),
+//   nine: require('./../assets/teamStanding/video/9.png'),
+//   point: require('./../assets/teamStanding/point.png'),
+//   vdo: require('./../assets/teamStanding/video/vdo.jpg')
+// };
+//
+// const precontrol = {
+//   undone: require('./../assets/precontrol/undone.png'),
+//   sjsc_top_arrow_green: require('./../assets/precontrol/sjsc/top-arrow-green.png'),
+//   sjsc_top_arrow_red: require('./../assets/precontrol/sjsc/top-arrow-red.png'),
+//   sjsc_right_arrow_green: require('./../assets/precontrol/sjsc/right_arrow_green.png'),
+//   sjsc_right_arrow_red: require('./../assets/precontrol/sjsc/right_arrow_red.png'),
+//   sjsc_left_arrow_green: require('./../assets/precontrol/sjsc/left_arrow_green.png'),
+//   sjsc_left_arrow_red: require('./../assets/precontrol/sjsc/left_arrow_red.png'),
+//   sjsc_bottom_arrow_green: require('./../assets/precontrol/sjsc/bottom_arrow_green.png'),
+//   sjsc_bottom_arrow_red: require('./../assets/precontrol/sjsc/bottom_arrow_red.png'),
+//   bottom_bad_grey: require('./../assets/precontrol/sjsc/bottom_bad_grey.png'),
+//   sjsc_right30_arrow_green: require('./../assets/precontrol/sjsc/right30_arrow_green.png'),
+//   sjsc_right30_arrow_red: require('./../assets/precontrol/sjsc/right30_arrow_red.png'),
+//   sjsc_rightf30_arrow_green: require('./../assets/precontrol/sjsc/rightf30_arrow_green.png'),
+//   sjsc_rightf30_arrow_grey: require('./../assets/precontrol/sjsc/rightf30_arrow_grey.png'),
+//   sjsc_rightf30_arrow_red: require('./../assets/precontrol/sjsc/rightf30_arrow_red.png'),
+//   sjsc_left30_arrow_green: require('./../assets/precontrol/sjsc/left30_arrow_green.png'),
+//   sjsc_left30_arrow_red: require('./../assets/precontrol/sjsc/left30_arrow_red.png'),
+//   sjsc_right60_arrow_green: require('./../assets/precontrol/sjsc/right60_arrow_green.png'),
+//   sjsc_right60_arrow_red: require('./../assets/precontrol/sjsc/right60_arrow_red.png'),
+//   sjsc_left60_arrow_green: require('./../assets/precontrol/sjsc/left60_arrow_green.png'),
+//   sjsc_left60_arrow_red: require('./../assets/precontrol/sjsc/left60_arrow_red.png'),
+//   select_green: require('./../assets/precontrol/select-green.png'),
+//   avatar: require('./../assets/precontrol/avatar.png'),
+//   default_avatar: require('./../assets/precontrol/default_avatar.png'),
+//   risk_icon: require('./../assets/precontrol/risk_icon.png'),
+//   endtask: require('./../assets/precontrol/endtask.png'),
+//   complete_task: require('./../assets/precontrol/complete_task.png'),
+//   todo_task: require('./../assets/precontrol/todo_task.png'),
+//   small_image: require('./../assets/precontrol/small_image.png'),
+//   tips: require('./../assets/precontrol/tips.png'),
+//   task_undone_bg: require('./../assets/precontrol/task_undone_bg.png'),
+//   qualified: require('./../assets/precontrol/qualified.png'),
+//   no_qualified: require('./../assets/precontrol/no_qualified.png'),
+//   work_bg: require('./../assets/precontrol/work_bg.png'),
+//   look_over: require('./../assets/precontrol/look_over.png'),
+//   risk: require('./../assets/precontrol/risk.png'),
+//   task_risk_bg: require('./../assets/precontrol/task_risk_bg.png'),
+//   salary_complete: require('./../assets/precontrol/salary_complete.png'),
+//   salary_warn: require('./../assets/precontrol/salary_warn.png'),
+//   salary_error: require('./../assets/precontrol/salary_error.png'),
+//   salary_tip: require('./../assets/precontrol/salary_tip.png'),
+//   powerdo: require('./../assets/precontrol/powerdo.png'),
+//   view: require('./../assets/precontrol/view.png'),
+//   org: require('./../assets/precontrol/org.png'),
+//   org_selected: require('./../assets/precontrol/org_selected.png')
+// };
+//
+// const digitalPlan = {
+//   baohu: require('./../assets/emergencyHandle/baohu.svg'),
+//   defaultPlan: require('./../assets/emergencyHandle/defaultPlan.svg'),
+//   doc: require('./../assets/emergencyHandle/doc.svg'),
+//   plan: require('./../assets/emergencyHandle/plan.svg'),
+//   rule: require('./../assets/emergencyHandle/rule.svg'),
+//   treeRoot: require('./../assets/emergencyHandle/treeRoot.svg'),
+//   add: require('./../assets/emergencyHandle/add.svg'),
+//   delete: require('./../assets/emergencyHandle/delete.svg'),
+//   log: require('./../assets/emergencyHandle/log.png'),
+//   auto: require('./../assets/emergencyHandle/auto.svg'),
+//   all: require('./../assets/emergencyHandle/all.svg'),
+//   handle: require('./../assets/emergencyHandle/handle.svg')
+// };
+//
+// const command = {
+//   noplay: require('./../assets/command/audio-noplay.png'),
+//   playing: require('./../assets/command/audio-playing.gif')
+// };
+// const jcs119 = {
+//   helpTip: require('./../assets/jcs119/helpTip.json'),
+//   standardTelephone: require('./../assets/jcs119/standardTelephone.json')
+// };
+//
+// const mcb = {
+//   import: require('./../assets/mcb/import.png'),
+//   close: require('./../assets/mcb/close.png')
+// };
 export default {
-  common,
-  mods,
-  bizCommon,
-  bizImg,
-  fireEquipmentImg,
-  videoImg,
-  httpImg,
-  digitalPlan,
-  teamStandingImg,
-  precontrol,
-  command,
-  jcs119,
-  mcb
+  common
+  // mods,
+  // bizCommon,
+  // bizImg,
+  // fireEquipmentImg,
+  // videoImg,
+  // httpImg,
+  // digitalPlan,
+  // teamStandingImg,
+  // precontrol,
+  // command,
+  // jcs119,
+  // mcb
 };
--- a/packages/graphmod-ccs/extra/RiskSituation/101/svginfo.min.js
+++ b/packages/graphmod-ccs/extra/RiskSituation/101/svginfo.min.js

 /**
- * svgfile-umd-demo v1.0.0
+ * svgfile-umd-demo1 v1.0.0
 *
 * released date Fri Nov 19 2021 16:33:17 GMT+0800 (GMT+08:00).
 * Copyright 2016-present, AMOS.ilex.ray

--- a/packages/graphmod-ccs/extra/RiskSituation/102/svginfo.min.js
+++ b/packages/graphmod-ccs/extra/RiskSituation/102/svginfo.min.js

 /**
- * svgfile-umd-demo v1.0.0
+ * svgfile-umd-demo1 v1.0.0
 *
 * released date Fri Nov 19 2021 16:33:17 GMT+0800 (GMT+08:00).
 * Copyright 2016-present, AMOS.ilex.ray

--- a/packages/graphmod-common/src/userSelectPerson/index.scss
+++ b/packages/graphmod-common/src/userSelectPerson/index.scss
@@ -167,7 +167,7 @@
    width: 10px;
    height: 7px;
    margin-top: -3.5px;
-    background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat;
+    //background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat;
    background-size: cover;
  }


--- a/packages/graphmod-common/src/userSelector/index.scss
+++ b/packages/graphmod-common/src/userSelector/index.scss
@@ -167,7 +167,7 @@
    width: 10px;
    height: 7px;
    margin-top: -3.5px;
-    background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat;
+    //background: url('~@gm/graphmod-assets/assets/knowledgeLib/search.png') no-repeat;
    background-size: cover;
  }


--- a/packages/graphmod-scripts/src/_proxy.js
+++ b/packages/graphmod-scripts/src/_proxy.js
@@ -3,34 +3,26 @@ const proxy = {
  //   target: 'http://172.16.10.72:10005/',
  //   pathRewrite: { '^/baseURI': '' }
  // },
-  // '/bizURI/openapi': {
-  //   target: 'http://172.16.3.3:11001/',
-  //   pathRewrite: { '^/bizURI': '' }
-  // },
-  // '/bizURI': {
-  //   // target: 'http://172.16.3.20:11100/', // 苏
-  //   // target: 'http://172.16.3.89:11100/', // 田
-  //   target: 'http://172.16.10.72:10005/',
-  //   // target: 'http://172.16.3.20:8807/', // 田
-  //   // target: 'http://172.16.3.89:11000/', // 田
-  //   // target: 'http://113.134.211.174:10005/', // 李
-  //   // target: 'http://172.16.3.41:11100/', // 唐
-  //   // target: 'http://172.16.3.4:11100/',  // 陈
-  //   pathRewrite: { '^/bizURI': '' }
-  // },
-  '/baseURI':{
-    target:'http://localhost:30201',
-    changeOrigin:true,
-    pathRewrite:{'^/baseURI':''}
-    },
-    '/bizURI/jcs':{
-    target:'http://localhost:30201',
-    pathRewrite:{'^/bizURI':''}
-    },
-  '/bizURI':{
-    target:'http://localhost:30201',
-    changeOrigin:true,
-    pathRewrite:{'^/bizURI':''}
+  '/baseURI/jcs': {
+    // target: 'http://172.16.10.72:10005/',
+    target: 'http://172.16.0.120:20000/',
+    changeOrigin: true,
+    pathRewrite: { '^/baseURI': '' }
+  },
+  '/bizURI/openapi': {
+    target: 'http://172.16.3.3:11001/',
+    pathRewrite: { '^/bizURI': '' }
+  },
+  '/bizURI': {
+    // target: 'http://172.16.3.20:11100/', // 苏
+    // target: 'http://172.16.3.89:11100/', // 田
+    target: 'http://172.16.10.72:10005/',
+    // target: 'http://172.16.3.20:8807/', // 田
+    // target: 'http://172.16.3.89:11000/', // 田
+    // target: 'http://113.134.211.174:10005/', // 李
+    // target: 'http://172.16.3.41:11100/', // 唐
+    // target: 'http://172.16.3.4:11100/',  // 陈
+    pathRewrite: { '^/bizURI': '' }
  },

  // '/baseURI':{

--- a/packages/graphmod-tool/package-lock.json
+++ b/packages/graphmod-tool/package-lock.json
+{
+  "name": "@gm/graphmod-tool",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@gm/graphmod-assets": {
+      "version": "1.0.0",
+      "dev": true
+    },
+    "@gm/graphmod-common": {
+      "version": "1.0.0",
+      "dev": true,
+      "dependencies": {
+        "@gm/graphmod-assets": {},
+        "@gm/graphmod-utils": {}
+      }
+    },
+    "@gm/graphmod-scripts": {
+      "version": "1.0.0",
+      "dev": true
+    },
+    "@gm/graphmod-utils": {
+      "version": "1.0.0",
+      "dev": true
+    }
+  }
+}
--- a/packages/graphmod-tool/src/api.js
+++ b/packages/graphmod-tool/src/api.js
 // 该模块存放系统通用 api 接口
 // 各自模块的 api 存放在自己模块根目录下
+import * as endConf from 'amos-processor/lib/config/endconf';

 import { request, gateWay } from '@gm/graphmod-utils';

+const completePrefix = endConf.completePrefix;
+const AmosConfig = endConf.AmosConfig;
+const baseURI = AmosConfig.httpURI.baseURI;
+
 const {
  commonGet,
  commonPost,
  commonPut,
  formatUrl,
-  completePrefix,
  commonDelete,
  formatObjUrl,
  fileDownload
@@ -16,6 +20,14 @@ const {


 export const UrlConsts = {
+  deleteAgency: (url) => completePrefix(baseURI, 'jcs/Agency/relation/{agencyCodeId}/{sequenceNbrs}'),
+};

+/**
+ * 删除机构
+ */
+export const deleteByAgencyCode = ( agencyCodeId, sequenceNbrs) => {
+  console.log(formatUrl(UrlConsts.deleteAgency(), { agencyCodeId, sequenceNbrs }))
+  return commonDelete(formatUrl(UrlConsts.deleteAgency(), { agencyCodeId, sequenceNbrs }));
 };

--- a/packages/graphmod-tool/src/demo1/DeleteModel.js
+++ b/packages/graphmod-tool/src/demo1/DeleteModel.js
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Form, Input } from 'amos-framework';
+import { withModalForm, BaseForm } from 'amos-designer';
+import { tools } from '@gm/graphmod-utils';
+import * as api from '../api'
+
+const { deleteByAgencyCode } = api;
+const FormItem = Form.Item;
+
+/**
+ * 导入数据
+ * @class ImportData
+ * @extends {Component}
+ */
+@withModalForm({
+  width: 400,
+  title: '导出SQL脚本'
+})
+// class DeleteModel extends BaseForm {
+//   constructor(props) {
+//     super(props);
+//     const user = {};
+//     this.state = {
+//       form: {
+//         agencyCode: user.agencyCode ?? ''
+//       }
+//     };
+//   }
+class DeleteModel extends BaseForm {
+  constructor(props) {
+    super(props);
+    const user = {};
+    this.state = {
+      form: {
+        agencyCode: user.agencyCode ?? ''
+      }
+    };
+  }
+
+  onCancel = () => {
+    this.setState({ form: {} }, () => {
+      this.props.onClose && this.props.onClose();
+    });
+  };
+
+  onSubmit = () => {
+    const { selectedRowKeys = [], dataConfig = {} } = this.props;
+    this.props.onClose();
+    this.props.handleOpen('logsVisible');
+    if (dataConfig.dimension && selectedRowKeys.length > 0) {
+      dataConfig[dataConfig.dimension] = selectedRowKeys.join(',');
+    }
+    deleteByAgencyCode(dataConfig);
+  };
+
+  render() {
+    const { form } = this.state;
+
+    return (
+      <Form
+        style={{ paddingRight: 20 }}
+        ref={this.props.saveFormRef}
+        model={form}
+        labelWidth="8em"
+        filled
+      >
+        <FormItem label="所属机构" field="agencyCode">
+          <Input placeholder="请输入" value={form.agencyCode} onChange={this.genHandle('agencyCode')} />
+        </FormItem>
+      </Form>
+    );
+  }
+}
+
+DeleteModel.propTypes = {
+  saveFormRef: PropTypes.func,
+  visible: PropTypes.bool,
+  onClose: PropTypes.func
+};
+
+export default DeleteModel;
--- a/packages/graphmod-tool/src/demo1/DeleteView.js
+++ b/packages/graphmod-tool/src/demo1/DeleteView.js
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { BarGroup, IconButton, briskWarningTip } from 'amos-designer';
+import * as api from '../api';
+import { connectGlobalPage } from '@gm/graphmod-common';
+import ExecuteProgress from './ExecuteProgress';
+import DeleteModel from './DeleteModel';
+
+const { deleteByAgencyCode } = api;
+
+/**
+ * 导出sql脚本模块
+ * @class DeleteView
+ * @extends {Component}
+ */
+
+// @connectGlobalPage({
+//   testDataConfig: {
+//     resourceCode: 'StudioApplication', // 标识
+//     dimension: 'appSeq', // 字段
+//     appSeq: '1620614032232841218',
+//     mqttUrl: 'ws://172.16.3.18:8088/mqtt',
+//     position:'header'
+//   }
+// })
+
+@connectGlobalPage({
+  testDataConfig: {
+    agencyCodeId: '1397143491787747330',//机构ID
+    sequenceNbrs: '1676795341917782033,1676795341917782024',//数据库连接sequenceNbrs
+    mqttUrl: 'ws://172.16.3.18:8088/mqtt'
+  }
+})
+
+
+class DeleteView extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      downloadVisible: false,
+      logsVisible: false,
+      selectId: ''
+    };
+  }
+
+  handleClose = (key) => {
+    this.setState({
+      [key]: false
+    });
+  };
+
+  handleOpen = (key) => {
+    this.setState({
+      [key]: true
+    });
+  };
+
+  handleItemClick = () => {
+    const { selectedRowKeys = [], dataConfig, record } = this.props;
+    if (selectedRowKeys.length > 0 || record) {
+      this.setState({ selectId: selectedRowKeys.length === 0 ? record.id ?? record.sequenceNbr : '', logsVisible: true }, () => {
+        if (dataConfig.sequenceNbrs && (selectedRowKeys.length > 0 || record)) {
+          dataConfig[dataConfig.sequenceNbrs] = (record ? record.id ?? record.sequenceNbr : null) || selectedRowKeys.join(',');
+          deleteByAgencyCode({ agencyCodeId: dataConfig.agencyCodeId, sequenceNbrs: dataConfig.sequenceNbrs });
+        }
+      });
+    } else {
+      briskWarningTip('至少选择一个数据库和一个机构');
+    }
+
+    // const { selectedRowKeys = [], dataConfig, record } = this.props;
+    // if (selectedRowKeys.length === 0 ) {
+    //   this.setState({ selectId: dataConfig.sequenceNbrs, logsVisible: true }, () => {
+    //       deleteByAgencyCode( dataConfig.agencyCodeId, dataConfig.sequenceNbrs );
+    //   });
+    // } else {
+    //   briskWarningTip('至少选择一个数据库');
+    // }
+    
+    // debugger
+    // const { selectedRowKeys = [], dataConfig, record } = this.props;
+    // if (selectedRowKeys.length > 0 || record) {
+    //   this.setState({ selectId: selectedRowKeys.length === 0 ? record.id ?? record.sequenceNbr  : selectedRowKeys[0], logsVisible: true }, () => {
+    //     if (dataConfig.dimension && (selectedRowKeys.length > 0 || record)) {
+    //       dataConfig[dataConfig.dimension] = (record ? record.id ?? record.sequenceNbr : null) || selectedRowKeys.join(',');
+    //       templateDownload({ resourceCode: dataConfig.resourceCode, dimension: dataConfig.dimension, [dataConfig.dimension]: dataConfig[dataConfig.dimension] });
+    //     }
+    //   });
+    // } else {
+    //   briskWarningTip('至少选择一行数据');
+    // }
+  };
+
+  render() {
+    const { dataConfig = {} } = this.props;
+    const { logsVisible, selectId, downloadVisible } = this.state;
+    return (
+      <div>
+        {dataConfig.position === 'header' ?
+          <div className="ig-stage-toolbar-right">
+            <BarGroup label="导出脚本" mode="none" position="right">
+              <IconButton colorful icon="export" title="导出SQL脚本" style={{ borderRadius: 4 }} onClick={() => this.handleItemClick()} />
+            </BarGroup>
+          </div>
+          :
+          <p onClick={this.handleItemClick}>删除</p>
+        }
+        <DeleteModel
+          visible={this.downloadVisible}
+          onClose={() => this.handleClose('downloadVisible')}
+          handleOpen={() => this.handleOpen()}
+          dataConfig={dataConfig}
+        />
+        <ExecuteProgress visible={logsVisible} mqttUrl={dataConfig.mqttUrl} exeId={selectId}  onClose={() => this.handleClose('logsVisible')} />
+      </div>
+    );
+  }
+}
+
+DeleteView.propTypes = {
+  selectedRowKeys: PropTypes.array,
+  dataConfig: PropTypes.object,
+  record: PropTypes.object
+};
+
+export default DeleteView;
--- a/packages/graphmod-tool/src/demo1/ExecuteProgress.js
+++ b/packages/graphmod-tool/src/demo1/ExecuteProgress.js
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { withSubscribeMQTT, parseMessage, MQTTProvider } from 'amos-mqtt';
+import { Modal, briskWarningTip } from 'amos-designer';
+import ExecuteProgressContent from './ExecuteProgressContent';
+
+/**
+ * 执行进度
+ * @class ExecuteProgress
+ * @extends {ExecuteProgress}
+ */
+class ExecuteProgress extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      content: null,
+      data: {}
+    };
+  }
+
+  componentDidMount() {
+    this.initMqttTopic();
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (this.props.exeId !== prevProps.exeId) {
+      this.initMqttTopic();
+    }
+  }
+
+  initMqttTopic = () => {
+    const { exeId } = this.props;
+    if (exeId) {
+      const content = withSubscribeMQTT({
+        topic: `/topicTable/solidify/${exeId.indexOf(',') !== -1 ? exeId.split(',')[0] : exeId}`,
+        dispatch: (_topic, message, packet) => {
+          const newMsg = parseMessage(message);
+          this.setState({ data: { message: newMsg, messageFlag: Date.now() } });
+        }
+      })(ExecuteProgressContent);
+      this.setState({ content });
+    }
+  }
+
+  cancel = () => {
+    const { data } = this.state;
+    if (!data.message || data.message.status === 'running') {
+
+    }
+    this.props.onClose && this.props.onClose();
+  }
+
+  render() {
+    const { visible, mqttUrl } = this.props;
+    const { data, content: Content } = this.state;
+    if (!Content) {
+      return null;
+    }
+    return (
+      <MQTTProvider url={mqttUrl || '/mqtt'}>
+        <Modal
+          header="立即执行进度"
+          visible={visible}
+          width={474}
+          noDefaultFooter
+          showMax
+          onCancel={this.cancel}
+          outterClosable={false}
+          content={
+            <Content message={data.message} messageFlag={data.messageFlag} />
+          }
+        />
+      </MQTTProvider>
+    );
+  }
+}
+
+ExecuteProgress.propTypes = {
+  visible: PropTypes.bool,
+  onClose: PropTypes.func,
+  exeId: PropTypes.string,
+  mqttUrl: PropTypes.string
+};
+
+export default ExecuteProgress;
--- a/packages/graphmod-tool/src/demo1/ExecuteProgressContent.js
+++ b/packages/graphmod-tool/src/demo1/ExecuteProgressContent.js
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Progress } from 'amos-framework';
+
+/**
+ * 立即执行进度
+ * @class ExecuteProgressContent
+ * @extends {ExecuteProgress}
+ */
+class ExecuteProgressContent extends Component {                                                                                   
+  constructor(props) {
+    super(props);
+    this.state = {
+      percent: 0,
+      status: 'running',
+      flag: false,
+      logs: []
+    };
+  }
+
+  componentDidMount() {
+    this.onMessage();
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.messageFlag !== this.props.messageFlag) {
+      this.onMessage();
+    }
+  }
+
+  onMessage = () => {
+    const { message } = this.props;
+    const { status, percent } = message || {};
+    if (status) {
+      const { logs } = this.state;
+      logs.push(message);
+      this.setState({ logs, percent, status }, () => {
+        this.scrollToBottom();
+      });
+    }
+  }
+
+  scrollToBottom = () => {
+    if (this.content && this.content.scrollHeight > this.content.clientHeight) {
+      const state = 10;
+      if (this.content.scrollHeight - this.content.clientHeight > state) {
+        this.content.scrollTop = this.content.scrollHeight - this.content.clientHeight;
+      }
+    }
+  }
+
+  render() {
+    const { logs, status, percent } = this.state;
+    return (
+      <div className="ig-execute-progress">
+        <Progress percent={percent} strokeWidth={16} status={status === 'error' ? 'exception' : status === 'finished' ? undefined : 'active'} />
+        <div className="ig-execute-progress-switch">进度详情</div>
+        <div className="ig-execute-progress-content" ref={node => this.content = node}>
+          <ul>
+            {
+              logs.map((e, index) => (
+                <li key={index} style={{ color: e.status === 'error' ? 'red' : '' }}>[{e.time}] {e.logInfo}{e.detail}</li>
+              ))
+            }
+          </ul>
+        </div>
+      </div>
+    );
+  }
+}
+
+ExecuteProgressContent.propTypes = {
+  messageFlag: PropTypes.number,
+  message: PropTypes.object
+};
+
+export default ExecuteProgressContent;
--- a/packages/graphmod-tool/src/demo1/ccs.js
+++ b/packages/graphmod-tool/src/demo1/ccs.js
+import mods1 from '@gm/graphmod-ccs';
+import mods2 from '@gm/graphmod-command';
+import { configs, initConfig } from './config';
+
+initConfig(configs);
+
+const graghmod = {
+  ...mods1,
+  ...mods2
+};
+
+export default graghmod;
--- a/packages/graphmod-tool/src/demo1/config.js
+++ b/packages/graphmod-tool/src/demo1/config.js
+// 根据不同项目引用不同子项目的config.json配置
+const configs = [
+  // { name: 'team', source: 'packages/graphmod-team/config.json' }
+];
+
+// 加载配置
+function initConfig() {
+  window.gmconfig = {};
+  configs.forEach(e => {
+    const version = window.hybridModular.version || '';
+    const prefix = version.includes('/') ? version : `/external/graphmod/${version}`;
+    fetch(`${prefix}/${e.name}.config.json`)
+      .then(respone => respone.json())
+      .then(d => {
+        window.gmconfig = { ...window.gmconfig, ...d || {} };
+      });
+  });
+}
+
+module.exports = {
+  configs,
+  initConfig
+};
--- a/packages/graphmod-tool/src/demo1/index.js
+++ b/packages/graphmod-tool/src/demo1/index.js
+
+import DeleteView from './DeleteView';
+import './index.scss';
+
+export default [
+  {
+    key: 'dataBase-delete',
+    component: DeleteView
+  }
+];
--- a/packages/graphmod-tool/src/demo1/index.scss
+++ b/packages/graphmod-tool/src/demo1/index.scss
+.ig-execute-progress {
+  .amos-progress {
+    margin-bottom: 12px;
+
+    &.amos-progress-status-exception {
+      .amos-progress-bg {
+        background-color: red;
+        border-radius: 0;
+      }
+    }
+
+    .amos-progress-inner {
+      background-image: linear-gradient(180deg, #eaeaea 0%, white 100%);
+      border: 1px solid #e6e6e6;
+      border-radius: 0;
+      box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16);
+    }
+
+    .amos-progress-bg {
+      background-color: #25ae16;
+      border-radius: 0;
+    }
+  }
+
+  &-switch {
+    margin-bottom: 18px;
+  }
+
+  &-content {
+    height: 300px;
+    padding: 15px 18px;
+    overflow-y: auto;
+    font-size: 13px;
+    line-height: 20px;
+    color: #0060ff;
+    border: 1px solid #e2e2e2;
+  }
+}
--- a/packages/graphmod-tool/src/demo1/tool.js
+++ b/packages/graphmod-tool/src/demo1/tool.js
+import mods1 from '@gm/graphmod-tool';
+import { configs, initConfig } from './config';
+
+initConfig(configs);
+
+const graghmod = {
+  ...mods1
+};
+
+export default graghmod;
--- a/packages/graphmod-tool/src/index.js
+++ b/packages/graphmod-tool/src/index.js
@@ -3,9 +3,11 @@ import { chainModResult } from 'amos-viz/lib/widgets/modLoader';
 import './index.scss';
 import './cssvar.scss';
 import Shifting from './siftingSort';
+import demo1 from './demo1';

 const IMods = [
-    ...Shifting
+  ...demo1,
+  ...Shifting
 ];

 export default chainModResult(IMods).mods;