bugfix

src/views/allcase/caseIndex.vue

@@ -894,7 +894,7 @@ export default {
       } else {
         path = '/caseIndexList'
       }
-      this.$router.push({ path, query: { year: this.formInline.year, time, ruleId: Number(`${this.ruleId}`.slice(0, 2)), type: this.judgeNum } });
+      this.$router.push({ path, query: { year: this.formInline.year, time, ruleId: Number(`${this.ruleId}`.slice(0, 2)), type: this.judgeNum, name: this.ruleName } });
     },
     // 菜单筛选
     filterNode(value, data) {

src/views/allcase/caseIndexList.vue

@@ -2,7 +2,7 @@
   <div class="box" :class="{'nocopy': $route.meta.nocopy}">
     <div class="box_wrapper">
       <div class="box_header">
-        <Title :title="'指标列表'" style="margin-top: 8px;" />
+        <Title :title="$route.query.name" style="margin-top: 8px;" />
       </div>
       <!-- 搜索栏 -->
       <div class="box_header">

src/views/otherStatisticsData/index.vue

@@ -421,7 +421,7 @@ export default {
     toListPage(row) {
       console.log(row);
       const { time, ruleId, name } = row
-      this.$router.push({ path: '/otherStatisticsList', query: { time, ruleId, name }})
+      this.$router.push({ path: '/otherStatisticsList', query: { year: this.formInline.year, time, ruleId, name }})
     },
     // 菜单筛选
     filterNode(value, data) {

src/views/otherStatisticsData/list.vue

@@ -11,12 +11,12 @@
             <el-date-picker
               v-model="searchData.start_time"
               type="date"
-              format="yyyy 年 MM 月 dd 日"
+              format="yyyy年MM月dd日"
               value-format="yyyyMMdd"
               placeholder="出院开始时间"
               style="margin-right: 10px"
             />
-            <el-date-picker v-model="searchData.end_time" type="date" format="yyyy 年 MM 月 dd 日" value-format="yyyyMMdd" placeholder="出院结束时间" />
+            <el-date-picker v-model="searchData.end_time" type="date" format="yyyy年MM月dd日" value-format="yyyyMMdd" placeholder="出院结束时间" />
           </el-form-item>
           <el-form-item label="科室" style="margin-bottom: 0">
             <el-select v-model="searchData.AAC11N" clearable filterable placeholder="请选择">
@@ -101,10 +101,16 @@ export default {
   },
   watch: {},
   created() {
-    const aTimes = this.$route.query.time.split('-');
-    const days = getDaysInMonth(aTimes[0], aTimes[1]);
-    this.searchData.start_time = `${aTimes[0]}${aTimes[1]}01`;
-    this.searchData.end_time = `${aTimes[0]}${aTimes[1]}${days}`;
+    const { time, year } = this.$route.query
+    if (time === '全年') {
+      this.searchData.start_time = `${year}0101`;
+      this.searchData.end_time = `${year}1231`;
+    } else {
+      const aTimes = time.split('-');
+      const days = getDaysInMonth(aTimes[0], aTimes[1]);
+      this.searchData.start_time = `${aTimes[0]}${aTimes[1]}01`;
+      this.searchData.end_time = `${aTimes[0]}${aTimes[1]}${days}`;
+    }
     this.getList();
     this.getDepartmentList();
   },