Merge remote-tracking branch 'origin/master'

src/views/datav/Jwpy.vue

@@ -562,28 +562,20 @@ function getData() {
 
   // 调查满意度
   GetGLFW().then((res) => {
-    console.log("GetGLFW ====   " + res)
-    dcmyd.value = res.lstson
-    console.log("dcmyd.value ====   " + dcmyd.value)
+    dcmyd.value=res
     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;
+    tableData.value =  res.lstShen
   });
 
   // 综合满意度排名
   GetZHMYLPM().then((res) => {
-    console.log("GetZHMYLPM ====   " + res)
-    tableData1.value = res.lstCity
-    let temp = res.lstSheng;
-    console.log("temp ====   " + temp)
+    tableData1.value = res[0].lstCity
+    let temp = res[0].lstSheng;
     const group2 = temp.filter(item => item.SetName === "(省)县市考评");
     const group3 = temp.filter(item => item.SetName === "(省)区");
     tableData2.value = group2
@@ -593,7 +585,7 @@ function getData() {
   // 不满意样本趋势
   GetBMYYBQS().then((res) => {
     console.log("GetBMYYBQS ====   " + res)
-    bmyybqs.value = 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);
 
@@ -601,7 +593,8 @@ function getData() {
 
   // 单项分析
   GetDXFX().then((res) => {
-    dxfx.value = res.lstson
+    console.log("GetDXFX ====   " + res)
+    dxfx.value = res;
     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);
@@ -609,9 +602,9 @@ function getData() {
   });
 
   GetRCSQQK().then((res) => {
-    let text = res.lstShen
+    let text = res
     text = text.filter(item => item.Name !== null)
-    tableData4.value= text
+    tableData4.value = text
   });
 
   // GetZRSJXF().then((res) => {  });
@@ -634,8 +627,7 @@ setTimeout(() => {
   }]
 
   // 调查满意度
-  dcmyd.value =
-      [
+  dcmyd.value = [
     {
       Bak: "满意度",
       FinalRP: 95.3,
@@ -1151,7 +1143,7 @@ setTimeout(() => {
   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);
-  // 业务满意度
+  // 业务满意率
   let tempTable = [
     {
       "MasterID": "37",
@@ -1341,6 +1333,7 @@ setTimeout(() => {
   tempTable = tempTable.filter(item => item.Name !== null)
   tableData.value = tempTable
 
+  // 综合满意度
   let temp = [
     {
       "OrganizeID": null,
@@ -1496,7 +1489,7 @@ setTimeout(() => {
       "MydRanking": "1",
       "State3": 490980
     }
-  ]
+  ]  // 省局
   tableData2.value = group2
   tableData3.value = group3
 
@@ -1607,7 +1600,6 @@ setTimeout(() => {
     }
   ]
   text = text.filter(item => item.Name !== null)
-
   tableData4.value = text
 }, 2000)