Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

package.json

@@ -18,6 +18,7 @@
     "co": "^4.6.0",
     "core-js": "^3.6.5",
     "cos-js-sdk-v5": "^1.1.5",
+    "echarts": "^5.1.2",
     "element-ui": "^2.14.1",
     "html2canvas": "^1.0.0-rc.7",
     "js-md5": "^0.7.3",

src/api/users/user.js

@@ -124,3 +124,49 @@ export function getEmployeeAddrBook(data)
       })
     }
   
+
+      /**
+ * 获取我的提成折线图
+ */
+    export function getUserSellCommission(data)
+    {
+      return request({
+        url: '/UserInfo/GetUserSellCommission',
+        method: 'post',
+        data
+      })
+    }
+      /**
+ * 获取我的奖金折线图
+ */
+  export function getTeacherSellCommission(data)
+  {
+    return request({
+      url: '/UserInfo/GetTeacherSellCommission',
+      method: 'post',
+      data
+    })
+  }
+      /**
+ * 个人中心 我的奖金确认  
+ */
+  export function updateSureTeachingBonusDetail(data)
+  {
+    return request({
+      url: '/UserInfo/UpdateSureTeachingBonusDetail',
+      method: 'post',
+      data
+    })
+  }
+
+      /**
+ * 个人中心 我的提成确认  
+ */
+  export function updatSureSellCommission(data)
+  {
+    return request({
+      url: '/UserInfo/UpdatSureSellCommission',
+      method: 'post',
+      data
+    })
+  }
\ No newline at end of file

src/components/activity/active-from.vue

@@ -24,7 +24,7 @@
                 <q-icon name="event" class="cursor-pointer">
                   <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
                     <div class="q-gutter-md row items-start">
-                      <q-date v-model="addMsg.StartTime" :options="StartTimeOptions" mask="YYYY-MM-DD HH:mm:ss"></q-date>
+                      <q-date v-model="addMsg.StartTime"  mask="YYYY-MM-DD HH:mm:ss"></q-date>
                       <q-time v-model="addMsg.StartTime" format24h mask="YYYY-MM-DD HH:mm:ss" />
                     </div>
                     <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
@@ -40,7 +40,7 @@
                 <q-icon name="event" class="cursor-pointer">
                   <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
                     <div class="q-gutter-md row items-start">
-                      <q-date v-model="addMsg.EndTimeStr" :options="EndTimeOptions" mask="YYYY-MM-DD HH:mm:ss" @input="edate"></q-date>
+                      <q-date v-model="addMsg.EndTimeStr"  mask="YYYY-MM-DD HH:mm:ss" @input="edate"></q-date>
                       <q-time v-model="addMsg.EndTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="etime" />
                     </div>
                     <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
@@ -56,7 +56,7 @@
                 <q-icon name="event" class="cursor-pointer">
                   <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
                     <div class="q-gutter-md row items-start">
-                      <q-date v-model="addMsg.SignStartTimeStr" :options="SignStartTimeOptions" mask="YYYY-MM-DD HH:mm:ss" @input="date" />
+                      <q-date v-model="addMsg.SignStartTimeStr"  mask="YYYY-MM-DD HH:mm:ss" @input="date" />
                       <q-time v-model="addMsg.SignStartTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="time" />
                     </div>
                     <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
@@ -72,7 +72,7 @@
                 <q-icon name="event" class="cursor-pointer">
                   <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
                     <div class="q-gutter-md row items-start">
-                      <q-date v-model="addMsg.SignEndTimeStr" :options="SignEndTimeOptions" mask="YYYY-MM-DD HH:mm:ss" @input="endDate" />
+                      <q-date v-model="addMsg.SignEndTimeStr"  mask="YYYY-MM-DD HH:mm:ss" @input="endDate" />
                       <q-time v-model="addMsg.SignEndTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="endTime" />
                     </div>
                     <q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />

src/components/school/teacher/teacher-form.vue

@@ -286,6 +286,9 @@
           this.objOption.BaseStuNum = this.saveObj.BaseStuNum;
           this.objOption.BaseHourFee = this.saveObj.BaseHourFee;
           this.objOption.Specialty = this.saveObj.Specialty;
+
+          this.objOption.EnableTime = this.saveObj.EnableTime;
+          this.objOption.BaseHoursEnabled = this.saveObj.BaseHoursEnabled;
           if (this.saveObj.ChooseSpecialty && this.saveObj.ChooseSpecialty.length > 0) {
             this.chooseSpecialty = this.saveObj.ChooseSpecialty;
           }

src/pages/administration/document.vue

@@ -479,7 +479,7 @@
       //分页改变
       changePage(val) {
         this.msg.PageIndex = val;
-        this.getSchool()
+        this.getList()
       },
       getChild(deptArray) {
         var tempStr = "";

src/pages/course/classorder.vue

@@ -4,7 +4,7 @@
       <div class="row col" style="justify-content: space-between;align-items: center;margin-bottom: 10px">
         <div>
           <template v-if="data&& data.ClassInfo">
-            {{data.ClassInfo.ClassName}}
+            {{data.ClassInfo.ClassName}} <span v-if='data.ClassInfo.ClassNo!=null' style="cursor: pointer;text-decoration: underline;" @click='gojapaneseTrain(data.ClassInfo.ClassNo)'>({{data.ClassInfo.ClassNo}})</span>
           </template>
         </div>
         <div class="row" style="align-items: center">
@@ -110,6 +110,12 @@
       //刷新页面
       refreshClassOrder() {
         this.getList();
+      },
+      gojapaneseTrain(ClassNo){//跳转到产品列表
+        var tempStr = '/sale/japaneseTrain?ClassNo=' + ClassNo;
+        this.$router.push({
+          path: tempStr
+        });
       }
     }
   }

src/pages/course/questionInfo.vue

@@ -107,6 +107,9 @@
     margin-bottom:20px;
     box-shadow: 0px 2px 10px 0px rgba(237, 238, 240, 0.5);
   }
+  .qussTionTitDiv img{
+    width:100%;
+  }
 </style>
 <template>
   <div class="questionMain">
@@ -115,7 +118,7 @@
         <div class="col-12 edit_stem">
           {{objOption.QuestionTypeName}}
         </div>
-        <div class="col-12">
+        <div class="col-12 qussTionTitDiv">
           <div v-html="objOption.Title" @click="clickQuestion($event)"></div>
         </div>
         <!--单选题-->

src/pages/financial/teacherclassfee.vue

@@ -224,6 +224,8 @@
             if(this.$route.query && this.$route.query.ClassName){
                 let Name = decodeURI(this.$route.query.ClassName)
                 this.ClassName = [Name]
+                console.log(Name)
+                this.msg.pageSize = 1000
             }
             
         },

src/pages/sale/japaneseTrain.vue

@@ -363,6 +363,9 @@
       if (this.$route.query && this.$route.query.ClassName) {
         this.msg.ClassName = this.$route.query.ClassName;
       }
+      if (this.$route.query && this.$route.query.ClassNo) {
+        this.msg.ClassNo = this.$route.query.ClassNo;
+      }
       let nowDay = new Date();
       var year = nowDay.getFullYear(); //年
       var month = nowDay.getMonth() + 1; //月

src/pages/test.vue

@@ -97,7 +97,7 @@
     },
     data() {
       return {
-        ActionStr: "/Class/InitClassCheck",
+        ActionStr: "/Class/InitData",
         parameterList: [{
           Name: "",
           Value: ""
@@ -156,6 +156,7 @@
             tempStr = "{" + tempStr.substring(1, tempStr.length) + "}";
             data = JSON.parse(tempStr);
           }
+
           var tempMsg = {
             Msg: data
           };

src/pages/user/personalData.vue

@@ -115,7 +115,7 @@
                     <div class="text-muted" style="font-size:14px;margin-top: 12px;">
                         {{showObj.SchoolName}}·{{showObj.PostName}}</div>
                     <div class="q-mt-xs">
-                        <q-btn style="background: var(--q-color-negative);color: white;" @click="logout">退出登录</q-btn>
+                        <q-btn style="background: var(--q-color-negative);color: white;margin-top: 10px;" size="sm" @click="logout">退出登录</q-btn>
                     </div>
                 </div>
             </div>
@@ -131,9 +131,8 @@
                 <span class="box_l_t_l">部门：</span>
                 <span>{{showObj.DeptName}}</span>
             </div>
-            <!-- <div class="box_l_title" style="margin-top: 55px;">概要信息</div> -->
-            <!-- <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div>
-            <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
+            <!-- <div :class="rightType==0?'box_l_title':'box_l_cen'" @click='rightType=0'>概要信息</div> -->
+            <!-- <div :class="rightType==3?'box_l_title':'box_l_cen'" @click='rightType=3'>预警信息</div> -->
             <div :class="rightType==1?'box_l_title':'box_l_cen'" @click='rightType=1'>账户资料</div>
             <div :class="rightType==2?'box_l_title':'box_l_cen'" @click='rightType=2'>密码修改</div>
         </div>