Kaynağa Gözat

Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into tjj

# Conflicts:
#	public/static/config/modeConfig.js
#	src/router/index.js
#	src/views/HealthControl/Health0.vue
#	src/views/HealthControl/Health8.vue
#	src/views/WindSite/pages/Home/Home.vue
#	src/views/layout/Menu.vue
darker 3 yıl önce
ebeveyn
işleme
d4961d5d72
100 değiştirilmiş dosya ile 2073 ekleme ve 259 silme
  1. 1 0
      .gitignore
  2. 1 0
      package.json
  3. BIN
      public/static/3d/beam-texture.png
  4. 747 0
      public/static/3d/fanvar.gltf
  5. BIN
      public/static/3d/fanvar_binary.bin
  6. 535 0
      public/static/3d/lightvar.gltf
  7. BIN
      public/static/3d/lightvar_binary.bin
  8. 6 2
      public/static/config/modeConfig.js
  9. BIN
      public/static/img/miss日报.png
  10. BIN
      public/static/img/oa日报.png
  11. BIN
      public/static/img/新能源日报.png
  12. BIN
      public/static/img/新能源生产月报.png
  13. BIN
      public/static/img/牛首山生产月报.png
  14. BIN
      public/static/img/石板泉生产月报.png
  15. BIN
      public/static/img/青山生产月报.png
  16. BIN
      public/static/img/麻黄山生产月报.png
  17. 9 8
      src/App.vue
  18. 5 7
      src/api/axios.js
  19. 167 189
      src/assets/dataService/arcgis-nx-fc1-line.json
  20. 570 52
      src/assets/dataService/arcgis-nx-fc1.json
  21. 1 0
      src/assets/icon/svg/iac/iac-aq.svg
  22. 1 0
      src/assets/icon/svg/iac/iac-dj.svg
  23. 1 0
      src/assets/icon/svg/iac/iac-jc.svg
  24. 1 0
      src/assets/icon/svg/iac/iac-jj.svg
  25. 1 0
      src/assets/icon/svg/iac/iac-oa.svg
  26. 1 0
      src/assets/icon/svg/iac/iac-p.svg
  27. 1 0
      src/assets/icon/svg/iac/iac-wz.svg
  28. 1 0
      src/assets/icon/svg/iac/iac-yx.svg
  29. 3 0
      src/assets/icon/svg/knowledge/knowledge-bar.svg
  30. 4 0
      src/assets/icon/svg/knowledge/knowledge-file.svg
  31. 3 0
      src/assets/icon/svg/knowledge/knowledge-nerve-net.svg
  32. 5 0
      src/assets/icon/svg/knowledge/knowledge-professor.svg
  33. 1 0
      src/assets/icon/svg/weather/天气1.svg
  34. 1 0
      src/assets/icon/svg/weather/日出1.svg
  35. 1 0
      src/assets/icon/svg/weather/日落1.svg
  36. 1 0
      src/assets/icon/svg/weather/气压1.svg
  37. 1 0
      src/assets/icon/svg/weather/温度1.svg
  38. 1 0
      src/assets/icon/svg/weather/湿度1.svg
  39. 1 0
      src/assets/icon/svg/weather/风速.svg
  40. 1 0
      src/assets/icon/svg/功率.svg
  41. 1 1
      src/assets/icon/svg/风机.svg
  42. BIN
      src/assets/person/丁冬.jpg
  43. BIN
      src/assets/person/丁卫青.jpg
  44. BIN
      src/assets/person/丁荣.jpg
  45. BIN
      src/assets/person/于庆龙.jpg
  46. BIN
      src/assets/person/于靖.jpg
  47. BIN
      src/assets/person/付增业.jpg
  48. BIN
      src/assets/person/任文.jpg
  49. BIN
      src/assets/person/余文江.jpg
  50. BIN
      src/assets/person/侯宗玖.jpg
  51. BIN
      src/assets/person/侯明林.jpg
  52. BIN
      src/assets/person/候晨.jpg
  53. BIN
      src/assets/person/刘学民.jpg
  54. BIN
      src/assets/person/刘新庆.jpg
  55. BIN
      src/assets/person/刘辉.jpg
  56. BIN
      src/assets/person/包继军.jpg
  57. BIN
      src/assets/person/吴凯泽.jpg
  58. BIN
      src/assets/person/周伟民.jpg
  59. BIN
      src/assets/person/周暾中.jpg
  60. BIN
      src/assets/person/周杨.jpg
  61. BIN
      src/assets/person/夏天.jpg
  62. BIN
      src/assets/person/孙振波.jpg
  63. BIN
      src/assets/person/孙谦.jpg
  64. BIN
      src/assets/person/常博.jpg
  65. BIN
      src/assets/person/张亮.jpg
  66. BIN
      src/assets/person/张剑荣.jpg
  67. BIN
      src/assets/person/张力涛.jpg
  68. BIN
      src/assets/person/张延明.jpg
  69. BIN
      src/assets/person/张强.jpg
  70. BIN
      src/assets/person/张彦.jpg
  71. BIN
      src/assets/person/张文.jpg
  72. BIN
      src/assets/person/张曲洋.jpg
  73. BIN
      src/assets/person/张涛.jpg
  74. BIN
      src/assets/person/张渊.jpg
  75. BIN
      src/assets/person/张炘渊.jpg
  76. BIN
      src/assets/person/张瑞祥.jpg
  77. BIN
      src/assets/person/张银涛.jpg
  78. BIN
      src/assets/person/彭宁宁.jpg
  79. BIN
      src/assets/person/徐瑞.jpg
  80. BIN
      src/assets/person/方超.jpg
  81. BIN
      src/assets/person/暴光.jpg
  82. BIN
      src/assets/person/朱利宏.jpg
  83. BIN
      src/assets/person/李保.jpg
  84. BIN
      src/assets/person/李占国.jpg
  85. BIN
      src/assets/person/李小慧.jpg
  86. BIN
      src/assets/person/李岩.jpg
  87. BIN
      src/assets/person/李振林.jpg
  88. BIN
      src/assets/person/李明(小).jpg
  89. BIN
      src/assets/person/李明.jpg
  90. BIN
      src/assets/person/李浩桐.jpg
  91. BIN
      src/assets/person/李腾军.jpg
  92. BIN
      src/assets/person/杜锋.jpg
  93. BIN
      src/assets/person/杨兴成.jpg
  94. BIN
      src/assets/person/杨博荣.jpg
  95. BIN
      src/assets/person/杨建军.jpg
  96. BIN
      src/assets/person/杨志旗.jpg
  97. BIN
      src/assets/person/杨治涛.jpg
  98. BIN
      src/assets/person/栾旭良.jpg
  99. BIN
      src/assets/person/段乐伟.jpg
  100. 0 0
      src/assets/person/海利.jpg

+ 1 - 0
.gitignore

@@ -1,5 +1,6 @@
 node_modules
 dist
+dist.rar
 webpack.config.js
 .vscode
 .vscode/

+ 1 - 0
package.json

@@ -19,6 +19,7 @@
     "file-saver": "^2.0.5",
     "font-awesome": "^4.7.0",
     "html2canvas": "^1.0.0-rc.7",
+    "jquery": "^3.6.0",
     "jspdf": "^2.3.1",
     "stompjs": "^2.3.3",
     "three": "^0.129.0",

BIN
public/static/3d/beam-texture.png


+ 747 - 0
public/static/3d/fanvar.gltf

@@ -0,0 +1,747 @@
+{
+    "asset": {
+        "copyright": "2020 (c) Adobe Inc.",
+        "generator": "Adobe Dimension - a39c749b7f1dd68e8fcb597e3575f0bb9d09bfc8",
+        "version": "2.0"
+    },
+    "accessors": [
+        {
+            "bufferView": 0,
+            "componentType": 5126,
+            "count": 13056,
+            "type": "VEC3",
+            "max": [
+                0.011221112683415413,
+                0.11740083247423172,
+                0.02024685963988304
+            ],
+            "min": [
+                -0.013411412015557289,
+                -0.07223401963710785,
+                0.0027049516793340446
+            ]
+        },
+        {
+            "bufferView": 1,
+            "componentType": 5126,
+            "count": 13056,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 2,
+            "componentType": 5126,
+            "count": 13056,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 3,
+            "componentType": 5125,
+            "count": 13056,
+            "type": "SCALAR",
+            "max": [
+                13055.0
+            ],
+            "min": [
+                0.0
+            ]
+        },
+        {
+            "bufferView": 4,
+            "componentType": 5126,
+            "count": 204,
+            "type": "VEC3",
+            "max": [
+                0.0033453553915023805,
+                0.004675381816923618,
+                0.038124099373817447
+            ],
+            "min": [
+                -0.0032793614082038404,
+                -0.0018486910266801715,
+                -0.00942382775247097
+            ]
+        },
+        {
+            "bufferView": 5,
+            "componentType": 5126,
+            "count": 204,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 6,
+            "componentType": 5126,
+            "count": 204,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 7,
+            "componentType": 5125,
+            "count": 204,
+            "type": "SCALAR",
+            "max": [
+                203.0
+            ],
+            "min": [
+                0.0
+            ]
+        },
+        {
+            "bufferView": 8,
+            "componentType": 5126,
+            "count": 756,
+            "type": "VEC3",
+            "max": [
+                0.014427456073462963,
+                0.014790236949920655,
+                0.036329951137304309
+            ],
+            "min": [
+                -0.013931798748672009,
+                -0.014883722178637982,
+                -0.04279765114188194
+            ]
+        },
+        {
+            "bufferView": 9,
+            "componentType": 5126,
+            "count": 756,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 10,
+            "componentType": 5126,
+            "count": 756,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 11,
+            "componentType": 5125,
+            "count": 756,
+            "type": "SCALAR",
+            "max": [
+                755.0
+            ],
+            "min": [
+                0.0
+            ]
+        },
+        {
+            "bufferView": 12,
+            "componentType": 5126,
+            "count": 96,
+            "type": "VEC3",
+            "max": [
+                0.002180294832214713,
+                0.002180294832214713,
+                0.0017989004263654352
+            ],
+            "min": [
+                -0.0021802950650453569,
+                -0.002180294832214713,
+                0.00009284965199185535
+            ]
+        },
+        {
+            "bufferView": 13,
+            "componentType": 5126,
+            "count": 96,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 14,
+            "componentType": 5126,
+            "count": 96,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 15,
+            "componentType": 5125,
+            "count": 96,
+            "type": "SCALAR",
+            "max": [
+                95.0
+            ],
+            "min": [
+                0.0
+            ]
+        },
+        {
+            "bufferView": 16,
+            "componentType": 5126,
+            "count": 216,
+            "type": "VEC3",
+            "max": [
+                0.00047969480510801077,
+                0.0004724071768578142,
+                0.002878570696339011
+            ],
+            "min": [
+                -0.00047969480510801077,
+                -0.00047240720596164465,
+                0.0
+            ]
+        },
+        {
+            "bufferView": 17,
+            "componentType": 5126,
+            "count": 216,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 18,
+            "componentType": 5126,
+            "count": 216,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 19,
+            "componentType": 5125,
+            "count": 216,
+            "type": "SCALAR",
+            "max": [
+                215.0
+            ],
+            "min": [
+                0.0
+            ]
+        },
+        {
+            "bufferView": 20,
+            "componentType": 5126,
+            "count": 2304,
+            "type": "VEC3",
+            "max": [
+                0.10547731816768646,
+                0.10547731816768646,
+                0.003030103398486972
+            ],
+            "min": [
+                -0.10547731816768646,
+                -0.10547731816768646,
+                0.0
+            ]
+        },
+        {
+            "bufferView": 21,
+            "componentType": 5126,
+            "count": 2304,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 22,
+            "componentType": 5126,
+            "count": 2304,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 23,
+            "componentType": 5125,
+            "count": 2304,
+            "type": "SCALAR",
+            "max": [
+                2303.0
+            ],
+            "min": [
+                0.0
+            ]
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 156672,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 156672,
+            "byteLength": 156672,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 313344,
+            "byteLength": 104448,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 417792,
+            "byteLength": 52224,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 470016,
+            "byteLength": 2448,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 472464,
+            "byteLength": 2448,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 474912,
+            "byteLength": 1632,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 476544,
+            "byteLength": 816,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 477360,
+            "byteLength": 9072,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 486432,
+            "byteLength": 9072,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 495504,
+            "byteLength": 6048,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 501552,
+            "byteLength": 3024,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 504576,
+            "byteLength": 1152,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 505728,
+            "byteLength": 1152,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 506880,
+            "byteLength": 768,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 507648,
+            "byteLength": 384,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 508032,
+            "byteLength": 2592,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 510624,
+            "byteLength": 2592,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 513216,
+            "byteLength": 1728,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 514944,
+            "byteLength": 864,
+            "target": 34963
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 515808,
+            "byteLength": 27648,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 543456,
+            "byteLength": 27648,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 571104,
+            "byteLength": 18432,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 589536,
+            "byteLength": 9216,
+            "target": 34963
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 598752,
+            "uri": "fanvar_binary.bin"
+        }
+    ],
+    "cameras": [
+        {
+            "perspective": {
+                "znear": 0.00018717249622568488,
+                "yfov": 0.6024156808853149,
+                "zfar": 10.294486999511719,
+                "aspectRatio": 1.3333333730697632
+            },
+            "type": "perspective",
+            "name": "render_camera"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "metallicFactor": 0.0,
+                "roughnessFactor": 0.6000000238418579
+            },
+            "name": "25215",
+            "doubleSided": true
+        }
+    ],
+    "meshes": [
+        {
+            "name": "Box719",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Cylinder881",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 4,
+                        "NORMAL": 5,
+                        "TEXCOORD_0": 6
+                    },
+                    "indices": 7,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Cylinder882",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 9,
+                        "POSITION": 8,
+                        "TEXCOORD_0": 10
+                    },
+                    "indices": 11,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Cone277",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 12,
+                        "NORMAL": 13,
+                        "TEXCOORD_0": 14
+                    },
+                    "indices": 15,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Cylinder883",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 17,
+                        "POSITION": 16,
+                        "TEXCOORD_0": 18
+                    },
+                    "indices": 19,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box720",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box721",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Cylinder884",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 20,
+                        "NORMAL": 21,
+                        "TEXCOORD_0": 22
+                    },
+                    "indices": 23,
+                    "material": 0
+                }
+            ]
+        }
+    ],
+    "nodes": [
+        {
+            "translation": [
+                -11.440691947937012,
+                -1.1253594160079957,
+                11.870344161987305
+            ],
+            "rotation": [
+                -0.12059047073125839,
+                0.379409521818161,
+                0.04995020851492882,
+                0.9159756302833557
+            ],
+            "scale": [
+                1.0,
+                1.0,
+                0.9999999403953552
+            ],
+            "camera": 0,
+            "name": "render_camera_n3d"
+        },
+        {
+            "children": [
+                2
+            ],
+            "translation": [
+                -11.940691947937012,
+                -1.4253594875335694,
+                11.370344161987305
+            ],
+            "name": "fanvar"
+        },
+        {
+            "children": [
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10
+            ],
+            "translation": [
+                11.940667152404786,
+                5.136477947235107,
+                -11.370344161987305
+            ],
+            "rotation": [
+                -0.7071067690849304,
+                0.0,
+                0.0,
+                0.7071067690849304
+            ],
+            "scale": [
+                100.0,
+                100.0,
+                100.0
+            ],
+            "name": "fan"
+        },
+        {
+            "translation": [
+                0.013397247530519963,
+                -0.005721631925553083,
+                0.0017039866652339697
+            ],
+            "rotation": [
+                0.18382014334201814,
+                0.6827958822250366,
+                -0.6827934980392456,
+                0.18382878601551057
+            ],
+            "scale": [
+                0.15742753446102143,
+                0.15742753446102143,
+                0.15326982736587525
+            ],
+            "mesh": 0,
+            "name": "Box719"
+        },
+        {
+            "translation": [
+                0.006399879232048988,
+                -0.0013367461506277323,
+                -0.0275834072381258
+            ],
+            "mesh": 1,
+            "name": "Cylinder881"
+        },
+        {
+            "translation": [
+                0.006413211580365896,
+                -0.00017086027946788818,
+                0.010534534230828286
+            ],
+            "rotation": [
+                0.6996442079544067,
+                0.10246176272630692,
+                -0.10246184468269348,
+                0.699643611907959
+            ],
+            "scale": [
+                0.15742747485637666,
+                0.15742747485637666,
+                0.15742747485637666
+            ],
+            "mesh": 2,
+            "name": "Cylinder882"
+        },
+        {
+            "translation": [
+                0.006461353041231632,
+                -0.008173293434083462,
+                0.010590333491563797
+            ],
+            "rotation": [
+                0.6500799655914307,
+                -0.27820178866386416,
+                0.27820196747779848,
+                0.6500795483589172
+            ],
+            "scale": [
+                1.0,
+                1.0,
+                2.4167239665985109
+            ],
+            "mesh": 3,
+            "name": "Cone277"
+        },
+        {
+            "translation": [
+                0.006452121771872044,
+                -0.00868171639740467,
+                0.0104585075750947
+            ],
+            "rotation": [
+                -0.49999988079071047,
+                -0.5000001192092896,
+                -0.49999988079071047,
+                0.5000001192092896
+            ],
+            "mesh": 4,
+            "name": "Cylinder883"
+        },
+        {
+            "translation": [
+                0.010709802620112896,
+                -0.005721667315810919,
+                0.02103104256093502
+            ],
+            "rotation": [
+                0.683228611946106,
+                0.1822049766778946,
+                -0.18219634890556336,
+                0.6832308769226074
+            ],
+            "scale": [
+                0.15742753446102143,
+                0.15742753446102143,
+                0.15326984226703645
+            ],
+            "mesh": 5,
+            "name": "Box720"
+        },
+        {
+            "translation": [
+                -0.004684195853769779,
+                -0.0057218605652451519,
+                0.009040119126439095
+            ],
+            "rotation": [
+                0.49940842390060427,
+                -0.5005908608436585,
+                0.5005971789360046,
+                0.49940213561058047
+            ],
+            "scale": [
+                0.15742753446102143,
+                0.15742753446102143,
+                0.15326984226703645
+            ],
+            "mesh": 6,
+            "name": "Box721"
+        },
+        {
+            "translation": [
+                0.006561756134033203,
+                0.0,
+                -0.03711118549108505
+            ],
+            "scale": [
+                0.15742747485637666,
+                0.15742747485637666,
+                0.15742747485637666
+            ],
+            "mesh": 7,
+            "name": "Cylinder884"
+        }
+    ],
+    "scenes": [
+        {
+            "nodes": [
+                0,
+                1
+            ],
+            "name": "scene"
+        }
+    ],
+    "scene": 0
+}

BIN
public/static/3d/fanvar_binary.bin


+ 535 - 0
public/static/3d/lightvar.gltf

@@ -0,0 +1,535 @@
+{
+    "asset": {
+        "copyright": "2020 (c) Adobe Inc.",
+        "generator": "Adobe Dimension - a39c749b7f1dd68e8fcb597e3575f0bb9d09bfc8",
+        "version": "2.0"
+    },
+    "accessors": [
+        {
+            "bufferView": 0,
+            "componentType": 5126,
+            "count": 36,
+            "type": "VEC3",
+            "max": [
+                0.010735392570495606,
+                0.004967136308550835,
+                0.004486432299017906
+            ],
+            "min": [
+                -0.010735392570495606,
+                -0.004967136308550835,
+                0.0
+            ]
+        },
+        {
+            "bufferView": 1,
+            "componentType": 5126,
+            "count": 36,
+            "type": "VEC3"
+        },
+        {
+            "bufferView": 2,
+            "componentType": 5126,
+            "count": 36,
+            "type": "VEC2"
+        },
+        {
+            "bufferView": 3,
+            "componentType": 5125,
+            "count": 36,
+            "type": "SCALAR",
+            "max": [
+                35.0
+            ],
+            "min": [
+                0.0
+            ]
+        }
+    ],
+    "bufferViews": [
+        {
+            "buffer": 0,
+            "byteOffset": 0,
+            "byteLength": 432,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 432,
+            "byteLength": 432,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 864,
+            "byteLength": 288,
+            "target": 34962
+        },
+        {
+            "buffer": 0,
+            "byteOffset": 1152,
+            "byteLength": 144,
+            "target": 34963
+        }
+    ],
+    "buffers": [
+        {
+            "byteLength": 1296,
+            "uri": "lightvar_binary.bin"
+        }
+    ],
+    "cameras": [
+        {
+            "perspective": {
+                "znear": 0.00023857674386817962,
+                "yfov": 0.6024156808853149,
+                "zfar": 13.121721267700196,
+                "aspectRatio": 1.3333333730697632
+            },
+            "type": "perspective",
+            "name": "render_camera"
+        }
+    ],
+    "materials": [
+        {
+            "pbrMetallicRoughness": {
+                "baseColorFactor": [
+                    0.0,
+                    0.016807375475764276,
+                    0.05612849444150925,
+                    1.0
+                ],
+                "metallicFactor": 0.0,
+                "roughnessFactor": 0.7071067690849304
+            },
+            "name": "12 - Default",
+            "doubleSided": true
+        }
+    ],
+    "meshes": [
+        {
+            "name": "Box659",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box662",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box660",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box663",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box666",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box665",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box661",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box668",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box669",
+            "primitives": [
+                {
+                    "attributes": {
+                        "NORMAL": 1,
+                        "POSITION": 0,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box664",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box667",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        },
+        {
+            "name": "Box670",
+            "primitives": [
+                {
+                    "attributes": {
+                        "POSITION": 0,
+                        "NORMAL": 1,
+                        "TEXCOORD_0": 2
+                    },
+                    "indices": 3,
+                    "material": 0
+                }
+            ]
+        }
+    ],
+    "nodes": [
+        {
+            "translation": [
+                0.22498351335525514,
+                0.39790037274360659,
+                35.385826110839847
+            ],
+            "rotation": [
+                -0.12059047073125839,
+                0.379409521818161,
+                0.04995020851492882,
+                0.9159756302833557
+            ],
+            "scale": [
+                1.0,
+                1.0,
+                0.9999999403953552
+            ],
+            "camera": 0,
+            "name": "render_camera_n3d"
+        },
+        {
+            "children": [
+                2
+            ],
+            "translation": [
+                -0.2750164866447449,
+                0.0979003757238388,
+                34.885826110839847
+            ],
+            "name": "light"
+        },
+        {
+            "children": [
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14
+            ],
+            "translation": [
+                0.2750164270401001,
+                0.1264212280511856,
+                -34.88582992553711
+            ],
+            "rotation": [
+                -0.7071067690849304,
+                0.0,
+                0.0,
+                0.7071067690849304
+            ],
+            "scale": [
+                100.0,
+                100.0,
+                100.0
+            ],
+            "name": "light"
+        },
+        {
+            "translation": [
+                0.021191921085119249,
+                0.035402219742536548,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.14833155274391175,
+                0.9889376759529114
+            ],
+            "mesh": 0,
+            "name": "Box659"
+        },
+        {
+            "translation": [
+                0.01723325625061989,
+                0.02250267006456852,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.14833155274391175,
+                0.9889376759529114
+            ],
+            "mesh": 1,
+            "name": "Box662"
+        },
+        {
+            "translation": [
+                -0.0013512963196262718,
+                0.04179275408387184,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.14833155274391175,
+                0.9889376759529114
+            ],
+            "mesh": 2,
+            "name": "Box660"
+        },
+        {
+            "translation": [
+                -0.005161983892321587,
+                0.029375456273555757,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.14833155274391175,
+                0.9889376759529114
+            ],
+            "mesh": 3,
+            "name": "Box663"
+        },
+        {
+            "translation": [
+                -0.009120659902691841,
+                0.01647598296403885,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.14833155274391175,
+                0.9889376759529114
+            ],
+            "mesh": 4,
+            "name": "Box666"
+        },
+        {
+            "translation": [
+                0.013274568133056164,
+                0.009603194892406464,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.14833155274391175,
+                0.9889376759529114
+            ],
+            "mesh": 5,
+            "name": "Box665"
+        },
+        {
+            "translation": [
+                -0.01662297546863556,
+                -0.012505950406193734,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.09154288470745087,
+                0.9958011507987976
+            ],
+            "mesh": 6,
+            "name": "Box661"
+        },
+        {
+            "translation": [
+                0.0071365367621183399,
+                -0.016811523586511613,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.09154288470745087,
+                0.9958011507987976
+            ],
+            "mesh": 7,
+            "name": "Box668"
+        },
+        {
+            "translation": [
+                0.004712914116680622,
+                -0.02988225780427456,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.09154288470745087,
+                0.9958011507987976
+            ],
+            "mesh": 8,
+            "name": "Box669"
+        },
+        {
+            "translation": [
+                -0.019046595320105554,
+                -0.025576705113053323,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.09154288470745087,
+                0.9958011507987976
+            ],
+            "mesh": 9,
+            "name": "Box664"
+        },
+        {
+            "translation": [
+                -0.021451115608215333,
+                -0.03854431211948395,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.09154288470745087,
+                0.9958011507987976
+            ],
+            "mesh": 10,
+            "name": "Box667"
+        },
+        {
+            "translation": [
+                0.0023083947598934175,
+                -0.04284980520606041,
+                -0.002243216149508953
+            ],
+            "rotation": [
+                0.0,
+                0.0,
+                -0.09154288470745087,
+                0.9958011507987976
+            ],
+            "mesh": 11,
+            "name": "Box670"
+        }
+    ],
+    "scenes": [
+        {
+            "nodes": [
+                0,
+                1
+            ],
+            "name": "scene"
+        }
+    ],
+    "scene": 0
+}

BIN
public/static/3d/lightvar_binary.bin


+ 6 - 2
public/static/config/modeConfig.js

@@ -7,8 +7,11 @@ let baseURL = null;
 // websocket 服务器地址
 let websocketUrl = null;
 
+// 适配器地址
+const adapterUrl = "http://10.155.32.4:8011/";
+
 if (localTest) {
-    baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
+    baseURL = "http://192.168.10.13:8082/" // 联机调试 - 石林
         // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
 } else {
     baseURL = "http://10.155.32.4:8082/" // 正式环境
@@ -18,5 +21,6 @@ websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket"
 
 window.__MODE__ = {
     baseURL,
-    websocketUrl
+    websocketUrl,
+    adapterUrl
 };

BIN
public/static/img/miss日报.png


BIN
public/static/img/oa日报.png


BIN
public/static/img/新能源日报.png


BIN
public/static/img/新能源生产月报.png


BIN
public/static/img/牛首山生产月报.png


BIN
public/static/img/石板泉生产月报.png


BIN
public/static/img/青山生产月报.png


BIN
public/static/img/麻黄山生产月报.png


+ 9 - 8
src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-if="isLogined" class="main">
     <div class="header-body">
-      <div class="header-title">
+      <div class="header-title" @mouseenter="showMenu">
         <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16.667vh" height="3.704vh" viewBox="0 0 377.437 91.615" enable-background="new 0 0 377.437 91.615" xml:space="preserve">
           <g id="图层_1">
             <g>
@@ -172,8 +172,8 @@ l16.229-16.229l16.229,16.229l42.867-42.867C115.034,45.228,109.133,42.189,102.956
       </div>
       <div class="header-menu-body"><Header @onMenuClick="HeaderMenuClick" /></div>
     </div>
-    <div class="menu-body" @mouseenter="showMenu" @mouseleave="hideMenu"><Menu :root="root" /></div>
-    <div class="main-body" :class="{ 'show-menu': isShowMenu }">
+    <div class="menu-body" :class="{ hover: isShowMenu }" @mouseenter="showMenu" @mouseleave="hideMenu"><Menu :root="root" /></div>
+    <div class="main-body">
       <router-view />
     </div>
   </div>
@@ -223,10 +223,10 @@ export default {
             method: "POST", // 请求方式,默认为 GET ,可缺省
             subUrl: "admin/usermenu", // 请求接口地址,必传项
             success() {
-              that.BASE.showMsg({
-                msg: "登陆成功",
-                type: "success",
-              });
+              // that.BASE.showMsg({
+              //   msg: "登陆成功",
+              //   type: "success",
+              // });
               // that.$router.push('/'); // 跳转到首页
             },
           });
@@ -324,7 +324,8 @@ body {
     transition-timing-function: ease-in;
     transform: translate(-@menuWidth);
 
-    &:hover {
+    &:hover,
+    &.hover {
       opacity: 1;
       transition: opacity 0.2s;
       transition-timing-function: ease-out;

+ 5 - 7
src/api/axios.js

@@ -9,7 +9,7 @@ axios.defaults.withCredentials = true;
  * @param {Object} options 详细配置项,使用方法与所有配置项说明如下:
 
   this.API.requestData({
-    isMust: true, // 请求是否携带 token ,默认为 true ,可缺省
+    isMust: true, // 请求是否携带 token ,默认为 true ,可缺省 
     showLoading: false, // 请求是否显示加载中遮罩层,默认 false ,可缺省
     method: "GET", // 请求方式,默认为 GET ,可缺省
     baseURL: "http://192.168.10.23:8082/", // 请求服务器地址 + 端口,可缺省
@@ -25,7 +25,7 @@ axios.defaults.withCredentials = true;
   });
 
  */
-export function requestData (options) {
+export function requestData(options) {
   return new Promise((resolve, reject) => {
 
     if (options.showLoading) {
@@ -49,7 +49,7 @@ export function requestData (options) {
       withCredentials: true,
       crossDomain: true,
       baseURL: options.baseURL || window.__MODE__.baseURL || '/api/',
-      timeout: options.timeout || 3000, // 请求超时时间 - 3s
+      timeout: options.timeout || 30000, // 请求超时时间 - 3s
     });
 
     // 请求拦截器
@@ -81,10 +81,8 @@ export function requestData (options) {
           msg: (response.data && response.data.msg) || ("请求出错[" + response.data.code + "]")
         });
 
-        setTimeout(() => {
-          // window.location.reload();
-          // window.__STATICVUE__.$router.replace('/login');
-        }, 1000);
+        // window.location.reload();
+        // window.__STATICVUE__.$router.replace('/login');
 
       } else if (response.data.code === 200) { // 请求成功 code
 

+ 167 - 189
src/assets/dataService/arcgis-nx-fc1-line.json

@@ -6,57 +6,54 @@
             },
             "paths": [
                 [
-                    [
-                        106.478161812,
-                        37.769397497
-                    ],
-                    [
-                        106.47877335499999,
-                        37.76933312400001
-                    ],
-                    [
-                        106.48048996900002,
-                        37.768034935
-                    ],
-                    [
-                        106.48259282100003,
-                        37.76651143999999
-                    ],
-                    [
-                        106.48214221,
-                        37.76623249099998
-                    ],
-                    [
-                        106.48159503900001,
-                        37.766114473000016
-                    ],
-                    [
-                        106.48064017299998,
-                        37.76544928599998
-                    ],
-                    [
-                        106.48048996900002,
-                        37.76524543800002
-                    ],
-                    [
-                        106.480082273,
-                        37.76525616599997
-                    ],
-                    [
-                        106.479460001,
-                        37.76491284399998
-                    ],
-                    [
-                        106.47456765200002,
-                        37.767809629
-                    ]
+                    107.0644069,
+                    37.30000218
+                ],
+                [
+                    107.0609736,
+                    37.29027221
+                ],
+                [
+                    107.0545363,
+                    37.29431798
+                ],
+                [
+                    107.0488715,
+                    37.29385708
+                ],
+                [
+                    107.04561,
+                    37.29752713
+                ],
+                [
+                    107.0409322,
+                    37.30025821
+                ],
+                [
+                    107.0374346,
+                    37.30382554
+                ],
+                [
+                    107.0325208,
+                    37.30630038
+                ],
+                [
+                    107.0349455,
+                    37.30909941
+                ],
+                [
+                    107.0286155,
+                    37.30956022
+                ],
+                [
+                    107.0238519,
+                    37.31106208
                 ]
             ]
         },
         "symbol": null,
         "attributes": {
-            "objectid": 1,
-            "fc_code": "fc01",
+            "fc_code": "MHS",
             "width": 3
         },
         "popupTemplate": null
@@ -68,103 +65,54 @@
             },
             "paths": [
                 [
-                    [
-                        106.47422432899998,
-                        37.76701569599999
-                    ],
-                    [
-                        106.47382736200001,
-                        37.76769161200002
-                    ],
-                    [
-                        106.47189617200002,
-                        37.76813149499998
-                    ],
-                    [
-                        106.47135973000002,
-                        37.768346070999996
-                    ],
-                    [
-                        106.47315144499998,
-                        37.764998674000026
-                    ],
-                    [
-                        106.47131681399998,
-                        37.763625382999976
-                    ],
-                    [
-                        106.469578743,
-                        37.763464451000004
-                    ],
-                    [
-                        106.46923542000002,
-                        37.764022350000005
-                    ],
-                    [
-                        106.46859168999998,
-                        37.76418328300002
-                    ],
-                    [
-                        106.46682143200002,
-                        37.765395641
-                    ],
-                    [
-                        106.464782953,
-                        37.76680111899998
-                    ],
-                    [
-                        106.46432161299998,
-                        37.76714444200002
-                    ],
-                    [
-                        106.46397829099999,
-                        37.76769161200002
-                    ],
-                    [
-                        106.463989019,
-                        37.76770234100002
-                    ]
-                ]
-            ]
-        },
-        "symbol": null,
-        "attributes": {
-            "objectid": 401,
-            "fc_code": "fc01",
-            "width": 5
-        },
-        "popupTemplate": null
-    },
-    {
-        "geometry": {
-            "spatialReference": {
-                "wkid": 4326
-            },
-            "paths": [
+                    107.0649004,
+                    37.30542993
+                ],
+                [
+                    107.0527768,
+                    37.30129941
+                ],
+                [
+                    107.048614,
+                    37.30432051
+                ],
                 [
-                    [
-                        106.47456765200002,
-                        37.767809629
-                    ],
-                    [
-                        106.47378444700001,
-                        37.76765942600002
-                    ],
-                    [
-                        106.47127389899998,
-                        37.768507004000014
-                    ],
-                    [
-                        106.46947145500002,
-                        37.76905417400002
-                    ]
+                    107.0456958,
+                    37.30819486
+                ],
+                [
+                    107.0414472,
+                    37.31130101
+                ],
+                [
+                    107.0348811,
+                    37.31508967
+                ],
+                [
+                    107.0305467,
+                    37.31749588
+                ],
+                [
+                    107.0199444,
+                    37.31830556
+                ],
+                [
+                    107.0611238,
+                    37.30860447
+                ],
+                [
+                    107.0571327,
+                    37.31169354
+                ],
+                [
+                    107.0521975,
+                    37.31369028
                 ]
             ]
         },
         "symbol": null,
         "attributes": {
-            "objectid": 2,
-            "fc_code": "fc01",
+            "fc_code": "MHS",
             "width": 3
         },
         "popupTemplate": null
@@ -176,21 +124,54 @@
             },
             "paths": [
                 [
-                    [
-                        106.469321251,
-                        37.76809930799999
-                    ],
-                    [
-                        106.47069454199999,
-                        37.76863574999999
-                    ]
+                    107.0693851,
+                    37.30322815
+                ],
+                [
+                    107.0744705,
+                    37.30041183
+                ],
+                [
+                    107.0696425,
+                    37.29628104
+                ],
+                [
+                    107.0717883,
+                    37.29213295
+                ],
+                [
+                    107.0662093,
+                    37.28824071
+                ],
+                [
+                    107.0567894,
+                    37.31587468
+                ],
+                [
+                    107.0560169,
+                    37.31988494
+                ],
+                [
+                    107.0506954,
+                    37.32184734
+                ],
+                [
+                    107.0727539,
+                    37.31087435
+                ],
+                [
+                    107.0761871,
+                    37.3067612
+                ],
+                [
+                    107.0820665,
+                    37.30641985
                 ]
             ]
         },
         "symbol": null,
         "attributes": {
-            "objectid": 3,
-            "fc_code": "fc01",
+            "fc_code": "MHS",
             "width": 3
         },
         "popupTemplate": null
@@ -202,53 +183,50 @@
             },
             "paths": [
                 [
-                    [
-                        106.46255135500002,
-                        37.76048183400002
-                    ],
-                    [
-                        106.46808743499997,
-                        37.76037454599998
-                    ],
-                    [
-                        106.46884918199999,
-                        37.760299444
-                    ],
-                    [
-                        106.46916031799998,
-                        37.76011705399998
-                    ],
-                    [
-                        106.47113442400001,
-                        37.760331630999985
-                    ],
-                    [
-                        106.471198797,
-                        37.760556936
-                    ],
-                    [
-                        106.470930576,
-                        37.761157750999985
-                    ],
-                    [
-                        106.47076964399997,
-                        37.76178002400002
-                    ],
-                    [
-                        106.47024393100003,
-                        37.76248812699998
-                    ],
-                    [
-                        106.469589472,
-                        37.76345372200001
-                    ]
+                    107.0360184,
+                    37.32406563
+                ],
+                [
+                    107.0318985,
+                    37.32969639
+                ],
+                [
+                    107.0269525,
+                    37.33528407
+                ],
+                [
+                    107.0515966,
+                    37.32539657
+                ],
+                [
+                    107.0396662,
+                    37.33669159
+                ],
+                [
+                    107.0315766,
+                    37.34420644
+                ],
+                [
+                    107.0183909,
+                    37.34223611
+                ],
+                [
+                    107.0164329,
+                    37.33144098
+                ],
+                [
+                    107.0044997,
+                    37.32873236
+                ],
+                [
+                    107.0019168,
+                    37.33337322
                 ]
             ]
         },
         "symbol": null,
         "attributes": {
-            "objectid": 4,
-            "fc_code": "fc01",
+            "fc_code": "MHS",
             "width": 3
         },
         "popupTemplate": null

+ 570 - 52
src/assets/dataService/arcgis-nx-fc1.json

@@ -4,8 +4,8 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.47947073,
-            "y": 37.76491284399998
+            "x": 107.0674069,
+            "y": 37.3040218
         },
         "symbol": null,
         "attributes": {
@@ -21,14 +21,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.478161812,
-            "y": 37.769397497
+            "x": 107.0644069,
+            "y": 37.30000218
         },
         "symbol": null,
         "attributes": {
-            "objectid": 2,
-            "fc_code": "fc01",
-            "code": "A01",
+            "fc_code": "MHS",
+            "code": "MG01",
             "type": "风场"
         },
         "popupTemplate": null
@@ -38,14 +37,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.47457838100001,
-            "y": 37.76784181599999
+            "x": 107.0609736,
+            "y": 37.29027221
         },
         "symbol": null,
         "attributes": {
-            "objectid": 401,
-            "fc_code": "fc01",
-            "code": "A02",
+            "fc_code": "MHS",
+            "code": "MG02",
             "type": "风场"
         },
         "popupTemplate": null
@@ -55,14 +53,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.47423505799998,
-            "y": 37.767080068999974
+            "x": 107.0545363,
+            "y": 37.29431798
         },
         "symbol": null,
         "attributes": {
-            "objectid": 402,
-            "fc_code": "fc01",
-            "code": "A03",
+            "fc_code": "MHS",
+            "code": "MG03",
             "type": "风场"
         },
         "popupTemplate": null
@@ -72,14 +69,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.47315144499998,
-            "y": 37.765030861000014
+            "x": 107.0488715,
+            "y": 37.29385708
         },
         "symbol": null,
         "attributes": {
-            "objectid": 403,
-            "fc_code": "fc01",
-            "code": "A04",
+            "fc_code": "MHS",
+            "code": "MG04",
             "type": "风场"
         },
         "popupTemplate": null
@@ -89,14 +85,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.46861314799997,
-            "y": 37.76419401200002
+            "x": 107.04561,
+            "y": 37.29752713
         },
         "symbol": null,
         "attributes": {
-            "objectid": 404,
-            "fc_code": "fc01",
-            "code": "A05",
+            "fc_code": "MHS",
+            "code": "MG05",
             "type": "风场"
         },
         "popupTemplate": null
@@ -106,14 +101,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.46949291200002,
-            "y": 37.76907563200001
+            "x": 107.0409322,
+            "y": 37.30025821
         },
         "symbol": null,
         "attributes": {
-            "objectid": 405,
-            "fc_code": "fc01",
-            "code": "A06",
+            "fc_code": "MHS",
+            "code": "MG06",
             "type": "风场"
         },
         "popupTemplate": null
@@ -123,14 +117,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.469321251,
-            "y": 37.76813149499998
+            "x": 107.0374346,
+            "y": 37.30382554
         },
         "symbol": null,
         "attributes": {
-            "objectid": 406,
-            "fc_code": "fc01",
-            "code": "A07",
+            "fc_code": "MHS",
+            "code": "MG07",
             "type": "风场"
         },
         "popupTemplate": null
@@ -140,14 +133,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.47117734,
-            "y": 37.76058912299999
+            "x": 107.0325208,
+            "y": 37.30630038
         },
         "symbol": null,
         "attributes": {
-            "objectid": 407,
-            "fc_code": "fc01",
-            "code": "A08",
+            "fc_code": "MHS",
+            "code": "MG08",
             "type": "风场"
         },
         "popupTemplate": null
@@ -157,14 +149,13 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.463967562,
-            "y": 37.76771307000001
+            "x": 107.0349455,
+            "y": 37.30909941
         },
         "symbol": null,
         "attributes": {
-            "objectid": 408,
-            "fc_code": "fc01",
-            "code": "A09",
+            "fc_code": "MHS",
+            "code": "MG09",
             "type": "风场"
         },
         "popupTemplate": null
@@ -174,14 +165,541 @@
             "spatialReference": {
                 "wkid": 4326
             },
-            "x": 106.46254062700001,
-            "y": 37.760556936
+            "x": 107.0286155,
+            "y": 37.30956022
         },
         "symbol": null,
         "attributes": {
-            "objectid": 409,
-            "fc_code": "fc01",
-            "code": "A10",
+            "fc_code": "MHS",
+            "code": "MG10",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0238519,
+            "y": 37.31106208
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG11",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0649004,
+            "y": 37.30542993
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG12",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0527768,
+            "y": 37.30129941
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG13",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.048614,
+            "y": 37.30432051
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG14",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0456958,
+            "y": 37.30819486
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG15",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0414472,
+            "y": 37.31130101
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG16",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0348811,
+            "y": 37.31508967
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG17",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0305467,
+            "y": 37.31749588
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG18",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0199444,
+            "y": 37.31830556
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG19",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0611238,
+            "y": 37.30860447
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG20",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0571327,
+            "y": 37.31169354
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG21",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0521975,
+            "y": 37.31369028
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG22",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0693851,
+            "y": 37.30322815
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG23",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0744705,
+            "y": 37.30041183
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG24",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0696425,
+            "y": 37.29628104
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG25",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0717883,
+            "y": 37.29213295
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG26",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0662093,
+            "y": 37.28824071
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG27",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0567894,
+            "y": 37.31587468
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG28",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0560169,
+            "y": 37.31988494
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG29",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0506954,
+            "y": 37.32184734
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG30",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0727539,
+            "y": 37.31087435
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG31",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0761871,
+            "y": 37.3067612
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG32",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0820665,
+            "y": 37.30641985
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG33",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0360184,
+            "y": 37.32406563
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG34",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0318985,
+            "y": 37.32969639
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG35",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0269525,
+            "y": 37.33528407
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG36",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0515966,
+            "y": 37.32539657
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG37",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0396662,
+            "y": 37.33669159
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG38",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0315766,
+            "y": 37.34420644
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG39",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0183909,
+            "y": 37.34223611
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG40",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0164329,
+            "y": 37.33144098
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG41",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0044997,
+            "y": 37.32873236
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG42",
+            "type": "风场"
+        },
+        "popupTemplate": null
+    },
+    {
+        "geometry": {
+            "spatialReference": {
+                "wkid": 4326
+            },
+            "x": 107.0019168,
+            "y": 37.33337322
+        },
+        "symbol": null,
+        "attributes": {
+            "fc_code": "MHS",
+            "code": "MG43",
             "type": "风场"
         },
         "popupTemplate": null

Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-aq.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-dj.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-jc.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-jj.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-oa.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-p.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-wz.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/iac/iac-yx.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 3 - 0
src/assets/icon/svg/knowledge/knowledge-bar.svg


+ 4 - 0
src/assets/icon/svg/knowledge/knowledge-file.svg

@@ -0,0 +1,4 @@
+<svg t="1625811877282" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6341" width="200" height="200">
+    <path d="M537.152 414.72h-288.64a29.44 29.44 0 0 1-26.24-30.72 29.44 29.44 0 0 1 26.24-32h288.64a29.44 29.44 0 0 1 26.24 32 29.44 29.44 0 0 1-26.24 30.72z m209.92 165.76h-498.56a32.64 32.64 0 0 1 0-64h498.56a32.64 32.64 0 0 1 0 64z m0 165.76h-498.56a32.64 32.64 0 0 1 0-64h498.56a32.64 32.64 0 0 1 0 64z" fill="#333333" p-id="6342"></path>
+    <path d="M192.832 0a128 128 0 0 0-128 128v768a128 128 0 0 0 128 128h640a128 128 0 0 0 128-128l7.04-670.72L748.992 0h-556.16z m512 64l192 192h-160.64a31.36 31.36 0 0 1-31.36-31.36V64z m128 896h-640a64 64 0 0 1-64-64V128a64 64 0 0 1 64-64h448v192a64 64 0 0 0 64 64h192v576a64 64 0 0 1-64 64z" fill="#333333" p-id="6343"></path>
+</svg>

Dosya farkı çok büyük olduğundan ihmal edildi
+ 3 - 0
src/assets/icon/svg/knowledge/knowledge-nerve-net.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 5 - 0
src/assets/icon/svg/knowledge/knowledge-professor.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/天气1.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/日出1.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/日落1.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/气压1.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/温度1.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/湿度1.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/weather/风速.svg


Dosya farkı çok büyük olduğundan ihmal edildi
+ 1 - 0
src/assets/icon/svg/功率.svg


+ 1 - 1
src/assets/icon/svg/风机.svg

@@ -23,6 +23,6 @@
 		c-0.615,0.271-1.052,0.836-1.158,1.5c-0.886,5.22-3.695,9.918-7.875,13.166c-0.533,0.42-0.823,1.074-0.775,1.75
 		c0.05,0.668,0.45,1.275,1.041,1.634c26.25,14.267,57.268,29.524,66.15,29.75c0.967-0.024,2.283-0.158,3.233-1.476
 		c0.267-0.469,0.407-1,0.408-1.541C182.537,133.341,174.862,127.999,163.604,119.332L163.604,119.332z" />
-		<animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="3s" type="rotate" from="0 99 90" to="360 99 90" repeatCount="indefinite" />
+		<animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="3s" type="rotate" from="0 99 90" to="-360 99 90" repeatCount="indefinite" />
 	</g>
 </svg>

BIN
src/assets/person/丁冬.jpg


BIN
src/assets/person/丁卫青.jpg


BIN
src/assets/person/丁荣.jpg


BIN
src/assets/person/于庆龙.jpg


BIN
src/assets/person/于靖.jpg


BIN
src/assets/person/付增业.jpg


BIN
src/assets/person/任文.jpg


BIN
src/assets/person/余文江.jpg


BIN
src/assets/person/侯宗玖.jpg


BIN
src/assets/person/侯明林.jpg


BIN
src/assets/person/候晨.jpg


BIN
src/assets/person/刘学民.jpg


BIN
src/assets/person/刘新庆.jpg


BIN
src/assets/person/刘辉.jpg


BIN
src/assets/person/包继军.jpg


BIN
src/assets/person/吴凯泽.jpg


BIN
src/assets/person/周伟民.jpg


BIN
src/assets/person/周暾中.jpg


BIN
src/assets/person/周杨.jpg


BIN
src/assets/person/夏天.jpg


BIN
src/assets/person/孙振波.jpg


BIN
src/assets/person/孙谦.jpg


BIN
src/assets/person/常博.jpg


BIN
src/assets/person/张亮.jpg


BIN
src/assets/person/张剑荣.jpg


BIN
src/assets/person/张力涛.jpg


BIN
src/assets/person/张延明.jpg


BIN
src/assets/person/张强.jpg


BIN
src/assets/person/张彦.jpg


BIN
src/assets/person/张文.jpg


BIN
src/assets/person/张曲洋.jpg


BIN
src/assets/person/张涛.jpg


BIN
src/assets/person/张渊.jpg


BIN
src/assets/person/张炘渊.jpg


BIN
src/assets/person/张瑞祥.jpg


BIN
src/assets/person/张银涛.jpg


BIN
src/assets/person/彭宁宁.jpg


BIN
src/assets/person/徐瑞.jpg


BIN
src/assets/person/方超.jpg


BIN
src/assets/person/暴光.jpg


BIN
src/assets/person/朱利宏.jpg


BIN
src/assets/person/李保.jpg


BIN
src/assets/person/李占国.jpg


BIN
src/assets/person/李小慧.jpg


BIN
src/assets/person/李岩.jpg


BIN
src/assets/person/李振林.jpg


BIN
src/assets/person/李明(小).jpg


BIN
src/assets/person/李明.jpg


BIN
src/assets/person/李浩桐.jpg


BIN
src/assets/person/李腾军.jpg


BIN
src/assets/person/杜锋.jpg


BIN
src/assets/person/杨兴成.jpg


BIN
src/assets/person/杨博荣.jpg


BIN
src/assets/person/杨建军.jpg


BIN
src/assets/person/杨志旗.jpg


BIN
src/assets/person/杨治涛.jpg


BIN
src/assets/person/栾旭良.jpg


BIN
src/assets/person/段乐伟.jpg


+ 0 - 0
src/assets/person/海利.jpg


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor