card组件使用时候的问题

src/utils/operation.js

@@ -312,6 +312,7 @@ export function setRegionOptionNew(data) {
     obj.label = data[i].label;
     obj.value = data[i].id;
     if(obj.degree == 4 || obj.degree == 0 || obj.label == "全部") {
+    // if(obj.degree == 4 ) {
       obj.leaf = true;
     }
     option.push(obj);

src/views/learning/data-alignment.vue

@@ -102,7 +102,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="formData.pageNo"
-        :page-sizes="[20, 50 ,100]"
+        :page-sizes="[20, 50 ,100, 200]"
         :page-size="formData.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="totalRows"
@@ -239,6 +239,7 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       vm.formData.pageSize = val;
+      vm.formData.pageNo = 1;
       vm.search();
     },
     // 换页
@@ -261,15 +262,18 @@ export default {
       let checkAll = operationData.hasAll(vm.formInline.organization);
       let req = {
         projectId: vm.projectId,
+        hospitalIdList: vm.formInline.organization,
+        originalFlag: vm.formInline.checked == false ? 0 : 1,
+        regionId: vm.formInline.region[vm.formInline.region.length - 1],
+        timeFlag: vm.formInline.timeFlag,
+
         achievementStatus: vm.formData.achievementStatus,
         status: vm.formData.status,
-        ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
-        type: operationData.getSearchType(vm.formInline,checkAll),
         doctorName: vm.formData.doctorName,
         pageNo: vm.formData.pageNo,
         pageSize: vm.formData.pageSize,
       };
-      vm.reportGET("report/portal/getProjectData", req).then(res => {
+      vm.POST("stats/report/getProjectData", req).then(res => {
         // closeLoading(vm);
         if (res.code == "000000") {
           vm.tableData = res.data.projectData;
@@ -339,7 +343,7 @@ export default {
         joinDoctorIdList: operationData.getAjustmentList(vm.changedDoctor),
       };
       openLoading(vm);
-      vm.reportPOST("report/portal/peopleAdjustment", req).then(res => {
+      vm.POST("stats/report/peopleAdjustment", req).then(res => {
         closeLoading(vm);
         vm.$message(res.message);
         if (res.code == "000000") {

src/views/learning/item-course-analysis.vue

 <template>
   <div class="course-analysis-wrap">
     <div class="box-list">
-      <div v-for="(item , index) in cardData" :key="index" class="box">
-        <el-card class="box-card" v-bind:class="{ 'box-last': index == 2 }">
-          <!-- <div class="box-center"> -->
+      <div v-for="(item , index) in cardData" :key="index" class="box-card" v-bind:class="{ 'box-last': index == 2 }">
+        <!-- <el-card class="box-card" v-bind:class="{ 'box-last': index == 2 }"> -->
           <p class="value">{{ item.value }}</p>
           <p class="title">{{ item.title }}</p>
-          <!-- </div> -->
-        </el-card>
+        <!-- </el-card> -->
       </div>
     </div>
     <div class="spacing"></div>

src/views/learning/item-crowd-analysis.vue

@@ -224,7 +224,7 @@ export default {
       vm.sexData = sexData;
     },
     educationDivision(data) {
-      console.log('this.$refs.education',this.$refs.education)
+      // console.log('this.$refs.education',this.$refs.education)
       let myChart = echarts.init(this.$refs.education);
       let educationList = this.crowdData.eduList;
       let legendData = [];

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

@@ -2,8 +2,8 @@
   <div class="data-all-wrap">
     <div v-if="dataType == 0" class="data-chart">
       <div class="box-list">
-        <div v-for="(item , index) in cardData" :key="index" class="box">
-          <el-card class="box-card" v-bind:class="{ 'box-last': index == 2 }">
+        <!-- <div v-for="(item , index) in cardData" :key="index" class="box"> -->
+          <div v-for="(item , index) in cardData" :key="index" class="box-card" v-bind:class="{ 'box-last': index == 2 }">
             <el-tooltip v-if="index == 2" class="item-tool" placement="bottom-end" effect="light">
               <div slot="content">
                 <p v-for="text in item.content">{{ text }}</p>
@@ -19,9 +19,8 @@
               <p class="has">{{ item.hasKey }}:{{ item.hasNum }}</p>
               <p class="should">{{ item.shouldKey }}:{{ item.shouldNum }}</p>
             </div>
-          </el-card>
-          <!-- <div v-if="index+1 !== cardData.length" class="line"></div> -->
-        </div>
+          </div>
+        <!-- </div> -->
       </div>
       <div class="date-table">
          <el-tabs class="change-range" v-model="checkRange" type="card" @tab-click="handleCheckRange">
@@ -99,9 +98,9 @@
     </div>
     <div v-if="dataType == 1" class="data-table">
       <div class="box-list">
-        <div v-for="(item , index) in cardData" :key="index" class="box">
-          <el-card class="box-card box-card2" v-bind:class="{ 'box-last': index == 1 }">
-            <el-tooltip class="item-tool" placement="bottom-end" effect="light">
+        <div v-for="(item , index) in cardData" :key="index" class="box-card box-card2" v-bind:class="{ 'box-last': index == 1 }">
+          <!-- <el-card class="box-card box-card2" v-bind:class="{ 'box-last': index == 1 }"> -->
+            <el-tooltip v-if="index == 1" class="item-tool" placement="bottom-end" effect="light">
               <div slot="content">
                 <p v-for="text in item.content">{{ text }}</p>
               </div>
@@ -116,7 +115,7 @@
               <p class="has">{{ item.hasKey }}:{{ item.hasNum }}</p>
               <p class="should">{{ item.shouldKey }}:{{ item.shouldNum }}</p>
             </div>
-          </el-card>
+          <!-- </el-card> -->
         </div>
       </div>
       <div class="date-table">
@@ -301,7 +300,7 @@ export default {
       vm.GET("stats/region/hospitals/cnt", req).then(res => {
         if (res.code == "000000") {
           vm.hospitalCnt = res.data.hospitalCnt;
-          vm.hospitalCnt = 1;
+          // vm.hospitalCnt = 1;
           if(vm.hospitalCnt == 1) {
             vm.hospitalId[0] = res.data.list[0].hospitalId;
           }
@@ -721,6 +720,9 @@ export default {
     position: relative;
     padding: 30px 30px 0 30px;
     height: 136px;
+    // .box {
+    //   height: 106px;
+    // }
     .box-card {
       position: relative;
       background-color: #e3efed;

src/views/learning/item-examination-analysis.vue

 <template>
   <div class="examination-analysis">
     <div class="box-list">
-      <div v-for="(item , index) in cardData" :key="index" class="box">
-        <el-card class="box-card" v-bind:class="{ 'box-last': index == 2 }">
-          <!-- <div class="box-center"> -->
+      <div v-for="(item , index) in cardData" :key="index" class="box-card" v-bind:class="{ 'box-last': index == 2 }">
+        <!-- <el-card class="box-card" v-bind:class="{ 'box-last': index == 2 }"> -->
           <p class="value">{{ item.value }}</p>
           <p class="title">{{ item.title }}</p>
-          <!-- </div> -->
-        </el-card>
+        <!-- </el-card> -->
       </div>
     </div>
     <div class="spacing"></div>

src/views/learning/item-learning-effect.vue

 <template>
   <div class="learning-effect">
     <div class="box-list">
-      <div v-for="(item , index) in cardData" :key="index" class="box">
-        <el-card class="box-card" v-bind:class="{ 'box-last': index == 1 }">
-          <!-- <div class="left-content"> -->
-             <p class="value">{{ item.value }}</p>
-            <p class="title">{{ item.title }}</p>
-          <!-- </div> -->
-        </el-card>
+      <div v-for="(item , index) in cardData" :key="index" class="box-card" v-bind:class="{ 'box-last': index == 1 }">
+        <!-- <el-card class="box-card" v-bind:class="{ 'box-last': index == 1 }"> -->
+          <p class="value">{{ item.value }}</p>
+          <p class="title">{{ item.title }}</p>
+        <!-- </el-card> -->
       </div>
     </div>
     <div class="spacing"></div>

src/views/learning/item-list.vue

@@ -149,10 +149,10 @@
         </el-tab-pane>
       </el-tabs>
       <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" center>
-        <p style="text-align:center">文件正在生成，你可以去“我的导出下载”页，下载文件</p>
+        <p style="text-align:center">由于查询数据较大，预估需要花费 5 小时左右。确定继续生成报告吗？</p>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">留在当前页</el-button>
-          <el-button type="primary" @click="toDownload()">去下载</el-button>
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="exportHttp()">继续生成</el-button>
         </span>
       </el-dialog>
       <el-dialog title :visible.sync="dialogUpdate" width="80%" center>
@@ -248,7 +248,7 @@ export default {
         // organizationData: "",
       },
       tags: [],
-      activeName: "second",
+      activeName: "zero",
       organizationNum: 0,
       dialogVisible: false,
       dialogUpdate: false,
@@ -430,10 +430,11 @@ export default {
       vm.GET("stats/region", req).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
+          vm.formInline.region = [];
+          vm.formInline.region[0] = res.data.list[0].id;
           vm.optionsRegion = operationData.setRegionOptionNew(
             res.data.list
           );
-          vm.formInline.region[0] = res.data.list[0].id;
           vm.search();
         }
       });
@@ -529,21 +530,27 @@ export default {
       },3000);
       this.dialogVisible = true;
       //download接口
-      let checkAll = operationData.hasAll(vm.formInline.organization)
-      let req = {
-        projectId : vm.projectId,
-        ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
-        type: operationData.getSearchType(vm.formInline,checkAll),
-        originalFlag: vm.formInline.checked == false ? 0 : 1,
-        projectName: vm.$route.query.projectName,
-        cityName: vm.getCityName(),
-      };
+      // let checkAll = operationData.hasAll(vm.formInline.organization)
+      // let req = {
+      //   projectId : vm.projectId,
+      //   ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
+      //   type: operationData.getSearchType(vm.formInline,checkAll),
+      //   originalFlag: vm.formInline.checked == false ? 0 : 1,
+      //   projectName: vm.$route.query.projectName,
+      //   cityName: vm.getCityName(),
+      // };
+      // openLoading(vm);
+      // vm.reportGET("report/downLoad/downLoad", req).then(res => {
+      //   closeLoading(vm);
+      //   // console
+      //   if (res.code == "000000") {
+      //   }
+      // });
+    },
+    exportHttp() {
+      let req = {};
       openLoading(vm);
-      vm.reportGET("report/downLoad/downLoad", req).then(res => {
-        closeLoading(vm);
-        // console
-        if (res.code == "000000") {
-        }
+      vm.POST("report/downLoad/downLoad", req).then(res => {
       });
     },
     getCityName() {
@@ -622,9 +629,9 @@ export default {
 
           let pageData = canvas.toDataURL('image/jpeg', 1.0);
 
-          let pdf = new JsPDF('', 'pt', [contentWidth*0.7,contentHeight*0.7]);
+          let pdf = new JsPDF('', 'pt', [contentWidth*0.8,contentHeight*0.8]);
           
-          pdf.addImage(pageData, 'JPEG', 0, position, contentWidth*0.7, contentHeight*0.7)
+          pdf.addImage(pageData, 'JPEG', 0, position, contentWidth*0.8, contentHeight*0.8)
           let title = "导出学情报告";
           pdf.save(title + '.pdf');