修改

src/views/index.vue

@@ -7,6 +7,11 @@
           <div class="words">本月新增患者数</div>
           <div class="num">{{ list.thisMonthPatient }}</div>
         </div>
+        <div class="content">
+          <img src="../assets/system/shenghuo.png" alt="" />
+          <div class="words">本月出院患者数</div>
+          <div class="num">{{ list.thisMonthDischargePatient  }}</div>
+        </div>
         <div class="content">
           <img src="../assets/system/phone.png" alt="" />
           <div class="words">本月签约患者数</div>
@@ -35,33 +40,40 @@
           v-for="(item, index) in taskSituationlist"
           :key="index"
         >
+          <div>
             <el-tooltip
               class=""
               effect="dark"
-            :content="item.name == '人工审核' ? '已审核数' : '已随访数'"
+              :content="item.name == '人工审核' ? '待审核数' : '待随访数'"
               placement="top"
             >
-            <div>
               <div class="person" @click="goback">
                 <span class="">{{ item.name }}</span>
-                <el-badge
+                <el-badge :value="item.count" class="item"></el-badge>
-                  :value="item.allCount - item.count"
-                  class="item"
-                ></el-badge>
                 <i class="el-icon-arrow-right"></i>
               </div>
+            </el-tooltip>
+            <el-tooltip
+              class=""
+              effect="dark"
+              :content="
+                item.name == '人工审核'
+                  ? '本月已审核数/本月应审核数'
+                  : '本月已随访数/本月应随访数'
+              "
+              placement="top"
+            >
               <div style="display: flex" @click="goback">
                 <el-progress :percentage="item.content"></el-progress>
-
                 <span style="float: right; margin: 12px 19px 0 10px"
-                  >{{ item.count }}/{{ item.allCount }}</span
+                  >{{ item.allCount - item.count }}/{{ item.allCount }}</span
                 >
               </div>
-            </div>
             </el-tooltip>
           </div>
         </div>
       </div>
+    </div>
     <div class="appbottom">
       <div class="appbottomone">
         <div class="word">本月签约患者情况</div>
@@ -141,6 +153,12 @@ export default {
           e.proportion = e.proportion*100;
           proportionlist.push(e.proportion);
         });
+        var signPatientCountlist = [];
+        res.data.forEach((e) => {
+          e.proportion = e.proportion * 100 ;
+          // console.log(e.proportion,'e.proportion')
+          signPatientCountlist.push(e.signPatientCount);
+        });
         // return
         var chartDoms = document.getElementById("main1");
         var myChart1 = echarts.init(chartDoms);
@@ -156,9 +174,9 @@ export default {
             },
           },
           legend: {
-            data: ["患者数量", "签约率(%)"],
+            data: ["当月新增患者数量", "签约数", "当月签约率"],
           },
-          color: ["#2BBD2E", "#68B4FF"],
+          color: ["#2BBD2E", "#68B4FF", "orange"],
           xAxis: [
             {
               axisLabel: {
@@ -180,17 +198,14 @@ export default {
           yAxis: [
             {
               type: "value",
-              name: "患者数量",
+              name: "当月新增患者数量",
-              // min: 0,
-              // max: 20,
-              // interval: 4,
               axisLabel: {
                 formatter: "{value}",
               },
             },
             {
               type: "value",
-              name: "签约率(%)",
+              name: "当月签约率",
               min: 0,
               max: 100,
               interval: 20,
@@ -199,29 +214,38 @@ export default {
               },
             },
           ],
+          tooltip: {
+            trigger: "axis",
+            formatter: (params) => {
+              // console.log(params,'params')
+              let text = '';
+              params.map((item) => {
+                if(item.seriesName =='当月签约率'){
+                   text += item.seriesName + " : " + item.value + "%"+'<br/>';
+                }else{
+                  text += item.seriesName + " : " + item.value+'<br/>';
+                }
+              });
+              return text;
+            },
+          },
           series: [
             {
-              name: "患者数量",
+              name: "当月新增患者数量",
               type: "bar",
-              tooltip: {
-                valueFormatter: function (value) {
-                  return value + " ml";
-                },
-              },
               data: countydatay,
               barWidth: "20%",
             },
-
             {
-              name: "签约率(%)",
+              name: "签约数",
+              type: "bar",
+              data: signPatientCountlist,
+              barWidth: "20%",
+            },
+            {
+              name: "当月签约率",
               type: "line",
               yAxisIndex: 1,
-              tooltip: {
-                valueFormatter: function (value) {
-                  console.log(value, "value");
-                  return value + " %";
-                },
-              },
               data: proportionlist,
             },
           ],