Página inicial Explorar Ajuda
Registrar Entrar
TEAMMODEL
/
TEAMModelOS
5
4
Fork 0
Arquivos Issues 172 Pull Requests 0 Wiki
Ver código fonte

Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

Li 3 anos atrás
pai
8c58e26fb1 e45e987524
commit
b0fea402b9
9 arquivos alterados com 30 adições e 16 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 5 0
      TEAMModelOS.SDK/Models/Cosmos/School/Room.cs
  2. 0 1
      TEAMModelOS/ClientApp/package.json
  3. 8 5
      TEAMModelOS/ClientApp/public/index.html
  4. 3 2
      TEAMModelOS/ClientApp/src/boot-app.js
  5. 4 1
      TEAMModelOS/ClientApp/src/utils/public.js
  6. 3 1
      TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue
  7. 4 4
      TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/SubComponent/SpaceStatusChart.vue
  8. 2 1
      TEAMModelOS/ClientApp/vue.config.js
  9. 1 1
      TEAMModelOS/Controllers/System/OpenApiController.cs

+ 5 - 0
TEAMModelOS.SDK/Models/Cosmos/School/Room.cs
Ver arquivo 

@@ -33,5 +33,10 @@ namespace TEAMModelOS.SDK.Models
 
         /// 
         /// </summary>
 
         public string area { get; set; }
 
+        /// <summary>
 
+        /// 序列号
 
+        /// </summary>
 
+        public string serial { get; set; }
 
+
 
     }
 
 }

+ 0 - 1
TEAMModelOS/ClientApp/package.json
Ver arquivo 

@@ -26,7 +26,6 @@
 
     "core-js": "^3.1.2",
 
     "d3": "^5.9.2",
 
     "dr-vue-echarts": "^1.0.13",
 
-    "echarts": "^4.2.1",
 
     "element-resize-detector": "^1.2.1",
 
     "element-ui": "^2.12.0",
 
     "fabric": "^4.5.1",

+ 8 - 5
TEAMModelOS/ClientApp/public/index.html
Ver arquivo 

@@ -29,7 +29,7 @@
 
 			};
 
 		</script>
 
 		<script type="text/javascript" id="MathJax-script" async
 
-			src="teammodelos.blob.core.chinacloudapi.cn/0-public/js/tex-mml-svg.js">
 
+			src="https://teammodelos.blob.core.chinacloudapi.cn/0-public/js/tex-mml-svg.js">
 
 		</script>
 
 		<script>
 
 			let cloudSetting = localStorage.getItem('cloudSetting')
 
@@ -44,6 +44,7 @@
 
 			let isGlobalSite = window.location.origin === 'https://www.teammodel.net'
 
 			let blobHost = isGlobalSite ? 'https://teammodel.blob.core.windows.net' :
 
 				'https://teammodelos.blob.core.chinacloudapi.cn'
 
+
 
 			function LoadJS(id, fileUrl) {
 
 				var scriptTag = document.getElementById(id);
 
 				var oHead = document.getElementsByTagName('HEAD').item(0);
 
@@ -54,10 +55,11 @@
 
 				oScript.src = blobHost + '/' + fileUrl;
 
 				oHead.appendChild(oScript);
 
 			}
 
-			LoadJS("vue","0-public/js/vue.js");
 
-			LoadJS("iview","0-public/js/iview.min.js");
 
-			LoadJS("fabric","0-public/js/fabric.min.js");
 
-			LoadJS("vueRouter","0-public/js/vue-router.min.js");
 
+			LoadJS("vue", "0-public/js/vue.js");
 
+			LoadJS("iview", "0-public/js/iview.min.js");
 
+			LoadJS("fabric", "0-public/js/fabric.min.js");
 
+			LoadJS("vueRouter", "0-public/js/vue-router.min.js");
 
+			LoadJS("echarts","0-public/js/echarts.js");
 
 		</script>
 
 	</head>
 
 	<body>
 
@@ -65,6 +67,7 @@
 
 			<strong>IES5</strong>
 
 		</noscript>
 
 		<div id="app"></div>
 
+		<!-- <script src="https://lib.baomitu.com/echarts/4.2.1/echarts.js"></script> -->
 
 	</body>
 
 
 </html>

+ 3 - 2
TEAMModelOS/ClientApp/src/boot-app.js
Ver arquivo 

@@ -21,7 +21,7 @@ import FileSaver from "file-saver";
 
 import JSONPath from 'jsonpath'
 
 import GLOBAL from '@/static/Global.js'
 
 import BaseChangeLine from '@/components/student-analysis/total/BaseChangeLine.vue'
 
-import echarts from 'echarts'
 
+// import echarts from 'echarts'
 
 import vuescroll from 'vuescroll/dist/vuescroll-native'
 
 import { Tree, Cascader } from 'element-ui' // 按需引入element Tree组件
 
 import 'element-ui/lib/theme-chalk/tree.css'
 
@@ -96,6 +96,7 @@ Vue.prototype.$axios = axios
 
 Vue.prototype.$User = User
 
 // 工具类
 
 Vue.prototype.$Mock = mockTools
 
+console.log(window);
 
 // 全局静态配置数据
 
 Vue.use(GLOBAL, {
 
     i18n: (key, value) => i18n.t(key, value)
 
@@ -104,7 +105,7 @@ Vue.use(GLOBAL, {
 
 Vue.prototype.$FileSaver = FileSaver
 
 Vue.prototype.$jwtDecode = jwtDecode
 
 Vue.prototype.$JSONPath = JSONPath
 
-Vue.prototype.$echarts = echarts
 
+Vue.prototype.$echarts = window.echarts
 
 Vue.prototype.$tools = tools
 
 Vue.prototype.$evTools = evTools
 
 Vue.prototype.$editorTools = editorTools

+ 4 - 1
TEAMModelOS/ClientApp/src/utils/public.js
Ver arquivo 

@@ -284,6 +284,7 @@ export default {
 
 	},
 
 	/* 对比评测时间和学期分界点时间 */
 
 	getCurSemesterIndex(semesters, range, val) {
 
+		console.log(...arguments);
 
 		let rangeArr = []
 
 		let s = this.tranNum(val)
 
 		for (let i = 0; i < range.length; i++) {
 
@@ -314,7 +315,9 @@ export default {
 
 	},
 
 	/* 数字转换 */
 
 	tranNum(val) {
 
-		return Number((Number(val[0])) + '' + (+val[1] > 10 ? +val[1] : '0' + (+val[1])))
 
+		let month = +val[0]
 
+		let day = +val[1]
 
+		return Number(month + '' + (day > 9 ? day : ('0' + day)))
 
 	},
 
 	/* 数字与中文转换 */
 
 	getChineseByNum(num) {

+ 3 - 1
TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue
Ver arquivo 

@@ -592,7 +592,9 @@
 
 			},
 
 
 			tranNum(val) {
 
-				return Number((Number(val[0])) + '' + (+val[1] > 10 ? +val[1] : '0' + (+val[1])))
 
+				let month = +val[0]
 
+				let day = +val[1]
 
+				return Number(month + '' + (day > 9 ? day : ('0' + day)))
 
 			},
 
 
 			objToArr(obj) {

+ 4 - 4
TEAMModelOS/ClientApp/src/view/teachermgmt/components/userList/SubComponent/SpaceStatusChart.vue
Ver arquivo 

@@ -110,10 +110,10 @@ export default {
 
             labelLine: {
 
               show: false
 
             },
 
-            itemStyle: {
 
-              borderColor: '#2b2a2f',
 
-              borderWidth: 3
 
-            },
 
+            // itemStyle: {
 
+            //   borderColor: '#2b2a2f',
 
+            //   borderWidth: 3
 
+            // },
 
             data: this.pieNumData
 
           }
 
         ]

+ 2 - 1
TEAMModelOS/ClientApp/vue.config.js
Ver arquivo 

@@ -68,7 +68,8 @@ module.exports = {
 
 			'vue': 'Vue',
 
 			'vue-router': 'VueRouter',
 
 			'view-design': 'iview',
 
-			'fabric': 'fabric'
 
+			'fabric': 'fabric',
 
+			'echarts':'echarts'
 
 		}
 
 		// 代码压缩
 
 		// config.plugins.push(

+ 1 - 1
TEAMModelOS/Controllers/System/OpenApiController.cs
Ver arquivo 

@@ -226,7 +226,7 @@ namespace TEAMModelOS.Controllers
 
                 if (!requert.TryGetProperty("id", out JsonElement id)) return BadRequest();
 
                 //
 
                 if (!requert.TryGetProperty("code", out JsonElement code)) return BadRequest();
 
-                var room = await client.GetContainer(Constant.TEAMModelOS, "School").DeleteItemAsync<Room>(id.GetString(), new PartitionKey($"OpenApp-{code}"));
 
+                var room = await client.GetContainer(Constant.TEAMModelOS, "School").DeleteItemAsync<OpenApp>(id.GetString(), new PartitionKey($"OpenApp-{code}"));
 
                 return Ok();
 
             }
 
             catch (Exception ex)