提交merge1.3

openhis-ui-vue3/src/views/login.vue

@@ -65,6 +65,7 @@
       </el-form-item>
       <el-form-item prop="tenantId">
         <span class="descriptions-item-label" style="margin: 0 10px 0 0">连接医保</span>
+<<<<<<< HEAD
         <el-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large"/>
       </el-form-item>
       <el-form-item class="login-options">
@@ -76,6 +77,10 @@
         <!-- <span class="descriptions-item-label" style="margin: 0 10px 0 0">连接医保</span> -->
         <!-- <el-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large"/> -->
       <!-- </el-form-item> -->
+=======
+        <el-switch v-model="loginForm.invokeYb" @change="topNavChange" size="large" />
+      </el-form-item>
+>>>>>>> v1.3
       <!--<el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="loginForm.code"
@@ -132,7 +137,18 @@
         <span><el-link :underline="false">Cookies</el-link></span>
       </div>
       <span>
+<<<<<<< HEAD
         <el-link :underline="false">Copyright © 2025 上海经创贺联信息技术有限公司 All Rights Reserved. </el-link>
+=======
+        <el-link
+          :underline="false"
+          href="https://open.tntlinking.com/communityTreaty"
+          target="_blank"
+        >
+          >Copyright © 2025 湖北天天数链技术有限公司 本系统软件源代码许可来源于
+          天天开源软件（社区版）许可协议 https://open.tntlinking.com/communityTreaty
+        </el-link>
+>>>>>>> v1.3
       </span>
     </div>
   </div>
@@ -142,7 +158,7 @@
 import { getCurrentInstance, ref, reactive, computed, onMounted, watch } from 'vue';
 import settings from '@/settings';
 import { getCodeImg, sign, getUserBindTenantList } from '@/api/login';
-import { invokeYbPlugin } from '@/api/public';
+import { invokeYbPlugin5001 } from '@/api/public';
 import Cookies from 'js-cookie';
 import { encrypt, decrypt } from '@/utils/jsencrypt';
 import useUserStore from '@/store/modules/user';
@@ -325,7 +341,7 @@ async function GetMacString() {
     // await boundAsync.getMacString(JSON.stringify(data)).then((res) => {
     //   result = res
     // });
-    await invokeYbPlugin(data).then((res) => {
+    await invokeYbPlugin5001(data).then((res) => {
       result = res.data;
       if (result === undefined || result === '' || result === ' ') {
         throw new Error('获取 mac 地址失败');
@@ -336,7 +352,7 @@ async function GetMacString() {
     // await boundAsync.getIpString().then((res) => {
     //   ip = res;
     // });
-    await invokeYbPlugin({ FunctionId: 6 }).then((res) => {
+    await invokeYbPlugin5001({ FunctionId: 6 }).then((res) => {
       ip = res.data;
       if (ip === undefined || ip === '' || ip === ' ') {
         throw new Error('获取 ip 地址失败');