liuyanpeng 3 месяцев назад
Родитель
Сommit
f788538b4c
3 измененных файлов с 10 добавлено и 6 удалено
  1. 3 3
      package.json
  2. 5 2
      public/index-debug.html
  3. 2 1
      public/index-release.html

+ 3 - 3
package.json

@@ -1,7 +1,7 @@
 {
   "name": "pc-client-v5",
   "description": "Leanwo Prodog Client",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=https://npm.leanwo.com -force",
@@ -17,9 +17,9 @@
     "ant-design-vue": "^4.2.1",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v5": "1.0.8",
+    "client-base-v5": "1.0.9",
     "client-dic-v3": "^3.0.52",
-    "client-eam-v5": "1.0.2",
+    "client-eam-v5": "1.0.3",
     "client-role-v3": "^3.0.26",
     "client-sensor-v3": "^1.0.4",
     "client-wms-v5": "1.0.0",

+ 5 - 2
public/index-debug.html

@@ -58,6 +58,9 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.upload.min.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.zh_cn.min.js"></script>
 
+	<!-- ECharts 必须在 Vue 等框架之前加载,确保全局变量可用 -->
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/echarts/dist/echarts.min.js"></script>
+
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
 	The runtime-only build is fully CSP-compliant. When using the runtime-only build with Webpack + vue-loader or Browserify + vueify, your templates will be precompiled into render functions which work perfectly in CSP environments. -->
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/vue/dist/vue.global.js"></script>
@@ -69,7 +72,7 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/sortablejs/Sortable.js"></script>
 	
 	<!-- <link rel="stylesheet" type="text/css" href="/static/summernote/dist/summernote.min.css"> -->
-	<link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="https://unpkg.com/@wangeditor/editor@latest/dist/css/style.css">
+	<!-- <link nonce="*NONCE_TOKEN_CSS*" rel="stylesheet" type="text/css" href="https://unpkg.com/@wangeditor/editor@latest/dist/css/style.css"> -->
 
 	
 
@@ -84,7 +87,7 @@
 	<div id="app">
 	</div>
 	<div id="refreshCount"></div>
-	<script defer="defer" src="/static/echarts/dist/echarts.min.js"></script>
+	<!-- Deleted:	<script defer="defer" src="/static/echarts/dist/echarts.min.js"></script> -->
 	
 
 	<!-- <script defer="defer" type="text/javascript" src="/static/summernote/dist/summernote.min.js"></script>

+ 2 - 1
public/index-release.html

@@ -56,6 +56,8 @@
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.upload.min.js"></script>
 	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/trumbowyg/js/trumbowyg.zh_cn.min.js"></script>
 
+	<!-- ECharts 必须在 Vue 等框架之前加载,确保全局变量可用 -->
+	<script nonce="*NONCE_TOKEN*" type="text/javascript" src="/static/echarts/dist/echarts.min.js"></script>
 
 	<!--VueJS has 2 different versions: the full version and the runtime version. 'unsafe-eval' is only needed for the full version of VueJS; the runtime version doesn't need it. 
 	The runtime-only build is fully CSP-compliant. When using the runtime-only build with Webpack + vue-loader or Browserify + vueify, your templates will be precompiled into render functions which work perfectly in CSP environments. -->
@@ -78,7 +80,6 @@
 	<div id="app">
 	</div>
 	<div id="refreshCount"></div>
-	<script defer="defer" nonce="*NONCE_TOKEN*"  src="/static/echarts/dist/echarts.min.js"></script>
 
 	<!-- <script src="../static/js/fullscreen-api.js"></script> -->
 	<!-- <script src="../static/js/problem-feedback-api.js"></script> -->