冲突

config/dev.env.js

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  //BASE_API: '"https://api.xt.kuyicloud.com"'
   BASE_API: '"http://localhost:9531"'
   //BASE_API: '"http://localhost:9529"'
   //http://api.xt.test.sgjyun.com http://localhost:9529

config/prod.env.js

@@ -1,8 +1,8 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
+  //BASE_API: '"https://api.xt.kuyicloud.com"'
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/pages/home/index.vue

@@ -141,16 +141,15 @@ export default {
     const id = this.$route.query.id;
     // this.getAllOrgName(id);
     setRem();
-
   },
-  mounted(){
-    let currenttabbar = window.location.hash.split("/")[1]
-     if (currenttabbar === 'homeIndex') {
-      this.active = 0
-    } else if (currenttabbar === 'newMy') {
-      this.active = 2
-    } else if (currenttabbar === 'active') {
-      this.active = 1
+  mounted() {
+    let currenttabbar = window.location.hash.split("/")[1];
+    if (currenttabbar === "homeIndex") {
+      this.active = 0;
+    } else if (currenttabbar === "newMy") {
+      this.active = 2;
+    } else if (currenttabbar === "active") {
+      this.active = 1;
     }
   }
 };

src/pages/my/index.vue

@@ -160,7 +160,8 @@ import {
   getMyInforName,
   getMyInformationThree,
   getMyOrgInformation,
-  getMyInformationFour
+  getMyInformationFour,
+  getRolePosition
 } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { GetHomeData } from "@/api/home";
@@ -291,10 +292,8 @@ export default {
     getRolePosition() {
       getRolePosition().then(response => {
         if (response.data.state === 1) {
-          var orgs = response.data.data.orgs;
+          var orgs = response.data.data.cretorPosition;
           console.log("position", orgs);
-          var adminUser = response.data.data.adminUser;
-          console.log("adminUser", adminUser);
         }
       });
     }
@@ -315,7 +314,7 @@ export default {
     if (creator !== 0) {
       this.getMyInformationFour();
     }
-    // this.getRolePosition();
+    this.getRolePosition();
   }
 };
 </script>

src/pages/patientCenter/allCheck/index.vue

@@ -31,29 +31,19 @@
                 <p>
                   <span style="text-align:right;width:3.125rem;display: inline-block;">{{ item.inspect_value }}</span>
                   <span
-                    v-if="
-                      item.inspect_value != '' &&
-                        parseInt(item.inspect_value) > parseInt(item.range_max)
-                    "
-                  >
+                    v-if="item.inspect_value != '' && parseInt(item.inspect_value) > parseInt(item.range_max)">
                     <i class="el-icon-top" style="color:#F44746"></i>
                   </span>
                   <span
-                    v-if="
-                      item.inspect_value != '' &&
-                        parseInt(item.inspect_value) <
-                          parseInt(item.range_min) &&
-                        parseInt(item.inspect_value) < parseInt(item.range_max)
-                    "
-                  >
+                    v-if="item.inspect_value != '' &&parseInt(item.inspect_value) <parseInt(item.range_min) &&parseInt(item.inspect_value) < parseInt(item.range_max)">
                     <i class="el-icon-bottom" style="color:#5B98FF"></i>
                   </span>
-                  <span v-if="parseInt(item.inspect_value) == ''"></span>
+                  <span v-if="parseInt(item.inspect_value) === ''"></span>
                 </p>
-                <span v-if="item.range_type == 1"
+                <span v-if="item.range_type === 1"
                   >{{ item.range_min }}~{{ item.range_max }}</span
                 >
-                <span v-if="item.range_type == 2">
+                <span v-if="item.range_type === 2">
                   {{ item.inspect_value }}
                 </span>
                 <span>{{ item.unit }}</span>
@@ -140,7 +130,7 @@ export default {
       getInspectionDetail(patientid, date, this.project_id).then(response => {
         if (response.data.state === 1) {
           var InspectionDetail = response.data.data.InspectionDetail;
-          // console.log("数据是", InspectionDetail);
+          console.log("数据是", InspectionDetail);
           this.InspectionDetail = InspectionDetail;
         }
       });