bugfix

src/views/allcase/caseIndex.vue

@@ -57,9 +57,10 @@
                 <span :class="{'green': scope.row.source === '人工录入' }">{{ scope.row.source }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="" label="操作" width="120">
+            <!-- 同一个tableData 不会存在 多个来源 -->
+            <el-table-column v-if="tableData.length && tableData[0].source === '人工录入'" prop="" label="操作" width="120">
               <template slot="header" slot-scope="scope">
-                  <span>操作</span>
+                <span>操作</span>
                 <i class="el-icon-edit table_edit" v-if="scope._self.judgeEdit" @click="onChangeValue"></i>
               </template>
               <template slot-scope="scope">

src/views/allcase/caseIndexAnalysis.vue

@@ -25,8 +25,22 @@
       <el-col :span="16">
         <div class="box_wrapper">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="出院时间">
+            <el-form-item label="">
               <el-date-picker
+                v-model="formInline.start_time"
+                type="date"
+                :picker-options="pickerOptions1"
+                placeholder="开始日期">
+            </el-date-picker>
+            </el-form-item>
+            <el-form-item label="">
+              <el-date-picker
+                v-model="formInline.end_time"
+                type="date"
+                :picker-options="pickerOptions2"
+                placeholder="结束日期">
+            </el-date-picker>
+              <!-- <el-date-picker
                 v-model="formInline.time"
                 type="daterange"
                 range-separator="至"
@@ -34,7 +48,7 @@
                 end-placeholder="结束日期"
                 :picker-options="pickerOptions"
                 value-format="yyyyMMdd"
-              />
+              /> -->
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSearch">查询</el-button>
@@ -42,7 +56,7 @@
           </el-form>
           <!-- 排名柱状图 -->
           <div class="rank-box">
-            <Title :title="'科室排名Rank10'" style="margin-bottom: 0;" />
+            <Title :title="'Top 10'" style="margin-bottom: 0;" />
             <div v-if="rankData.length" id="myChart1" style="width: 100%; height: 400px;"></div>
             <el-empty v-else description="暂无排名数据"></el-empty>
           </div>
@@ -219,13 +233,28 @@ export default {
       },
       ruleId: '',
       ruleName: '--',
-      pickerOptions: {
-        disabledDate(time) {
-          return time.getTime() > Date.now()
+      pickerOptions1: {
+        disabledDate: (time) => {
+          if (this.formInline.end_time) {
+            return time.getTime() > new Date(this.formInline.end_time).getTime();
+          } else {
+            return time.getTime() > Date.now()
+          }
+        }
+      },
+      pickerOptions2: {
+        disabledDate: (time) => {
+          if (this.formInline.start_time) {
+            return time.getTime() < new Date(this.formInline.start_time).getTime();
+          } else {
+            return time.getTime() > Date.now()
+          }
         }
       },
       formInline: {
         time: '',
+        start_time: '',
+        end_time: ''
       },
       tableData: [],
       rankData: []
@@ -251,7 +280,7 @@ export default {
     },
     // 搜索
     onSearch() {
-      if (this.ruleId && this.formInline.time.length) {
+      if (this.ruleId && this.formInline.start_time && this.formInline.end_time) {
         this.getList()
         this.getRankList()
       } else {
@@ -260,19 +289,16 @@ export default {
     },
     // 获取科室排名
     getList() {
+      const { start_time, end_time } = this.formInline
       const params = {
         type: this.ruleId,
         page: 1,
-        page_size: 1000
+        page_size: 1000,
+        start_time,
+        end_time
       }
-      const { time } = this.formInline
       
-      if (time && time.length) {
-        params.start_time = time[0]
-        params.end_time = time[1]
-      }
       this.$axios2.post('/dep_statistics', params).then(res => {
-        console.log(res.data.data)
         if (Array.isArray(res.data.data)) {
           this.tableData = res.data.data;
         } else {
@@ -282,16 +308,13 @@ export default {
     },
     // 获取排名rank10
     getRankList() {
+      const { start_time, end_time } = this.formInline
       const params = {
         type: this.ruleId,
         page: 1,
-        page_size: 10
-      }
-      const { time } = this.formInline
-      
-      if (time && time.length) {
-        params.start_time = time[0]
-        params.end_time = time[1]
+        page_size: 10,
+        start_time,
+        end_time
       }
       this.$axios2.post('/dep_statistics', params).then(res => {
         console.log(res.data.data)