git push --set-upstream origin czks1.0

Merge remote-tracking branch 'origin/相关方关联分公司功能' into corpSystem
# Conflicts: # src/views/keyprojects/outsourced/components/list.vue # src/views/xgf/audit/components/list.vue # src/views/xgf/flow_audit/index.vue # src/views/xgf/insert/components/corpInfoList.vue
2023-12-17 15:30:40 +08:00 · 2023-12-17 09:32:43 +08:00 · 2023-11-29 11:03:41 +08:00 · 2023-11-28 15:25:53 +08:00 · 2023-11-27 09:39:53 +08:00
742 changed files with 33362 additions and 134 deletions
--- a/index.html
+++ b/index.html
@ -9,6 +9,10 @@
    <link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.16.0/skins/default/aliplayer-min.css" />
    <script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
    <script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
    <script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>
    <script type="text/javascript" src="./static/map/cesium91/CustomCesiumSDK.js"></script>
    <link href="./static/map/cesium91/CesiumUnminified/Widgets/widgets.css" rel="stylesheet"/>
  </head>
  <body>
    <div id="app"></div>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -5,7 +5,7 @@
  "author": "",
  "private": true,
  "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.45",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.79",
    "start": "npm run dev",
    "unit": "jest --config test/unit/jest.conf.js --coverage",
    "e2e": "node test/e2e/runner.js",
@ -18,6 +18,7 @@
    "@jiaminghi/data-view": "^2.10.0",
    "@riophae/vue-treeselect": "^0.4.0",
    "axios": "^0.21.1",
    "cesium": "^1.112.0",
    "dayjs": "^1.11.10",
    "echarts": "^5.3.1",
    "element-ui": "^2.15.8",
@ -25,10 +26,11 @@
    "js-cookie": "^2.2.1",
    "jspdf": "^2.5.1",
    "moment": "^2.29.3",
-    "throttle-debounce": "^5.0.0",
+    "motion": "^10.16.4",
    "normalize.css": "^8.0.1",
    "nprogress": "^0.2.0",
    "relation-graph": "^1.1.0",
    "throttle-debounce": "^5.0.0",
    "video.js": "^7.19.2",
    "vue": "^2.5.2",
    "vue-baidu-map": "^0.21.22",
--- a/src/assets/map/anquan/bg1.png
+++ b/src/assets/map/anquan/bg1.png
--- a/src/assets/map/anquan/bg2.png
+++ b/src/assets/map/anquan/bg2.png
--- a/src/assets/map/anquan/bg3.png
+++ b/src/assets/map/anquan/bg3.png
--- a/src/assets/map/anquan/bg4.png
+++ b/src/assets/map/anquan/bg4.png
--- a/src/assets/map/anquan/ico1.png
+++ b/src/assets/map/anquan/ico1.png
--- a/src/assets/map/anquan/ico2.png
+++ b/src/assets/map/anquan/ico2.png
--- a/src/assets/map/anquan/ico3.png
+++ b/src/assets/map/anquan/ico3.png
--- a/src/assets/map/anquan/icobg.png
+++ b/src/assets/map/anquan/icobg.png
--- a/src/assets/map/anquan/label.png
+++ b/src/assets/map/anquan/label.png
--- a/src/assets/map/bianjie/img1.png
+++ b/src/assets/map/bianjie/img1.png
--- a/src/assets/map/bianjie/img2.png
+++ b/src/assets/map/bianjie/img2.png
--- a/src/assets/map/bianjie/videoimg1.png
+++ b/src/assets/map/bianjie/videoimg1.png
--- a/src/assets/map/gangkou_index/back.png
+++ b/src/assets/map/gangkou_index/back.png
--- a/src/assets/map/gangkou_index/bg1.png
+++ b/src/assets/map/gangkou_index/bg1.png
--- a/src/assets/map/gangkou_index/buttom/ico1.png
+++ b/src/assets/map/gangkou_index/buttom/ico1.png
--- a/src/assets/map/gangkou_index/buttom/ico10.png
+++ b/src/assets/map/gangkou_index/buttom/ico10.png
--- a/src/assets/map/gangkou_index/buttom/ico10_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico10_on.png
--- a/src/assets/map/gangkou_index/buttom/ico11.png
+++ b/src/assets/map/gangkou_index/buttom/ico11.png
--- a/src/assets/map/gangkou_index/buttom/ico11_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico11_on.png
--- a/src/assets/map/gangkou_index/buttom/ico12.png
+++ b/src/assets/map/gangkou_index/buttom/ico12.png
--- a/src/assets/map/gangkou_index/buttom/ico12_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico12_on.png
--- a/src/assets/map/gangkou_index/buttom/ico13.png
+++ b/src/assets/map/gangkou_index/buttom/ico13.png
--- a/src/assets/map/gangkou_index/buttom/ico13_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico13_on.png
--- a/src/assets/map/gangkou_index/buttom/ico14.png
+++ b/src/assets/map/gangkou_index/buttom/ico14.png
--- a/src/assets/map/gangkou_index/buttom/ico14_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico14_on.png
--- a/src/assets/map/gangkou_index/buttom/ico15.png
+++ b/src/assets/map/gangkou_index/buttom/ico15.png
--- a/src/assets/map/gangkou_index/buttom/ico15_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico15_on.png
--- a/src/assets/map/gangkou_index/buttom/ico16.png
+++ b/src/assets/map/gangkou_index/buttom/ico16.png
--- a/src/assets/map/gangkou_index/buttom/ico16_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico16_on.png
--- a/src/assets/map/gangkou_index/buttom/ico17.png
+++ b/src/assets/map/gangkou_index/buttom/ico17.png
--- a/src/assets/map/gangkou_index/buttom/ico17_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico17_on.png
--- a/src/assets/map/gangkou_index/buttom/ico18.png
+++ b/src/assets/map/gangkou_index/buttom/ico18.png
--- a/src/assets/map/gangkou_index/buttom/ico18_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico18_on.png
--- a/src/assets/map/gangkou_index/buttom/ico19.png
+++ b/src/assets/map/gangkou_index/buttom/ico19.png
--- a/src/assets/map/gangkou_index/buttom/ico19_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico19_on.png
--- a/src/assets/map/gangkou_index/buttom/ico1_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico1_on.png
--- a/src/assets/map/gangkou_index/buttom/ico2.png
+++ b/src/assets/map/gangkou_index/buttom/ico2.png
--- a/src/assets/map/gangkou_index/buttom/ico20.png
+++ b/src/assets/map/gangkou_index/buttom/ico20.png
--- a/src/assets/map/gangkou_index/buttom/ico20_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico20_on.png
--- a/src/assets/map/gangkou_index/buttom/ico21.png
+++ b/src/assets/map/gangkou_index/buttom/ico21.png
--- a/src/assets/map/gangkou_index/buttom/ico21_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico21_on.png
--- a/src/assets/map/gangkou_index/buttom/ico22.png
+++ b/src/assets/map/gangkou_index/buttom/ico22.png
--- a/src/assets/map/gangkou_index/buttom/ico22_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico22_on.png
--- a/src/assets/map/gangkou_index/buttom/ico23.png
+++ b/src/assets/map/gangkou_index/buttom/ico23.png
--- a/src/assets/map/gangkou_index/buttom/ico23_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico23_on.png
--- a/src/assets/map/gangkou_index/buttom/ico24.png
+++ b/src/assets/map/gangkou_index/buttom/ico24.png
--- a/src/assets/map/gangkou_index/buttom/ico24_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico24_on.png
--- a/src/assets/map/gangkou_index/buttom/ico25.png
+++ b/src/assets/map/gangkou_index/buttom/ico25.png
--- a/src/assets/map/gangkou_index/buttom/ico25_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico25_on.png
--- a/src/assets/map/gangkou_index/buttom/ico26.png
+++ b/src/assets/map/gangkou_index/buttom/ico26.png
--- a/src/assets/map/gangkou_index/buttom/ico26_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico26_on.png
--- a/src/assets/map/gangkou_index/buttom/ico2_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico2_on.png
--- a/src/assets/map/gangkou_index/buttom/ico3.png
+++ b/src/assets/map/gangkou_index/buttom/ico3.png
--- a/src/assets/map/gangkou_index/buttom/ico3_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico3_on.png
--- a/src/assets/map/gangkou_index/buttom/ico4.png
+++ b/src/assets/map/gangkou_index/buttom/ico4.png
--- a/src/assets/map/gangkou_index/buttom/ico4_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico4_on.png
--- a/src/assets/map/gangkou_index/buttom/ico5.png
+++ b/src/assets/map/gangkou_index/buttom/ico5.png
--- a/src/assets/map/gangkou_index/buttom/ico5_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico5_on.png
--- a/src/assets/map/gangkou_index/buttom/ico6.png
+++ b/src/assets/map/gangkou_index/buttom/ico6.png
--- a/src/assets/map/gangkou_index/buttom/ico6_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico6_on.png
--- a/src/assets/map/gangkou_index/buttom/ico7.png
+++ b/src/assets/map/gangkou_index/buttom/ico7.png
--- a/src/assets/map/gangkou_index/buttom/ico7_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico7_on.png
--- a/src/assets/map/gangkou_index/buttom/ico8.png
+++ b/src/assets/map/gangkou_index/buttom/ico8.png
--- a/src/assets/map/gangkou_index/buttom/ico8_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico8_on.png
--- a/src/assets/map/gangkou_index/buttom/ico9.png
+++ b/src/assets/map/gangkou_index/buttom/ico9.png
--- a/src/assets/map/gangkou_index/buttom/ico9_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico9_on.png
--- a/src/assets/map/gangkou_index/ico1.png
+++ b/src/assets/map/gangkou_index/ico1.png
--- a/src/assets/map/gangkou_index/ico2.png
+++ b/src/assets/map/gangkou_index/ico2.png
--- a/src/assets/map/gangkou_index/ico3.png
+++ b/src/assets/map/gangkou_index/ico3.png
--- a/src/assets/map/gangkou_index/img1.png
+++ b/src/assets/map/gangkou_index/img1.png
--- a/src/assets/map/gangkou_index/img10.png
+++ b/src/assets/map/gangkou_index/img10.png
--- a/src/assets/map/gangkou_index/img10_on.png
+++ b/src/assets/map/gangkou_index/img10_on.png
--- a/src/assets/map/gangkou_index/img11.png
+++ b/src/assets/map/gangkou_index/img11.png
--- a/src/assets/map/gangkou_index/img11_on.png
+++ b/src/assets/map/gangkou_index/img11_on.png
--- a/src/assets/map/gangkou_index/img1_on.png
+++ b/src/assets/map/gangkou_index/img1_on.png
--- a/src/assets/map/gangkou_index/img2_1.png
+++ b/src/assets/map/gangkou_index/img2_1.png
--- a/src/assets/map/gangkou_index/img2_2.png
+++ b/src/assets/map/gangkou_index/img2_2.png
--- a/src/assets/map/gangkou_index/img2_on.png
+++ b/src/assets/map/gangkou_index/img2_on.png
--- a/src/assets/map/gangkou_index/img2ico1.png
+++ b/src/assets/map/gangkou_index/img2ico1.png
--- a/src/assets/map/gangkou_index/img2ico2.png
+++ b/src/assets/map/gangkou_index/img2ico2.png
--- a/src/assets/map/gangkou_index/img2ico3.png
+++ b/src/assets/map/gangkou_index/img2ico3.png
--- a/src/assets/map/gangkou_index/img2ico4.png
+++ b/src/assets/map/gangkou_index/img2ico4.png
--- a/src/assets/map/gangkou_index/img3_on.png
+++ b/src/assets/map/gangkou_index/img3_on.png
--- a/src/assets/map/gangkou_index/img4.png
+++ b/src/assets/map/gangkou_index/img4.png
--- a/src/assets/map/gangkou_index/img4_on.png
+++ b/src/assets/map/gangkou_index/img4_on.png
--- a/src/assets/map/gangkou_index/img5.png
+++ b/src/assets/map/gangkou_index/img5.png
--- a/src/assets/map/gangkou_index/img5_on.png
+++ b/src/assets/map/gangkou_index/img5_on.png
--- a/src/assets/map/gangkou_index/img6.png
+++ b/src/assets/map/gangkou_index/img6.png
--- a/src/assets/map/gangkou_index/img6_on.png
+++ b/src/assets/map/gangkou_index/img6_on.png
--- a/src/assets/map/gangkou_index/img7.png
+++ b/src/assets/map/gangkou_index/img7.png
--- a/src/assets/map/gangkou_index/img7_on.png
+++ b/src/assets/map/gangkou_index/img7_on.png
--- a/src/assets/map/gangkou_index/img8.png
+++ b/src/assets/map/gangkou_index/img8.png
--- a/src/assets/map/gangkou_index/img8_on.png
+++ b/src/assets/map/gangkou_index/img8_on.png
--- a/src/assets/map/gangkou_index/img9.png
+++ b/src/assets/map/gangkou_index/img9.png
--- a/src/assets/map/gangkou_index/img9_on.png
+++ b/src/assets/map/gangkou_index/img9_on.png
--- a/src/assets/map/gangkou_index/point/cfd_ico3.png
+++ b/src/assets/map/gangkou_index/point/cfd_ico3.png
--- a/src/assets/map/gangkou_index/point/ico1.png
+++ b/src/assets/map/gangkou_index/point/ico1.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dearlin	66a1b86595	git push --set-upstream origin czks1.0	2023-12-17 15:30:40 +08:00
dearlin	1a389db537	Merge remote-tracking branch 'origin/相关方关联分公司功能' into corpSystem # Conflicts: # src/views/keyprojects/outsourced/components/list.vue # src/views/xgf/audit/components/list.vue # src/views/xgf/flow_audit/index.vue # src/views/xgf/insert/components/corpInfoList.vue	2023-12-17 09:32:43 +08:00
dearlin	44687ab203	add: 权限配置	2023-11-29 11:03:41 +08:00
dearlin	0776f090ed	add: 分公司系统管理（菜单角色权限）	2023-11-28 15:25:53 +08:00
dearlin	8fa17b32d1	add: 分公司系统管理（菜单角色权限）	2023-11-27 09:39:53 +08:00