Merge branch 'develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/view/school-mgmt/ClassroomSetting/ClassroomSetting.vue

@@ -146,7 +146,7 @@
             <div class="hiteach-code-wrap-header">
               <p> 
                 HiTeach序号列表（星号为大量授权序号）
-                <Icon style="float:right;margin-right:12px;margin-top:2px;" class="label-icon" color="white" type="md-add" @click="addHiTeachCode" />
+                <Icon style="float:right;margin-right:12px;margin-top:2px;cursor:pointer;" class="label-icon" color="white" type="md-add" @click="addHiTeachCode" />
               </p>
               <Input v-model="serchCode" placeholder="请输入关键字或资讯" style="width: 100%;height:30px;" @on-change="filterCode">
               <Icon style="margin-top:0px;" type="ios-search" slot="suffix" />
@@ -191,13 +191,21 @@
       </div>
     </div>
     <Modal v-model="addCode"
-           title="Common Modal dialog box title"
-           @on-ok="ok"
-           @on-cancel="cancel">
-      <p>Content of dialog</p>
-      <p>Content of dialog</p>
-      <p>Content of dialog</p>
-    </Modal>
+           title="录入HiTeach序列号"
+           @on-ok="confirmAdd"
+           @on-cancel="cancelAdd">
+      <Form :model="hiTeachItem" :label-width="80" label-position="left">
+        <FormItem label="HiTeach序号">
+          <Input v-model="hiTeachItem.code" placeholder="请输入HiTeach序号..."></Input>
+        </FormItem>
+        <FormItem label="大量授权">
+          <Select v-model="hiTeachItem.single">
+            <Option value="1">是</Option>
+            <Option value="0">否</Option>
+          </Select>
+        </FormItem>
+      </Form>
+</Modal>
   </div>
 </template>
 
@@ -205,6 +213,17 @@
   export default {
     data() {
       return {
+        demoLoginInfo: {
+          user: "admin",
+          teamModelId: "habook#0001",
+          school: "醍摩豆书院",
+          schoolCode:"101010"
+        },
+        hiTeachItem: {
+          code: '',
+          single: undefined,
+          using:0
+        },
         addCode:false,
         isInit: true,
         updated: false,
@@ -309,11 +328,22 @@
     methods: {
       addHiTeachCode() {
         this.addCode = true;
+      },
+      confirmAdd() {
+        this.hiTeachs.push(this.hiTeachItem);
+        this.filterCode();
+        this.hiTeachItem = {
+          code: '',
+          single: undefined,
+          using:0
+        }
+      },
+      cancelAdd() {
+
       },
       bundleScoll() {
         let schoolPlanBox = document.getElementById('school-plan-box');
         let _this = this;
-        //this.schoolPlan.addEventListener('mousewheel', this.scrollFunc(e), true) || this.schoolPlan.addEventListener("DOMMouseScroll", this.scrollFunc(e), false);
         schoolPlanBox.addEventListener('mousewheel', function (e) {
           if (e.preventDefault) {
             e.preventDefault();

TEAMModelOS/ClientApp/view/school-mgmt/SystemSetting/SystemSetting.vue

@@ -172,15 +172,20 @@
     },
     data() {
       return {
+        demoLoginInfo: {
+          user: "admin",
+          teamModelId: "habook#0001",
+          school: "醍摩豆书院",
+          schoolCode:"101010"
+        },
         auto: true,
         updated:false,
         currentSchoolSysIndex:0,
         currentSemesterIndex: 0,
         isInit: true,
         schoolSetting: {
-          //id:"",
-          code: "学校编码",
-          name: "学校名称",
+          code: "",
+          name: "",
           systems: [
             {
               name: "预设学段1",
@@ -251,6 +256,8 @@
         }
       }, 
       initData() {
+        this.schoolSetting.code = this.demoLoginInfo.schoolCode;
+        this.schoolSetting.name = this.demoLoginInfo.school;
         this.schoolSetting.systems[0].grade.push({
           name: '一年级',
           code: this.guid()