Merge branch '黑龙江艺术高中职' of http://8.141.155.183:3000/bjquanjiang/DigitalScholl into 黑龙江艺术高中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js

@@ -138,7 +138,16 @@ var bootstrap = function ($, learun) {
                     edit: {
                         type: 'select',
                         init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象
-
+                            if (data.IsSlow == true) {
+                                $edit[0]._lrselect.dfop._index = "0";
+                                $edit.find('.lr-select-placeholder').html('是');
+                            } else if (data.IsSlow == false) {
+                                $edit[0]._lrselect.dfop._index = "1";
+                                $edit.find('.lr-select-placeholder').html('否');
+                            } else {
+                                $edit[0]._lrselect.dfop._index = "-1";
+                                $edit.find('.lr-select-placeholder').html('');
+                            }
                         },
                         change: function (row, num, item) {// 行数据和行号,下拉框选中数据
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js

@@ -144,7 +144,16 @@ var bootstrap = function ($, learun) {
                     edit: {
                         type: 'select',
                         init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象
-
+                            if (data.IsSlow == true) {
+                                $edit[0]._lrselect.dfop._index = "0";
+                                $edit.find('.lr-select-placeholder').html('是');
+                            } else if (data.IsSlow == false) {
+                                $edit[0]._lrselect.dfop._index = "1";
+                                $edit.find('.lr-select-placeholder').html('否');
+                            } else {
+                                $edit[0]._lrselect.dfop._index = "-1";
+                                $edit.find('.lr-select-placeholder').html('');
+                            }
                         },
                         change: function (row, num, item) {// 行数据和行号,下拉框选中数据
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js

@@ -138,7 +138,16 @@ var bootstrap = function ($, learun) {
                     edit: {
                         type: 'select',
                         init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象
-
+                            if (data.IsSlow == true) {
+                                $edit[0]._lrselect.dfop._index = "0";
+                                $edit.find('.lr-select-placeholder').html('是');
+                            } else if (data.IsSlow == false) {
+                                $edit[0]._lrselect.dfop._index = "1";
+                                $edit.find('.lr-select-placeholder').html('否');
+                            } else {
+                                $edit[0]._lrselect.dfop._index = "-1";
+                                $edit.find('.lr-select-placeholder').html('');
+                            }
                         },
                         change: function (row, num, item) {// 行数据和行号,下拉框选中数据
 

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -143,7 +143,16 @@ var bootstrap = function ($, learun) {
                     edit: {
                         type: 'select',
                         init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象
-
+                            if (data.IsSlow == true) {
+                                $edit[0]._lrselect.dfop._index = "0";
+                                $edit.find('.lr-select-placeholder').html('是');
+                            } else if (data.IsSlow == false) {
+                                $edit[0]._lrselect.dfop._index = "1";
+                                $edit.find('.lr-select-placeholder').html('否');
+                            } else {
+                                $edit[0]._lrselect.dfop._index = "-1";
+                                $edit.find('.lr-select-placeholder').html('');
+                            }
                         },
                         change: function (row, num, item) {// 行数据和行号,下拉框选中数据
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

@@ -797,7 +797,8 @@ export default {
 		// },
 		//高德地图ak 两个ak交替使用
 		GET_AK() {
-			let ak = ['b07d0a74e059a6f132ede93ff3826515','6f461c2f11d1ae36ac12e4fa327c15b1']
+			// let ak = ['b07d0a74e059a6f132ede93ff3826515','6f461c2f11d1ae36ac12e4fa327c15b1']
+			let ak = ['4e0f7f050a74345787739b7abb403a91','bdc8eaaa7b04e77c5561f9950f0ab529']
 			let current = this.GET_STORAGE('gaodeAK')
 			if(!current){
 				let ri = Math.floor(Math.random()*2);