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({
+const reviewOk = ref([{}]);
-  LevelType: "湖南",
-  State2: 164279,
-  State3: 104659,
-  bmys: "1615",
-  dczl: 392902,
-  jtl: "68.45%",
-  yxhf: "104659",
-  yxl: "38.92%"
-});
 // 调查滿意度
 const dcmyd = ref([]);
 // endregion
@@ -563,23 +554,36 @@ onMounted(() => {
 });
 
 function getData() {
-   GetDCQK().then((res) => {
+  // 调查情况
-     reviewOk.value = res
+  GetDCQK().then((res) => {
-   });
+    console.log("GetDCQK ====   " + res)
+    reviewOk.value = res
+  });
+
+  // 调查满意度
   GetGLFW().then((res) => {
-    dcmyd.value =  res.lstson
+    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) => {
-    tableData1.value =  res.lstCity
+    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,280 +631,282 @@ setTimeout(() => {
     bmys: "6353",
     State2: 466175,
     State3: 490980
-  }
+  }]
 
   // 调查满意度
-  dcmyd.value = [
+  dcmyd.value =
-    {
+      [
-      Bak: "满意度",
-      FinalRP: 95.3,
-      lstson: [
-        {
-          "State3": 43486,
-          "FinalRP": 94.37,
-          "PeriodSonID": "37",
-          "SonSerialNo": 1,
-          "SonPeriodName": "1月"
-        },
-        {
-          "State3": 28974,
-          "FinalRP": 94.12,
-          "PeriodSonID": "38",
-          "SonSerialNo": 2,
-          "SonPeriodName": "2月"
-        },
-        {
-          "State3": 36326,
-          "FinalRP": 94.68,
-          "PeriodSonID": "39",
-          "SonSerialNo": 3,
-          "SonPeriodName": "3月"
-        },
-        {
-          "State3": 47753,
-          "FinalRP": 96.11,
-          "PeriodSonID": "40",
-          "SonSerialNo": 4,
-          "SonPeriodName": "4月"
-        },
-        {
-          "State3": 55153,
-          "FinalRP": 95.89,
-          "PeriodSonID": "41",
-          "SonSerialNo": 5,
-          "SonPeriodName": "5月"
-        },
-        {
-          "State3": 50433,
-          "FinalRP": 95.29,
-          "PeriodSonID": "42",
-          "SonSerialNo": 6,
-          "SonPeriodName": "6月"
-        },
-        {
-          "State3": 63952,
-          "FinalRP": 95.77,
-          "PeriodSonID": "43",
-          "SonSerialNo": 7,
-          "SonPeriodName": "7月"
-        },
-        {
-          "State3": 53520,
-          "FinalRP": 94.94,
-          "PeriodSonID": "44",
-          "SonSerialNo": 8,
-          "SonPeriodName": "8月"
-        },
-        {
-          "State3": 48500,
-          "FinalRP": 95.81,
-          "PeriodSonID": "45",
-          "SonSerialNo": 9,
-          "SonPeriodName": "9月"
-        },
-        {
-          "State3": 45397,
-          "FinalRP": 95.64,
-          "PeriodSonID": "46",
-          "SonSerialNo": 10,
-          "SonPeriodName": "10月"
-        },
-        {
-          "State3": 17486,
-          "FinalRP": 95.77,
-          "PeriodSonID": "47",
-          "SonSerialNo": 11,
-          "SonPeriodName": "11月"
-        },
-        {
-          "State3": 0,
-          "FinalRP": 0,
-          "PeriodSonID": "48",
-          "SonSerialNo": 12,
-          "SonPeriodName": "12月"
-        }
-      ]
-    },
-    {
-      "Bak": "去年同期",
-      "FinalRP": 97.23,
-      "lstson": [
-        {
-          "State3": 43486,
-          "FinalRP": 96.46,
-          "PeriodSonID": "37",
-          "SonSerialNo": 1,
-          "SonPeriodName": "1月"
-        },
-        {
-          "State3": 28974,
-          "FinalRP": 97.27,
-          "PeriodSonID": "38",
-          "SonSerialNo": 2,
-          "SonPeriodName": "2月"
-        },
         {
-          "State3": 36326,
+          Bak: "满意度",
-          "FinalRP": 97.15,
+          FinalRP: 95.3,
-          "PeriodSonID": "39",
+          lstson: [
-          "SonSerialNo": 3,
+            {
-          "SonPeriodName": "3月"
+              "State3": 43486,
+              "FinalRP": 94.37,
+              "PeriodSonID": "37",
+              "SonSerialNo": 1,
+              "SonPeriodName": "1月"
+            },
+            {
+              "State3": 28974,
+              "FinalRP": 94.12,
+              "PeriodSonID": "38",
+              "SonSerialNo": 2,
+              "SonPeriodName": "2月"
+            },
+            {
+              "State3": 36326,
+              "FinalRP": 94.68,
+              "PeriodSonID": "39",
+              "SonSerialNo": 3,
+              "SonPeriodName": "3月"
+            },
+            {
+              "State3": 47753,
+              "FinalRP": 96.11,
+              "PeriodSonID": "40",
+              "SonSerialNo": 4,
+              "SonPeriodName": "4月"
+            },
+            {
+              "State3": 55153,
+              "FinalRP": 95.89,
+              "PeriodSonID": "41",
+              "SonSerialNo": 5,
+              "SonPeriodName": "5月"
+            },
+            {
+              "State3": 50433,
+              "FinalRP": 95.29,
+              "PeriodSonID": "42",
+              "SonSerialNo": 6,
+              "SonPeriodName": "6月"
+            },
+            {
+              "State3": 63952,
+              "FinalRP": 95.77,
+              "PeriodSonID": "43",
+              "SonSerialNo": 7,
+              "SonPeriodName": "7月"
+            },
+            {
+              "State3": 53520,
+              "FinalRP": 94.94,
+              "PeriodSonID": "44",
+              "SonSerialNo": 8,
+              "SonPeriodName": "8月"
+            },
+            {
+              "State3": 48500,
+              "FinalRP": 95.81,
+              "PeriodSonID": "45",
+              "SonSerialNo": 9,
+              "SonPeriodName": "9月"
+            },
+            {
+              "State3": 45397,
+              "FinalRP": 95.64,
+              "PeriodSonID": "46",
+              "SonSerialNo": 10,
+              "SonPeriodName": "10月"
+            },
+            {
+              "State3": 17486,
+              "FinalRP": 95.77,
+              "PeriodSonID": "47",
+              "SonSerialNo": 11,
+              "SonPeriodName": "11月"
+            },
+            {
+              "State3": 0,
+              "FinalRP": 0,
+              "PeriodSonID": "48",
+              "SonSerialNo": 12,
+              "SonPeriodName": "12月"
+            }
+          ]
         },
         {
-          "State3": 47753,
+          "Bak": "去年同期",
-          "FinalRP": 97.26,
+          "FinalRP": 97.23,
-          "PeriodSonID": "40",
+          "lstson": [
-          "SonSerialNo": 4,
+            {
-          "SonPeriodName": "4月"
+              "State3": 43486,
+              "FinalRP": 96.46,
+              "PeriodSonID": "37",
+              "SonSerialNo": 1,
+              "SonPeriodName": "1月"
+            },
+            {
+              "State3": 28974,
+              "FinalRP": 97.27,
+              "PeriodSonID": "38",
+              "SonSerialNo": 2,
+              "SonPeriodName": "2月"
+            },
+            {
+              "State3": 36326,
+              "FinalRP": 97.15,
+              "PeriodSonID": "39",
+              "SonSerialNo": 3,
+              "SonPeriodName": "3月"
+            },
+            {
+              "State3": 47753,
+              "FinalRP": 97.26,
+              "PeriodSonID": "40",
+              "SonSerialNo": 4,
+              "SonPeriodName": "4月"
+            },
+            {
+              "State3": 55153,
+              "FinalRP": 97.18,
+              "PeriodSonID": "41",
+              "SonSerialNo": 5,
+              "SonPeriodName": "5月"
+            },
+            {
+              "State3": 50433,
+              "FinalRP": 97.4,
+              "PeriodSonID": "42",
+              "SonSerialNo": 6,
+              "SonPeriodName": "6月"
+            },
+            {
+              "State3": 63952,
+              "FinalRP": 97.07,
+              "PeriodSonID": "43",
+              "SonSerialNo": 7,
+              "SonPeriodName": "7月"
+            },
+            {
+              "State3": 53520,
+              "FinalRP": 97.19,
+              "PeriodSonID": "44",
+              "SonSerialNo": 8,
+              "SonPeriodName": "8月"
+            },
+            {
+              "State3": 48500,
+              "FinalRP": 97.36,
+              "PeriodSonID": "45",
+              "SonSerialNo": 9,
+              "SonPeriodName": "9月"
+            },
+            {
+              "State3": 45397,
+              "FinalRP": 97.2,
+              "PeriodSonID": "46",
+              "SonSerialNo": 10,
+              "SonPeriodName": "10月"
+            },
+            {
+              "State3": 17486,
+              "FinalRP": 97.49,
+              "PeriodSonID": "47",
+              "SonSerialNo": 11,
+              "SonPeriodName": "11月"
+            },
+            {
+              "State3": 0,
+              "FinalRP": 97.83,
+              "PeriodSonID": "48",
+              "SonSerialNo": 12,
+              "SonPeriodName": "12月"
+            }
+          ]
         },
         {
-          "State3": 55153,
+          Bak: "上一期",
-          "FinalRP": 97.18,
+          FinalRP: 0,
-          "PeriodSonID": "41",
+          lstson: [
-          "SonSerialNo": 5,
+            {
-          "SonPeriodName": "5月"
+              "State3": 43486,
-        },
+              "FinalRP": 0,
-        {
+              "PeriodSonID": "37",
-          "State3": 50433,
+              "SonSerialNo": 1,
-          "FinalRP": 97.4,
+              "SonPeriodName": "1月"
-          "PeriodSonID": "42",
+            },
-          "SonSerialNo": 6,
+            {
-          "SonPeriodName": "6月"
+              "State3": 28974,
-        },
+              "FinalRP": 94.37,
-        {
+              "PeriodSonID": "38",
-          "State3": 63952,
+              "SonSerialNo": 2,
-          "FinalRP": 97.07,
+              "SonPeriodName": "2月"
-          "PeriodSonID": "43",
+            },
-          "SonSerialNo": 7,
+            {
-          "SonPeriodName": "7月"
+              "State3": 36326,
-        },
+              "FinalRP": 94.12,
-        {
+              "PeriodSonID": "39",
-          "State3": 53520,
+              "SonSerialNo": 3,
-          "FinalRP": 97.19,
+              "SonPeriodName": "3月"
-          "PeriodSonID": "44",
+            },
-          "SonSerialNo": 8,
+            {
-          "SonPeriodName": "8月"
+              "State3": 47753,
-        },
+              "FinalRP": 94.68,
-        {
+              "PeriodSonID": "40",
-          "State3": 48500,
+              "SonSerialNo": 4,
-          "FinalRP": 97.36,
+              "SonPeriodName": "4月"
-          "PeriodSonID": "45",
+            },
-          "SonSerialNo": 9,
+            {
-          "SonPeriodName": "9月"
+              "State3": 55153,
-        },
+              "FinalRP": 96.11,
-        {
+              "PeriodSonID": "41",
-          "State3": 45397,
+              "SonSerialNo": 5,
-          "FinalRP": 97.2,
+              "SonPeriodName": "5月"
-          "PeriodSonID": "46",
+            },
-          "SonSerialNo": 10,
+            {
-          "SonPeriodName": "10月"
+              "State3": 50433,
-        },
+              "FinalRP": 95.89,
-        {
+              "PeriodSonID": "42",
-          "State3": 17486,
+              "SonSerialNo": 6,
-          "FinalRP": 97.49,
+              "SonPeriodName": "6月"
-          "PeriodSonID": "47",
+            },
-          "SonSerialNo": 11,
+            {
-          "SonPeriodName": "11月"
+              "State3": 63952,
-        },
+              "FinalRP": 95.29,
-        {
+              "PeriodSonID": "43",
-          "State3": 0,
+              "SonSerialNo": 7,
-          "FinalRP": 97.83,
+              "SonPeriodName": "7月"
-          "PeriodSonID": "48",
+            },
-          "SonSerialNo": 12,
+            {
-          "SonPeriodName": "12月"
+              "State3": 53520,
+              "FinalRP": 95.77,
+              "PeriodSonID": "44",
+              "SonSerialNo": 8,
+              "SonPeriodName": "8月"
+            },
+            {
+              "State3": 48500,
+              "FinalRP": 94.94,
+              "PeriodSonID": "45",
+              "SonSerialNo": 9,
+              "SonPeriodName": "9月"
+            },
+            {
+              "State3": 45397,
+              "FinalRP": 95.81,
+              "PeriodSonID": "46",
+              "SonSerialNo": 10,
+              "SonPeriodName": "10月"
+            },
+            {
+              "State3": 17486,
+              "FinalRP": 95.64,
+              "PeriodSonID": "47",
+              "SonSerialNo": 11,
+              "SonPeriodName": "11月"
+            },
+            {
+              "State3": 0,
+              "FinalRP": 95.77,
+              "PeriodSonID": "48",
+              "SonSerialNo": 12,
+              "SonPeriodName": "12月"
+            }
+          ]
         }
       ]
-    },
-    {
-      Bak: "上一期",
-      FinalRP: 0,
-      lstson: [
-        {
-          "State3": 43486,
-          "FinalRP": 0,
-          "PeriodSonID": "37",
-          "SonSerialNo": 1,
-          "SonPeriodName": "1月"
-        },
-        {
-          "State3": 28974,
-          "FinalRP": 94.37,
-          "PeriodSonID": "38",
-          "SonSerialNo": 2,
-          "SonPeriodName": "2月"
-        },
-        {
-          "State3": 36326,
-          "FinalRP": 94.12,
-          "PeriodSonID": "39",
-          "SonSerialNo": 3,
-          "SonPeriodName": "3月"
-        },
-        {
-          "State3": 47753,
-          "FinalRP": 94.68,
-          "PeriodSonID": "40",
-          "SonSerialNo": 4,
-          "SonPeriodName": "4月"
-        },
-        {
-          "State3": 55153,
-          "FinalRP": 96.11,
-          "PeriodSonID": "41",
-          "SonSerialNo": 5,
-          "SonPeriodName": "5月"
-        },
-        {
-          "State3": 50433,
-          "FinalRP": 95.89,
-          "PeriodSonID": "42",
-          "SonSerialNo": 6,
-          "SonPeriodName": "6月"
-        },
-        {
-          "State3": 63952,
-          "FinalRP": 95.29,
-          "PeriodSonID": "43",
-          "SonSerialNo": 7,
-          "SonPeriodName": "7月"
-        },
-        {
-          "State3": 53520,
-          "FinalRP": 95.77,
-          "PeriodSonID": "44",
-          "SonSerialNo": 8,
-          "SonPeriodName": "8月"
-        },
-        {
-          "State3": 48500,
-          "FinalRP": 94.94,
-          "PeriodSonID": "45",
-          "SonSerialNo": 9,
-          "SonPeriodName": "9月"
-        },
-        {
-          "State3": 45397,
-          "FinalRP": 95.81,
-          "PeriodSonID": "46",
-          "SonSerialNo": 10,
-          "SonPeriodName": "10月"
-        },
-        {
-          "State3": 17486,
-          "FinalRP": 95.64,
-          "PeriodSonID": "47",
-          "SonSerialNo": 11,
-          "SonPeriodName": "11月"
-        },
-        {
-          "State3": 0,
-          "FinalRP": 95.77,
-          "PeriodSonID": "48",
-          "SonSerialNo": 12,
-          "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);
 
@@ -1007,7 +1025,7 @@ setTimeout(() => {
   option2.value.series[0].data = bmyybqs.value.map(item => item.QACount);
 
   // 单项分析
-  dxfx.value =   [
+  dxfx.value = [
     {
       "Bak": "本周期",
       "lstson": [
@@ -1321,9 +1339,9 @@ setTimeout(() => {
     }
   ]
   tempTable = tempTable.filter(item => item.Name !== null)
-  tableData.value =tempTable
+  tableData.value = tempTable
 
-  let temp =  [
+  let temp = [
     {
       "OrganizeID": null,
       "OrganizeName": "(省)县市考评",
@@ -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({