学期报告新需求完善

src/views/learning/item-data-all.vue

@@ -23,6 +23,38 @@
           <!-- <div v-if="index+1 !== cardData.length" class="line"></div> -->
         </div>
       </div>
+      <div class="date-table">
+        <el-radio-group class="change-range" v-model="checkRange">
+          <el-radio-button label=1>累计</el-radio-button>
+          <el-radio-button label=2>新增</el-radio-button>
+        </el-radio-group>
+        <el-radio-group class="change-date" v-model="checkTime" size="medium">
+          <el-radio-button label=1>日</el-radio-button>
+          <el-radio-button label=2>周</el-radio-button>
+          <el-radio-button label=3>月</el-radio-button>
+          <el-radio-button label=4>年</el-radio-button>
+        </el-radio-group>
+        <el-table :data="tableDateTime" style="width: 100%">
+          <el-table-column prop="date" label="日期" align="center" min-width="100"></el-table-column>
+          <el-table-column prop="shouldOrgan" label="应参与机构数" align="center"></el-table-column>
+          <el-table-column prop="joinOrgan" label="已参与机构数" align="center"></el-table-column>
+          <el-table-column prop="shouldPeople" label="应参与人数" align="center"></el-table-column>
+          <el-table-column prop="joinPeople" label="已参与人数" align="center"></el-table-column>
+          <el-table-column prop="getPeople" label="获证人数" align="center"></el-table-column>
+        </el-table>
+        <!-- <div class="pagination">
+          <el-pagination
+            background
+            @size-change="handleSizeDate"
+            @current-change="handleCurrentDate"
+            :current-page="formTable.pageNo"
+            :page-sizes="[10, 20, 30, 100]"
+            :page-size="formTable.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totalRows"
+          ></el-pagination>
+        </div> -->
+      </div>
       <div class="chart-title">证历分布情况</div>
       <div class="chart-distributeChart">
         <div class="distributeChart" id="distributeChart" ref="distributeChart"></div>
@@ -97,17 +129,17 @@
           <el-table-column prop="learnTime" label="学习时长" align="center"></el-table-column>
         </el-table>
         <div class="pagination">
-        <el-pagination
-          background
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="formTable.pageNo"
-          :page-sizes="[10, 20, 30, 100]"
-          :page-size="formTable.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="totalRows"
-        ></el-pagination>
-      </div>
+          <el-pagination
+            background
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="formTable.pageNo"
+            :page-sizes="[10, 20, 30, 100]"
+            :page-size="formTable.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="totalRows"
+          ></el-pagination>
+        </div>
       </div>
     </div>
   </div>
@@ -161,11 +193,14 @@ export default {
         }
       ],
       tableData: [],
+      tableDateTime: [],
       totalRows: 0,
       formTable: {
         pageNo: 1,
         pageSize: 10,
       },
+      checkRange: 2,
+      checkTime: 2,
     };
   },
   created() {
@@ -174,6 +209,7 @@ export default {
     vm.initCard();
     if(vm.dataType == 0) {
       // vm.setInitWidth();
+      vm.setTableDate();
       setTimeout(function() {
       // vm.$nextTick(() => {
         vm.setDistributeChart();
@@ -236,6 +272,18 @@ export default {
         vm.cardData = cardData.slice(0,2);
       }
     },
+    setTableDate() {
+      vm.tableDateTime = [
+        {
+          date: '2019-11-15',
+          shouldOrgan: 7900,
+          joinOrgan: 7900,
+          shouldPeople: 8000,
+          joinPeople: 8000,
+          getPeople: 8000,
+        }
+      ];
+    },
     updateResize() {
       setTimeout(function() {
         window.onresize = function() {
@@ -902,6 +950,16 @@ export default {
       margin-right: 1%;
     }
   }
+  .date-table {
+    position: relative;
+    width: 100%;
+    margin-top: 20px;
+    .change-date {
+      position: relative;
+      float: right;
+      margin-bottom: 5px;
+    }
+  }
   .chart-select {
     position: relative;
   }

src/views/learning/item-list.vue

@@ -5,6 +5,7 @@
       <el-form class="item-form" ref="formInline" :model="formInline" label-width="80px">
         <el-form-item label="选择地区：">
           <!-- :props="props" -->
+          <!-- <el-col :span="8"> -->
           <el-cascader
             size="small"
             ref="cascaderRegion"
@@ -46,15 +47,41 @@
             @close="handleTagClose(tag)"
           >{{ tag.label }}</el-tag>
         </div>
+        <el-form-item label="选择时间：">
+          <el-col :span="8">
+            <el-select 
+              size="small"
+              v-model="formInline.timeFlag" 
+              placeholder="请选择"
+              style="width:330px"
+              >
+              <el-option
+                v-for="item in timeFlagList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="8" v-show="formInline.timeFlag == 2">
+            <el-date-picker
+              size="small"
+              v-model="formInline.during"
+              type="daterange"
+              range-separator="~"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </el-col>
+        </el-form-item>
         <el-form-item label v-if="showOriginal == 1">
           <el-checkbox size="small" v-model="formInline.checked">查看原始数据</el-checkbox>
         </el-form-item>
+        <div class="form-button">
+          <el-button @click="search()" type="primary">查询</el-button>
+          <el-button @click="resetForm()">重置</el-button>
+        </div>
       </el-form>
-      <div class="form-button">
-        <el-button @click="search()" type="primary">查询</el-button>
-        <el-button @click="resetForm()">重置</el-button>
-      </div>
-      
       <div class="button-group">
         <el-button v-if="roleType == 'L1' || roleType == 'L2'" type="default" size="small" @click="changeDate">数据修改</el-button>
         <!-- <el-button type="default" size="small" @click="update" v-else>修改范围</el-button> -->
@@ -97,7 +124,7 @@
             :organizationList="organizationList"
           ></examination-analysisfrom>
         </el-tab-pane>
-        <!-- <el-tab-pane label="数据总览" name="zero" >
+        <el-tab-pane label="数据总览" name="zero" >
           <data-all
             ref="childDataAll"
             :formInline="formInline"
@@ -108,7 +135,7 @@
         </el-tab-pane>
         <el-tab-pane label="学习效果分析" name="fifth" :lazy=true>
           <learning-effect></learning-effect>
-        </el-tab-pane> -->
+        </el-tab-pane>
       </el-tabs>
       <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" center>
         <p style="text-align:center">文件正在生成，你可以去“我的导出下载”页，下载文件</p>
@@ -212,8 +239,10 @@ export default {
         date: "",
         organization: [],
         checked: false,
+        timeFlag: 1,
+        during: '',
         pageNo: 1,
-        pageSize: 20
+        pageSize: 20,
       },
       organizationNotice: '选择地区筛选到区才能选择机构',
       dialogData: {
@@ -223,12 +252,23 @@ export default {
         // organizationData: "",
       },
       tags: [],
-      activeName: "first",
+      activeName: "zero",
       organizationNum: 0,
       dialogVisible: false,
       dialogUpdate: false,
       displayExam: 2,
       flag: 1,
+      //v2.0更新data部分
+      timeFlagList: [
+        {
+          value: 1,
+          label: '截至昨日',
+        },
+        {
+          value: 2,
+          label: '开始时间结束时间',
+        }
+      ]
     };
   },
   computed: {
@@ -454,6 +494,7 @@ export default {
       vm.search();
     },
     search() {
+      console.log(vm.formInline.during);
       // console.log(this.formInline,this.activeName);
       if (this.activeName == "first") {
         this.organizationNum = this.getOrganizationNum();
@@ -586,16 +627,21 @@ export default {
       border-bottom: 1px solid #efefef;
     }
     .item-form {
+      position: relative;
+      margin-bottom: 20px;
       padding: 10px;
       background: #fff;
       width:100%;
       border-radius: 4px;
-    }
-    .form-button {
-      width: 45%;
-      top: -120px;
-      position: relative;
-      left: 50%;
+      .form-button {
+        position: absolute;
+        width: 45%;
+        top: 20px;
+        left: 80%;
+      }
+      .col-text {
+        font-size: 12px;
+      }
     }
     .button-group {
       position: relative;