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

quasar.conf.js

@@ -48,9 +48,9 @@ module.exports = function(ctx) {
 
             env: ctx.dev ? {
                 //API: 'http://localhost:5001/api',
-                API: 'http://192.168.10.46:8300/api',
+                API: 'http://192.168.10.2:8085/api',
                 // API: 'https://eduapi.oytour.com/api',
-                API_ZC: 'http://192.168.10.17:8087/api',
+                API_ZC: 'http://192.168.10.2:8087/api',
                 API_SK: 'ws:192.168.10.214:',
                 API_SIG: 'http://localhost:5001/messagecenter'
             } : {

src/pages/activity/configurationstudentsList.vue

@@ -9,7 +9,6 @@
           <q-space />
           <div class="page-option">
             <q-btn color="accent" size="sm" icon="add" label="新增"  @click="addObj(null)"/> 
-            <!-- @click="addObj(null)" -->
           </div>
         </template>
 <template v-slot:body-cell-IsRequired="props">
@@ -66,6 +65,16 @@
                         label: '学员名称',
                         field: 'GuestName',
                         align: 'left'
+                    }, {
+                        name: 'StartTime',
+                        label: '开始时间',
+                        field: 'StartTime',
+                        align: 'left'
+                    }, {
+                        name: 'EndTime',
+                        label: '结束时间',
+                        field: 'EndTime',
+                        align: 'left'
                     },
 
                     {
@@ -109,7 +118,7 @@
                     this.loading = false;
                     if (res.Code == 1) {
                         this.dataList = res.Data.PageData;
-                        this.pageCount = res.Data.Count
+                        this.pageCount = res.Data.PageCount;
                     }
                     console.log("res", res);
                 });

src/pages/financial/reportform/performanceCommission.vue

@@ -49,7 +49,7 @@
   border: 1px solid #d2d2d2;
 }
 .bj {
-  background-color: #e6e6e6;
+  background-color: #A5A5A5;
 }
 
 .stulistNumber {
@@ -145,7 +145,7 @@
             <th
               v-for="(item, index) in titlelist"
               :key="index"
-              :width="item.Id == 1 ? 120 : 200"
+              :width="item.Id == 1 ? 200 : 200"
             >
               {{ item.Name }}
             </th>
@@ -563,7 +563,7 @@ export default {
           this.RListlength = res.Data && res.Data[0].MonthList;
           this.titlelist = [
             {
-              Name: "业绩",
+              Name: "当月业绩",
               Id: 1,
               index: 0
             },