修改对比报告及产看报告问题

src/components/BingChart2.vue

@@ -95,8 +95,8 @@ export default {
             // name:100-parseInt(pieData[0].value/(pieData[0].value+ pieData[1].value)*100)   + "%"+pieData[1].name,itemStyle:{color:'#FFAE00'
             //pieData[0].value  :1
             data: [
-              { value: pieData[0].value==0?1:pieData[0].value-pieData[1].value, name:pieData[0].value==0?'100%心理健康': 100- parseInt(pieData[1].value/(pieData[0].value)*100) +'%心理健康',itemStyle:{color:'#5470C6',fontSize:'20'}},
-              { value:pieData[1].value, name:pieData[0].value==0?'0%中重度焦虑':parseInt(pieData[1].value/(pieData[0].value)*100)   + "%"+pieData[1].name,itemStyle:{color:'#FFAE00',fontSize:'20'}},
+              { value: pieData[0].value==0?1:pieData[0].value-pieData[1].value, name:pieData[0].value==0?'100%心理健康': 100-parseFloat((pieData[1].value/(pieData[0].value)*100).toFixed(2))  +'%心理健康',itemStyle:{color:'#5470C6',fontSize:'20'}},
+              { value:pieData[1].value, name:pieData[0].value==0?'0%中重度焦虑':parseFloat(pieData[1].value/(pieData[0].value)*100).toFixed(2)   + "%"+pieData[1].name,itemStyle:{color:'#FFAE00',fontSize:'20'}},
             ],
           },
         ],

src/components/ComparePlanProfession.vue

@@ -126,7 +126,7 @@
               compareOptions.planInfo2 !== '' &&
               compareOptions.planInfo2 !== null)
           "
-          style="width: 100%;margin-bottom:10px"
+          style="width: 100%; margin-bottom: 10px"
         >
           <tr>
             <th class="first">组织</th>
@@ -675,6 +675,7 @@ export default {
         this.options.dataset.source[0][1] = this.compareOptionsPlan1.planName + " ";
         this.options.dataset.source[0][2] = this.compareOptionsPlan2.planName;
       }
+
       if (this.firstParams == 1) {
         //this.compareOptions.orgInfo1.orgNo
         //this.compareOptionsOrg1.orgNo
@@ -686,18 +687,27 @@ export default {
         //查询出来orgNo
         //查询组织的orgNo
 
-        this.queryCompletePople(
-          this.compareOptionsPlan1.id,
-          [this.compareOptionsPlan1.orgNo],
-          1
-        );
+        // this.queryCompletePople(
+        //   this.compareOptionsPlan1.id,
+        //   [this.compareOptionsPlan1.orgNo],
+        //   1
+        // );
+        let orgTmp = "";
+        for (let i = 0; i < this.organizationsList.length; i++) {
+          if (this.organizationsList[i].id == this.orgInfo1) {
+            orgTmp = this.organizationsList[i].orgNo;
+          }
+        }
+
+        this.queryCompletePople(this.compareOptionsPlan1.id, orgTmp, 1);
         //查询出来需要的ID
         //查询出来orgNo
-        this.queryCompletePople(
-          this.compareOptionsPlan2.id,
-          [this.compareOptionsPlan2.orgNo],
-          2
-        );
+        this.queryCompletePople(this.compareOptionsPlan2.id, orgTmp, 2);
+        // this.queryCompletePople(
+        //   this.compareOptionsPlan2.id,
+        //   [this.compareOptionsPlan2.orgNo],
+        //   2
+        // );
       }
     },
 
@@ -824,7 +834,7 @@ export default {
 
     td.warn {
       // background: red;
-      color:red;
+      color: red;
     }
   }
 }

src/components/PlanReport.vue

@@ -481,7 +481,7 @@
           :total="doubtfulTotal"
         >
         </el-pagination>
-        <div class="report_ge_title" style="margin-top: 40px; margin-bottom: 20px">
+        <!-- <div class="report_ge_title" style="margin-top: 40px; margin-bottom: 20px">
           <div class="blue_t"></div>
           <div class="com">满分人员</div>
         </div>
@@ -504,16 +504,6 @@
             </el-table-column>
             <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
             </el-table-column>
-            <!-- <el-table-column
-              prop="dimensionName"
-              label="维度"
-              :formatter="forDimen"
-              align="center"
-              width=""
-            >
-            </el-table-column> -->
-            <!-- <el-table-column prop="dimensionSymptom" label="症状" align="center" width="">
-            </el-table-column> -->
           </el-table>
         </div>
         <el-pagination
@@ -526,7 +516,7 @@
           :page-sizes="[10, 20, 50, 100]"
           :total="fullmarkTotal"
         >
-        </el-pagination>
+        </el-pagination> -->
       </div>
     </el-dialog>
 

src/utils/http.js

@@ -17,8 +17,10 @@ import { router } from "@/router";
 // axios.defaults.baseURL = 'https://child.hhnao.com:8070';
 // axios.defaults.baseURL = 'https://child.hhnao.com:8070';
 //https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx01d1a44906973cf2&redirect_uri=http%3A%2F%2F192.168.18.51%3A8085&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect
-//本地
+// 少锋本地
 // export const basePath = "http://10.113.248.4:8089";
+//少锋本地 wifi
+// export const basePath = "http://172.28.50.2:8089";
 //30
 export const basePath = "http://43.143.198.30:8089";
 //