Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

src/views/data/DataStatisticsList.vue

@@ -26,7 +26,7 @@
             <a-card :bordered="false">
               <div class="table-page-search-wrapper">
                 <a-form layout="inline">
-                  <a-row :gutter="48">
+                  <!-- <a-row :gutter="48">
                     <a-col :md="6" :sm="24">
                       <a-form-item label="部门名称"><a-input v-model="queryParam.orgName" placeholder="请输入部门名称" @pressEnter="loadData1" /></a-form-item>
                     </a-col>
@@ -34,7 +34,7 @@
                       <a-button type="primary" @click="$refs.table1.refresh(true)">查询</a-button>
                       <a-button style="margin-left: 8px" @click="() => {queryParam = {}, this.loadData1()}">重置</a-button>
                     </a-col>
-                  </a-row>
+                  </a-row> -->
                 </a-form>
               </div>
               <s-table
@@ -74,7 +74,7 @@
             <a-card :bordered="false">
               <div class="table-page-search-wrapper" >
                 <a-form layout="inline">
-                  <a-row :gutter="48">
+                  <!-- <a-row :gutter="48">
                     <a-col :md="6" :sm="24">
                       <a-form-item label="部门名称"><a-input v-model="queryParam.orgName" placeholder="请输入部门名称" @pressEnter="loadData2" /></a-form-item>
                     </a-col>
@@ -82,9 +82,13 @@
                       <a-button type="primary" @click="$refs.table2.refresh(true)">查询</a-button>
                       <a-button style="margin-left: 8px" @click="() => {queryParam = {}, this.loadData2()}">重置</a-button>
                     </a-col>
-                  </a-row>
+                  </a-row> -->
                 </a-form>
               </div>
+              <div class="table-operator">
+                  <a-button @click="changeSort(1)" ref="toFocus">按累计学时排序</a-button>
+                  <a-button @click="changeSort(2)">按年度学时排序</a-button>
+              </div>
 
               <s-table
                 ref="table2"
@@ -100,9 +104,9 @@
 
         <a-divider>前十统计排名</a-divider>
         <div class="table-operator">
-            <a-button @click="changeTopType(1)" ref="toFocus">公司排名年度学时前十统计</a-button>
+            <a-button @click="changeTopType(1)">公司排名年度学时前十统计</a-button>
             <a-button @click="changeTopType(2)">公司累计学时学时前十统计</a-button>
-        </div> 
+        </div>
         <s-table
           v-show="topType==1"
           ref="tableTop1"
@@ -112,7 +116,7 @@
           :rowKey="(record) => record.id"
         >
         </s-table>
-        
+
         <s-table
           v-show="topType==2"
           ref="tableTop2"
@@ -121,7 +125,7 @@
           :showPagination="false"
           :rowKey="(record) => record.id"
         >
-        </s-table>      
+        </s-table>
       </a-tab-pane>
     </a-tabs>
 
@@ -141,7 +145,7 @@
     data () {
       return {
         // 查询参数
-        queryParam: { orgId: undefined, orgName: '' },
+        queryParam: { orgId: undefined, orgName: '', asc: 1, type: 1 },
         // 表头1
         columns1: [
           {
@@ -150,7 +154,7 @@
           },
           {
             title: '学员数量',
-            dataIndex: 'studentCount'
+            dataIndex: 'personCount'
           },
           {
             title: '培训人数',
@@ -175,6 +179,10 @@
         ],
         loadData1: parameter => {
           return dataOrgStatistics(Object.assign(parameter, this.queryParam)).then((res) => {
+            const data = res.rows
+            data.forEach(function(val){
+                val.trainRate = val.trainRate + '%'
+            })
             return res
           })
         },
@@ -200,10 +208,6 @@
             title: '累计学时',
             dataIndex: 'sumClassHour'
           },
-          {
-            title: '人均学时',
-            dataIndex: 'avgClassHour'
-          }
         ],
         loadData2: parameter => {
           return dataPersonalStatistics(Object.assign(parameter, this.queryParam)).then((res) => {
@@ -241,7 +245,7 @@
           }
         ],
         loadDataTop1: parameter => {
-          return dataClassHourTop(Object.assign(parameter, {type : 1})).then((res) => {
+          return dataClassHourTop(Object.assign(parameter, this.queryParam)).then((res) => {
             return res.data
           })
         },
@@ -276,7 +280,7 @@
           }
         ],
         loadDataTop2: parameter => {
-          return dataClassHourTop(Object.assign(parameter, {type : 2})).then((res) => {
+          return dataClassHourTop(Object.assign(parameter, this.queryParam)).then((res) => {
             return res.data
           })
         },
@@ -302,7 +306,7 @@
       this.getOrgTree()
     },
     mounted () {
-      
+
     },
     methods: {
       tabsCallback (key) {
@@ -347,10 +351,27 @@
         }
         if (this.keyType === '2') {
           this.$refs.table2.refresh(true)
+          if (this.topType === 1) {
+            this.$refs.tableTop1.refresh(true)
+          }
+          if (this.topType === 2) {
+            this.$refs.tableTop2.refresh(true)
+          }
         }
       },
       changeTopType (type) {
         this.topType = type
+        this.queryParam.type = type
+        if (this.topType === 1) {
+          this.$refs.tableTop1.refresh(true)
+        }
+        if (this.topType === 2) {
+          this.$refs.tableTop2.refresh(true)
+        }
+      },
+      changeSort (type) {
+        this.queryParam.asc = type
+        this.$refs.table2.refresh(true)
       }
     }
   }

src/views/notice/NoticeForm.vue

@@ -32,14 +32,23 @@
             </a-radio-group>
           </a-form-model-item>
         </a-col>
+      </a-row>
+      <a-row :gutter="16">
         <a-col :span="12">
           <a-form-model-item ref="isCalculate" label="是否计算学时" prop="isCalculate">
             <a-radio-group v-model="form.isCalculate">
-              <a-radio :value="1">是</a-radio>
+              <a-radio :value="1" @click="isCalculateFunc(1)">是</a-radio>
-              <a-radio :value="0">否</a-radio>
+              <a-radio :value="0" @click="isCalculateFunc(0)">否</a-radio>
             </a-radio-group>
           </a-form-model-item>
         </a-col>
+        <div v-if="classHourShow">
+          <a-col :span="12" >
+            <a-form-model-item ref="classHour" label="学时" prop="classHour" >
+              <a-input v-model="form.classHour" />
+            </a-form-model-item>
+          </a-col>
+        </div>
       </a-row>
       <a-row :gutter="16">
         <a-col :span="12">
@@ -136,7 +145,8 @@ export default {
         rangeId: 0,
         rangeName: '',
         isTop: 0,
-        isCalculate: 0,
+        isCalculate: 1,
+        classHour: 0,
         isNowPublish: false,
         publishTime: '',
         type: 1,
@@ -144,11 +154,13 @@ export default {
       },
       fileList: [],
       timeShow: true,
+      classHourShow: true,
       rules: {
         title: [{ required: true, message: '请输入公告标题', trigger: 'blur' }],
         rangeName: [{ required: true, message: '请选择发布范围', trigger: 'blur' }],
         isTop: [{ required: true, message: '请选择是否置顶', trigger: 'change' }],
         isCalculate: [{ required: true, message: '请选择是否计算学时', trigger: 'change' }],
+        classHour: [{ required: true, message: '请填写学时', trigger: 'change' }],
         isNowPublish: [{ required: true, message: '请选择即时发布', trigger: 'change' }],
         publishTime: [{ required: true, message: '请选择发布时间', trigger: 'change' }],
         type: [{ required: true, message: '请选择发布类型', trigger: 'change' }],
@@ -209,6 +221,9 @@ export default {
     },
     onChangeNow(checked) {
       this.timeShow = !checked
+    },
+    isCalculateFunc(type) {
+      this.classHourShow = type === 1
     }
   }
 }

src/views/person/PersonForm.vue

@@ -177,6 +177,20 @@
           </a-form>
         </a-col>
       </a-row>
+      <a-row :gutter="24">
+        <a-col :md="12" :sm="24">
+          <a-form :form="form">
+            <a-form-item
+              label="年度计划学时"
+              :labelCol="labelCol"
+              :wrapperCol="wrapperCol"
+              has-feedback
+            >
+              <a-input placeholder="请输入年度计划学时" v-decorator="['planClassHour']" />
+            </a-form-item>
+          </a-form>
+        </a-col>
+      </a-row>
 
       <a-divider orientation="left">上传身份证</a-divider>
       <a-row :gutter="24">
@@ -330,7 +344,8 @@
                workType: data.workType ? parseInt(data.workType) : undefined,
                degreeId: data.degreeId,
                orgId: data.orgId,
-               orgName: data.orgName
+               orgName: data.orgName,
+               planClassHour: data.planClassHour
              }
            )
            // 动态赋值年龄和性别