Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13691"
+  "version": "2999.999.13699"
 }

src/pages/home/login.vue

@@ -69,6 +69,7 @@
 <script>
 import "../../styles/newStyle.scss";
 import { loginByPwd } from "@/api/login";
+import {checkMobileIp} from "@/api/newlogin"
 import { hex_md5 } from "@/utils/md5";
 import { Toast } from "vant";
 import { checkMobile } from "@/utils/tools";
@@ -222,7 +223,7 @@ export default {
             // }
             //博白
             console.log("机构ID------------------",resp.data.org.id)
-            if(resp.data.org.id == 9671){
+            if(resp.data.org.id == 10164){
               this.checkMobileIp() 
             }else{
               this.$router.replace({ path: "/" });
@@ -254,22 +255,29 @@ export default {
         })
     },
     checkMobileIp(){
-      console.log("000000000000000000000000000000000000")
-      var that = this
-      axios.get('https://192.168.2.6:8080/test').then(function(response) {
-          console.log("response",response)
-          console.log("response.data.data.flag",response.data.data.flag)
-          if (response.data.state == 0) {
-            that.$message.error(response.data.data.msg);
-            return false
-          } 
-          if(response.data.state == 1) {
-            console.log("hahahahh")
-            that.$router.replace({ path: "/" });
-          }
-        }).catch(function(error) {
+      checkMobileIp().then(response=>{
+        if(response.data.state == 1){
+          
+        }
       })
     },
+    // checkMobileIp(){
+    //   console.log("000000000000000000000000000000000000")
+    //   var that = this
+    //   axios.get('https://192.168.2.80:8080/test').then(function(response) {
+    //       console.log("response",response)
+    //       console.log("response.data.data.flag",response.data.data.flag)
+    //       if (response.data.state == 0) {
+    //         that.$message.error(response.data.data.msg);
+    //         return false
+    //       } 
+    //       if(response.data.state == 1) {
+    //         console.log("hahahahh")
+    //         that.$router.replace({ path: "/" });
+    //       }
+    //     }).catch(function(error) {
+    //   })
+    // },
     showForgetPwdDialog() {
       Dialog.confirm({
         title: "账号或密码不正确",

src/store/modules/globalConfig.js

@@ -797,7 +797,7 @@ const global_config = {
       },
       42: {
         id: 42,
-        name: 'HD(1)',
+        name: 'HD.',
         dialysis_duration: 1,
         replacement_way: 2,
         hemodialysis_machine: 1,
@@ -1082,7 +1082,22 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
-      }
+      },
+      18: {
+        id: 18,
+        name: '贝米肝素钠注射液',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'iu',
+        weichi_unit: 'iu/h',
+        zongliang_unit: 'iu',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
       // 6: {
       //   id: 6,
       //   name: '3%枸橼酸钠',

src/utils/request.js

@@ -1,15 +1,21 @@
 import axios from "axios";
 // import { Toast } from 'mint-ui'
 import { Toast } from "vant";
+const https = require('https');
+
 
 import context from '../../src/main.js'
 
+const agent = new https.Agent({
+  rejectUnauthorized: false  // 忽略证书验证
+});
 
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
   timeout: 30000, // request timeout
-  withCredentials: true
+  withCredentials: true,
+  httpsAgent: agent,
 });
 
 var self = this;

vue.config.js

@@ -1,5 +1,23 @@
 module.exports = {
     chainWebpack: config => {
       config.rule('js').include.add(/node_modules\/(dom7|swiper)\/.*/)
-    }
+    },
+    // devServer: {
+    //   https: {
+    //     // 不验证证书
+    //     disableHostCheck: true,
+    //     cert: false,
+    //     key: false,
+    //     ca: false
+    //   },
+    //   proxy: {
+    //     '/api': {
+    //       target: 'https://192.168.2.80:8080/test', // 替换为你的 API 地址
+    //       changeOrigin: true,
+    //       secure: false,  // 跳过对目标地址的证书验证
+    //       pathRewrite: { '^/api': '' },
+    //     }
+    //   }
+    // }
+  
 }