Merge branch 'master' of http://182.44.34.170:8081/jiankun/q-baqd

src/views/dataImport/dataAnalysis/index.vue

@@ -83,26 +83,6 @@
 
       <div class="tableBox1">
         <div class="left">
-          <!-- <div class="top">
-            <div class="lt">
-              <div class="item">
-                <img class="icon" src="@/assets/404_images/404_cloud.png" alt="" />
-                <div class="con">患者基本信息</div>
-                <div class="baifen">{{ errorDataFelg.base }}%</div>
-              </div>
-              <div class="item">
-                <img class="icon" src="@/assets/404_images/404_cloud.png" alt="" />
-                <div class="con">诊疗信息</div>
-                <div class="baifen">{{ errorDataFelg.diagnosis }}%</div>
-              </div>
-              <div class="item">
-                <img class="icon" src="@/assets/404_images/404_cloud.png" alt="" />
-                <div class="con">费用信息</div>
-                <div class="baifen">{{ errorDataFelg.cost }}%</div>
-              </div>
-            </div>
-            <el-button type="primary" icon="el-icon-download" @click="funExport('缺陷问题统计', '/errorData')" class="export-btn">导出数据</el-button>
-          </div> -->
           <el-table height="400px" :data="errorDataList" style="width: 100%;">
             <el-table-column type="index" label="序号"></el-table-column>
             <el-table-column prop="desc" align="center" label="缺陷描述"></el-table-column>
@@ -116,9 +96,7 @@
               <template slot-scope="scope">
                 <span class="blue" @click="GoDefectList(scope.row)" style="cursor: pointer;">
                   {{ scope.row.count }}
-                  <!-- <i style="color: red; font-size: 18px; margin-left: 2px" class="el-icon-view"></i> -->
                 </span>
-                <!-- <span class="blue" @click="GoDefectList(scope.row)">{{ scope.row.count }}</span> -->
               </template>
             </el-table-column>
           </el-table>
@@ -170,20 +148,25 @@ export default {
     };
   },
   mounted() {
-    // 获取医院名称
-    this.getHospitalList();
     this.storageSet('endTime', '');
     this.storageSet('startTime', '');
     // 默认获取当前本年日期
     this.getdaTe();
     this.formData.chooseDate = 3;
     this.chooseTime(this.formData.chooseDate);
-    this.initCharts1();
-    this.funAggregate();
-    this.selectInfo();
+
+    // 获取医院名称
+    this.getHospitalList(this.funQuery);
 
   },
+
   methods: {
+    funQuery() {
+      //查询
+      this.funAggregate();
+      this.initCharts1();
+      this.selectInfo();
+    },
     funGoto() {
       this.storageSet('endTime', this.formData.endTime || '');
       this.storageSet('startTime', this.formData.startTime || '');
@@ -198,7 +181,6 @@ export default {
       this.formData.startTime = '';
       this.formData.endTime = '';
       this.funQuery();
-      this.selectInfo();
     },
     // 获取默认当前日期
     getdaTe(){
@@ -217,14 +199,16 @@ export default {
     chooseTime(time) {
       console.error(time);
       this.formData.chooseDate = time;
-      this.funAggregate();
+      // this.funAggregate();
       return;
     },
     // 获取医院名称
-    getHospitalList() {
+    getHospitalList(f) {
       this.$axios.post('/home_quality/getHospitalList').then(res => {
         console.log(res.data)
-        this.departmentList = res.data;
+        this.HospitalList = res.data;
+        this.hospital_name = res.data[0];
+        return f()
       });
     },
 
@@ -241,12 +225,7 @@ export default {
         this.yearList = res.data.year;
       });
     },
-    funQuery() {
-      //查询
-      this.funAggregate();
-      this.initCharts1();
-      
-    },
+
     funAggregate() {
       let type_id = '';
       if (this.formData.type == '1') {