Merge remote-tracking branch 'origin/master'

src/views/datav/Jwpy.vue

@@ -10,7 +10,7 @@
                 <el-col :span="5">
                   <div class="descriptions_cell text-center margin-top-30">
                     <div class="descriptions_content">
-                      {{ reviewOk.State2 }}
+                      {{ reviewOk[0].State2 }}
                     </div>
                     <div class="descriptions_label">
                       调查总量
@@ -20,7 +20,7 @@
                 <el-col :span="5">
                   <div class="descriptions_cell text-center margin-top-30">
                     <div class="descriptions_content">
-                      {{ reviewOk.State3 }}
+                      {{ reviewOk[0].State3 }}
                     </div>
                     <div class="descriptions_label">
                       有效回复
@@ -30,7 +30,7 @@
                 <el-col :span="5">
                   <div class="descriptions_cell text-center margin-top-30">
                     <div class="descriptions_content">
-                      {{ reviewOk.State3 - reviewOk.bmys }}
+                      {{ reviewOk[0].State3 - reviewOk[0].bmys }}
                     </div>
                     <div class="descriptions_label">
                       满意
@@ -50,7 +50,7 @@
                 <el-col :span="4">
                   <div class="descriptions_cell text-center margin-top-30">
                     <div class="descriptions_content">
-                      {{ reviewOk.bmys }}
+                      {{ reviewOk[0].bmys }}
                     </div>
                     <div class="descriptions_label">
                       不满意数
@@ -266,16 +266,7 @@ import {GetBMYYBQS, GetDCQK, GetDITU, GetDXFX, GetGLFW, GetRCSQQK, GetZHMYLPM, G
 
 // region   左边
 // 调查情况
-const reviewOk = ref({
-  LevelType: "湖南",
-  State2: 164279,
-  State3: 104659,
-  bmys: "1615",
-  dczl: 392902,
-  jtl: "68.45%",
-  yxhf: "104659",
-  yxl: "38.92%"
-});
+const reviewOk = ref([{}]);
 // 调查滿意度
 const dcmyd = ref([]);
 // endregion
@@ -563,23 +554,36 @@ onMounted(() => {
 });
 
 function getData() {
+  // 调查情况
   GetDCQK().then((res) => {
+    console.log("GetDCQK ====   " + res)
     reviewOk.value = res
   });
+
+  // 调查满意度
   GetGLFW().then((res) => {
+    console.log("GetGLFW ====   " + res)
     dcmyd.value = res.lstson
+    console.log("dcmyd.value ====   " + dcmyd.value)
     option1.value.xAxis.data = dcmyd.value[0].lstson.map(item => item.SonPeriodName);
     option1.value.series[0].data = dcmyd.value[0].lstson.map(item => item.FinalRP);
   });
+
+  // 业务满意率
   GetZRSJXF().then((res) => {
+    console.log("GetZRSJXF ====   " + res)
     let tempTable = res.lstShen
+    console.log("tempTable ====   " + tempTable)
     tempTable = tempTable.filter(item => item.Name !== null)
     tableData.value = tempTable;
   });
+
   // 综合满意度排名
   GetZHMYLPM().then((res) => {
+    console.log("GetZHMYLPM ====   " + res)
     tableData1.value = res.lstCity
     let temp = res.lstSheng;
+    console.log("temp ====   " + temp)
     const group2 = temp.filter(item => item.SetName === "(省)县市考评");
     const group3 = temp.filter(item => item.SetName === "(省)区");
     tableData2.value = group2
@@ -588,15 +592,27 @@ function getData() {
 
   // 不满意样本趋势
   GetBMYYBQS().then((res) => {
+    console.log("GetBMYYBQS ====   " + res)
     bmyybqs.value = res
+    option2.value.xAxis.data = bmyybqs.value.map(item => item.SonPeriodName);
+    option2.value.series[0].data = bmyybqs.value.map(item => item.QACount);
+
   });
 
   // 单项分析
   GetDXFX().then((res) => {
     dxfx.value = res.lstson
+    option3.value.xAxis.data = dxfx.value[0].lstson.map(item => item.MasterName);
+    option3.value.series[0].data = dxfx.value[0].lstson.map(item => item.FinalRP);
+    option3.value.series[1].data = dxfx.value[1].lstson.map(item => item.FinalRP);
+    option3.value.series[2].data = dxfx.value[2].lstson.map(item => item.FinalRP);
   });
 
-  // GetRCSQQK().then((res) => {  });
+  GetRCSQQK().then((res) => {
+    let text = res.lstShen
+    text = text.filter(item => item.Name !== null)
+    tableData4.value= text
+  });
 
   // GetZRSJXF().then((res) => {  });
   // GetDITU().then((res) => {  });
@@ -604,7 +620,7 @@ function getData() {
 
 
 setTimeout(() => {
-  reviewOk.value = {
+  reviewOk.value = [{
     LevelType: "省",
     dczl: 1410919,
     jtl: "67.84%",
@@ -615,10 +631,11 @@ setTimeout(() => {
     bmys: "6353",
     State2: 466175,
     State3: 490980
-  }
+  }]
 
   // 调查满意度
-  dcmyd.value = [
+  dcmyd.value =
+      [
         {
           Bak: "满意度",
           FinalRP: 95.3,
@@ -888,7 +905,8 @@ setTimeout(() => {
               "SonPeriodName": "12月"
             }
           ]
-    }]
+        }
+      ]
   option1.value.xAxis.data = dcmyd.value[0].lstson.map(item => item.SonPeriodName);
   option1.value.series[0].data = dcmyd.value[0].lstson.map(item => item.FinalRP);
 
@@ -1321,7 +1339,7 @@ setTimeout(() => {
     }
   ]
   tempTable = tempTable.filter(item => item.Name !== null)
-  tableData.value =tempTable
+  tableData.value = tempTable
 
   let temp = [
     {
@@ -1590,12 +1608,10 @@ setTimeout(() => {
   ]
   text = text.filter(item => item.Name !== null)
 
-  tableData4.value =text
+  tableData4.value = text
 }, 2000)
 
 
-
-
 // region 表格样式
 const fontSize = ref(11)
 const headerCellStyle = ref({