Преглед изворни кода

Merge branch 'xf_dev' of jiaxiaoqiang/JG-ADMIN-TEMP into master

jiaxiaoqiang пре 10 месеци
родитељ
комит
a9afff3c73
100 измењених фајлова са 19 додато и 6 уклоњено
  1. 2 2
      .env.development
  2. 1 1
      .env.production
  3. 3 0
      .vscode/settings.json
  4. 2 2
      index.html
  5. 1 1
      package.json
  6. BIN
      public/cmaps/78-EUC-H.bcmap
  7. BIN
      public/cmaps/78-EUC-V.bcmap
  8. BIN
      public/cmaps/78-H.bcmap
  9. BIN
      public/cmaps/78-RKSJ-H.bcmap
  10. BIN
      public/cmaps/78-RKSJ-V.bcmap
  11. BIN
      public/cmaps/78-V.bcmap
  12. BIN
      public/cmaps/78ms-RKSJ-H.bcmap
  13. BIN
      public/cmaps/78ms-RKSJ-V.bcmap
  14. BIN
      public/cmaps/83pv-RKSJ-H.bcmap
  15. BIN
      public/cmaps/90ms-RKSJ-H.bcmap
  16. BIN
      public/cmaps/90ms-RKSJ-V.bcmap
  17. BIN
      public/cmaps/90msp-RKSJ-H.bcmap
  18. BIN
      public/cmaps/90msp-RKSJ-V.bcmap
  19. BIN
      public/cmaps/90pv-RKSJ-H.bcmap
  20. BIN
      public/cmaps/90pv-RKSJ-V.bcmap
  21. BIN
      public/cmaps/Add-H.bcmap
  22. BIN
      public/cmaps/Add-RKSJ-H.bcmap
  23. BIN
      public/cmaps/Add-RKSJ-V.bcmap
  24. BIN
      public/cmaps/Add-V.bcmap
  25. BIN
      public/cmaps/Adobe-CNS1-0.bcmap
  26. BIN
      public/cmaps/Adobe-CNS1-1.bcmap
  27. BIN
      public/cmaps/Adobe-CNS1-2.bcmap
  28. BIN
      public/cmaps/Adobe-CNS1-3.bcmap
  29. BIN
      public/cmaps/Adobe-CNS1-4.bcmap
  30. BIN
      public/cmaps/Adobe-CNS1-5.bcmap
  31. BIN
      public/cmaps/Adobe-CNS1-6.bcmap
  32. BIN
      public/cmaps/Adobe-CNS1-UCS2.bcmap
  33. BIN
      public/cmaps/Adobe-GB1-0.bcmap
  34. BIN
      public/cmaps/Adobe-GB1-1.bcmap
  35. BIN
      public/cmaps/Adobe-GB1-2.bcmap
  36. BIN
      public/cmaps/Adobe-GB1-3.bcmap
  37. BIN
      public/cmaps/Adobe-GB1-4.bcmap
  38. BIN
      public/cmaps/Adobe-GB1-5.bcmap
  39. BIN
      public/cmaps/Adobe-GB1-UCS2.bcmap
  40. BIN
      public/cmaps/Adobe-Japan1-0.bcmap
  41. BIN
      public/cmaps/Adobe-Japan1-1.bcmap
  42. BIN
      public/cmaps/Adobe-Japan1-2.bcmap
  43. BIN
      public/cmaps/Adobe-Japan1-3.bcmap
  44. BIN
      public/cmaps/Adobe-Japan1-4.bcmap
  45. BIN
      public/cmaps/Adobe-Japan1-5.bcmap
  46. BIN
      public/cmaps/Adobe-Japan1-6.bcmap
  47. BIN
      public/cmaps/Adobe-Japan1-UCS2.bcmap
  48. BIN
      public/cmaps/Adobe-Korea1-0.bcmap
  49. BIN
      public/cmaps/Adobe-Korea1-1.bcmap
  50. BIN
      public/cmaps/Adobe-Korea1-2.bcmap
  51. BIN
      public/cmaps/Adobe-Korea1-UCS2.bcmap
  52. BIN
      public/cmaps/B5-H.bcmap
  53. BIN
      public/cmaps/B5-V.bcmap
  54. BIN
      public/cmaps/B5pc-H.bcmap
  55. BIN
      public/cmaps/B5pc-V.bcmap
  56. BIN
      public/cmaps/CNS-EUC-H.bcmap
  57. BIN
      public/cmaps/CNS-EUC-V.bcmap
  58. BIN
      public/cmaps/CNS1-H.bcmap
  59. BIN
      public/cmaps/CNS1-V.bcmap
  60. BIN
      public/cmaps/CNS2-H.bcmap
  61. 3 0
      public/cmaps/CNS2-V.bcmap
  62. BIN
      public/cmaps/ETHK-B5-H.bcmap
  63. BIN
      public/cmaps/ETHK-B5-V.bcmap
  64. BIN
      public/cmaps/ETen-B5-H.bcmap
  65. BIN
      public/cmaps/ETen-B5-V.bcmap
  66. 3 0
      public/cmaps/ETenms-B5-H.bcmap
  67. BIN
      public/cmaps/ETenms-B5-V.bcmap
  68. BIN
      public/cmaps/EUC-H.bcmap
  69. BIN
      public/cmaps/EUC-V.bcmap
  70. BIN
      public/cmaps/Ext-H.bcmap
  71. BIN
      public/cmaps/Ext-RKSJ-H.bcmap
  72. BIN
      public/cmaps/Ext-RKSJ-V.bcmap
  73. BIN
      public/cmaps/Ext-V.bcmap
  74. BIN
      public/cmaps/GB-EUC-H.bcmap
  75. BIN
      public/cmaps/GB-EUC-V.bcmap
  76. 4 0
      public/cmaps/GB-H.bcmap
  77. BIN
      public/cmaps/GB-V.bcmap
  78. BIN
      public/cmaps/GBK-EUC-H.bcmap
  79. BIN
      public/cmaps/GBK-EUC-V.bcmap
  80. BIN
      public/cmaps/GBK2K-H.bcmap
  81. BIN
      public/cmaps/GBK2K-V.bcmap
  82. BIN
      public/cmaps/GBKp-EUC-H.bcmap
  83. BIN
      public/cmaps/GBKp-EUC-V.bcmap
  84. BIN
      public/cmaps/GBT-EUC-H.bcmap
  85. BIN
      public/cmaps/GBT-EUC-V.bcmap
  86. BIN
      public/cmaps/GBT-H.bcmap
  87. BIN
      public/cmaps/GBT-V.bcmap
  88. BIN
      public/cmaps/GBTpc-EUC-H.bcmap
  89. BIN
      public/cmaps/GBTpc-EUC-V.bcmap
  90. BIN
      public/cmaps/GBpc-EUC-H.bcmap
  91. BIN
      public/cmaps/GBpc-EUC-V.bcmap
  92. BIN
      public/cmaps/H.bcmap
  93. BIN
      public/cmaps/HKdla-B5-H.bcmap
  94. BIN
      public/cmaps/HKdla-B5-V.bcmap
  95. BIN
      public/cmaps/HKdlb-B5-H.bcmap
  96. BIN
      public/cmaps/HKdlb-B5-V.bcmap
  97. BIN
      public/cmaps/HKgccs-B5-H.bcmap
  98. BIN
      public/cmaps/HKgccs-B5-V.bcmap
  99. BIN
      public/cmaps/HKm314-B5-H.bcmap
  100. 0 0
      public/cmaps/HKm314-B5-V.bcmap

+ 2 - 2
.env.development

@@ -11,8 +11,8 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
 # 开发接口地址
 # VITE_APP_API_URL = 'http://192.168.101.4:8078'
-#VITE_APP_API_URL = 'http://192.168.101.188:8078'
- VITE_APP_API_URL = 'http://192.168.101.188:8078'  #lup
+VITE_APP_API_URL = 'http://121.41.179.41:8079'
+#  VITE_APP_API_URL = 'http://121.41.179.41:8078'  #lup
 #VITE_APP_API_URL = 'http://192.168.101.64:8078'  #hetao
 
 # 是否启用 Mock 服务

+ 1 - 1
.env.production

@@ -2,7 +2,7 @@
 NODE_ENV='production'
 
 # 上传文件接口地址
-VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
+VITE_APP_UPLOAD_URL = 'http://192.168.101.189:9000'
 # 代理前缀
 VITE_APP_BASE_API = '/mes-server'
 

+ 3 - 0
.vscode/settings.json

@@ -77,4 +77,7 @@
   "i18n-ally.localesPaths": [
     "src/lang"
   ],
+  "[vue]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
 }

+ 2 - 2
index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" href="/favicon.ico" />
+    <link rel="icon" href="/logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta
       name="description"
@@ -13,7 +13,7 @@
       content="vue,element-plus,typescript,vue-element-admin,vue3-element-admin"
     />
     <script src="https://cdn.staticfile.org/Sortable/1.10.0-rc2/Sortable.min.js"></script>
-    <title>综合管控采集平台</title>
+    <title>生产线综合管控采集平台</title>
   </head>
 
   <body>

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "综合管控采集平台",
+  "name": "生产线综合管控采集平台",
   "version": "1.0.0",
   "private": true,
   "type": "module",

BIN
public/cmaps/78-EUC-H.bcmap


BIN
public/cmaps/78-EUC-V.bcmap


BIN
public/cmaps/78-H.bcmap


BIN
public/cmaps/78-RKSJ-H.bcmap


BIN
public/cmaps/78-RKSJ-V.bcmap


BIN
public/cmaps/78-V.bcmap


BIN
public/cmaps/78ms-RKSJ-H.bcmap


BIN
public/cmaps/78ms-RKSJ-V.bcmap


BIN
public/cmaps/83pv-RKSJ-H.bcmap


BIN
public/cmaps/90ms-RKSJ-H.bcmap


BIN
public/cmaps/90ms-RKSJ-V.bcmap


BIN
public/cmaps/90msp-RKSJ-H.bcmap


BIN
public/cmaps/90msp-RKSJ-V.bcmap


BIN
public/cmaps/90pv-RKSJ-H.bcmap


BIN
public/cmaps/90pv-RKSJ-V.bcmap


BIN
public/cmaps/Add-H.bcmap


BIN
public/cmaps/Add-RKSJ-H.bcmap


BIN
public/cmaps/Add-RKSJ-V.bcmap


BIN
public/cmaps/Add-V.bcmap


BIN
public/cmaps/Adobe-CNS1-0.bcmap


BIN
public/cmaps/Adobe-CNS1-1.bcmap


BIN
public/cmaps/Adobe-CNS1-2.bcmap


BIN
public/cmaps/Adobe-CNS1-3.bcmap


BIN
public/cmaps/Adobe-CNS1-4.bcmap


BIN
public/cmaps/Adobe-CNS1-5.bcmap


BIN
public/cmaps/Adobe-CNS1-6.bcmap


BIN
public/cmaps/Adobe-CNS1-UCS2.bcmap


BIN
public/cmaps/Adobe-GB1-0.bcmap


BIN
public/cmaps/Adobe-GB1-1.bcmap


BIN
public/cmaps/Adobe-GB1-2.bcmap


BIN
public/cmaps/Adobe-GB1-3.bcmap


BIN
public/cmaps/Adobe-GB1-4.bcmap


BIN
public/cmaps/Adobe-GB1-5.bcmap


BIN
public/cmaps/Adobe-GB1-UCS2.bcmap


BIN
public/cmaps/Adobe-Japan1-0.bcmap


BIN
public/cmaps/Adobe-Japan1-1.bcmap


BIN
public/cmaps/Adobe-Japan1-2.bcmap


BIN
public/cmaps/Adobe-Japan1-3.bcmap


BIN
public/cmaps/Adobe-Japan1-4.bcmap


BIN
public/cmaps/Adobe-Japan1-5.bcmap


BIN
public/cmaps/Adobe-Japan1-6.bcmap


BIN
public/cmaps/Adobe-Japan1-UCS2.bcmap


BIN
public/cmaps/Adobe-Korea1-0.bcmap


BIN
public/cmaps/Adobe-Korea1-1.bcmap


BIN
public/cmaps/Adobe-Korea1-2.bcmap


BIN
public/cmaps/Adobe-Korea1-UCS2.bcmap


BIN
public/cmaps/B5-H.bcmap


BIN
public/cmaps/B5-V.bcmap


BIN
public/cmaps/B5pc-H.bcmap


BIN
public/cmaps/B5pc-V.bcmap


BIN
public/cmaps/CNS-EUC-H.bcmap


BIN
public/cmaps/CNS-EUC-V.bcmap


BIN
public/cmaps/CNS1-H.bcmap


BIN
public/cmaps/CNS1-V.bcmap


BIN
public/cmaps/CNS2-H.bcmap


+ 3 - 0
public/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

BIN
public/cmaps/ETHK-B5-H.bcmap


BIN
public/cmaps/ETHK-B5-V.bcmap


BIN
public/cmaps/ETen-B5-H.bcmap


BIN
public/cmaps/ETen-B5-V.bcmap


+ 3 - 0
public/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H` ^

BIN
public/cmaps/ETenms-B5-V.bcmap


BIN
public/cmaps/EUC-H.bcmap


BIN
public/cmaps/EUC-V.bcmap


BIN
public/cmaps/Ext-H.bcmap


BIN
public/cmaps/Ext-RKSJ-H.bcmap


BIN
public/cmaps/Ext-RKSJ-V.bcmap


BIN
public/cmaps/Ext-V.bcmap


BIN
public/cmaps/GB-EUC-H.bcmap


BIN
public/cmaps/GB-EUC-V.bcmap


+ 4 - 0
public/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE!!�º]aX!!]`�21�>	�p�z�$]‚�"R‚d�-Uƒ7�*„
4„%�+ „Z „{�/…%…<�9K…b�1]†.�"‡‰`]‡,�"]ˆ
+�"]ˆh�"]‰F�"]Š$�"]‹�"]‹`�"]Œ>�"]��"]�z�"]ŽX�"]�6�"]��"]�r�"]‘P�"]’.�"]“�"]“j�"]”H�"]•&�"]–�"]–b�"]—@�"]˜�"]˜|�"]™Z�"]š8�"]›�"]›t�"]œR�"]�0�"]ž�"]žl�"]ŸJ�"] (�"]¡�"]¡d�"]¢B�"]£ �"X£~�']¤W�"]¥5�"]¦�"]¦q�"]§O�"]¨-�"]©�"]©i�"]ªG�"]«%�"]¬�"]¬a�"]­?�"]®�"]®{�"]¯Y�"]°7�"]±�"]±s�"]²Q�"]³/�"]´
�"]´k�"]µI�"]¶'�"]·�"]·c�"]¸A�"]¹�"]¹}�"]º[�"]»9

BIN
public/cmaps/GB-V.bcmap


BIN
public/cmaps/GBK-EUC-H.bcmap


BIN
public/cmaps/GBK-EUC-V.bcmap


BIN
public/cmaps/GBK2K-H.bcmap


BIN
public/cmaps/GBK2K-V.bcmap


BIN
public/cmaps/GBKp-EUC-H.bcmap


BIN
public/cmaps/GBKp-EUC-V.bcmap


BIN
public/cmaps/GBT-EUC-H.bcmap


BIN
public/cmaps/GBT-EUC-V.bcmap


BIN
public/cmaps/GBT-H.bcmap


BIN
public/cmaps/GBT-V.bcmap


BIN
public/cmaps/GBTpc-EUC-H.bcmap


BIN
public/cmaps/GBTpc-EUC-V.bcmap


BIN
public/cmaps/GBpc-EUC-H.bcmap


BIN
public/cmaps/GBpc-EUC-V.bcmap


BIN
public/cmaps/H.bcmap


BIN
public/cmaps/HKdla-B5-H.bcmap


BIN
public/cmaps/HKdla-B5-V.bcmap


BIN
public/cmaps/HKdlb-B5-H.bcmap


BIN
public/cmaps/HKdlb-B5-V.bcmap


BIN
public/cmaps/HKgccs-B5-H.bcmap


BIN
public/cmaps/HKgccs-B5-V.bcmap


BIN
public/cmaps/HKm314-B5-H.bcmap


+ 0 - 0
public/cmaps/HKm314-B5-V.bcmap


Неке датотеке нису приказане због велике количине промена