From 3d41233538c06622686fec3e613f61411f320b2b Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 19 一月 2026 13:57:58 +0800
Subject: [PATCH] 测试完成
---
src/api/login.js | 3
src/store/modules/user.js | 18 +++++-
vue.config.js | 4
src/utils/sipService.js | 8 ++
lishui (2).zip | 0
src/views/sfstatistics/percentage/satisfaction.vue | 7 +-
lishui (4).zip | 0
/dev/null | 0
lishui (3).zip | 0
src/views/login.vue | 85 ++++++++++++++++------------
src/views/sfstatistics/percentage/index.vue | 2
lishui.zip | 0
src/components/CallButton/index.vue | 6 +
13 files changed, 83 insertions(+), 50 deletions(-)
diff --git a/SY-wl.zip b/SY-wl.zip
deleted file mode 100644
index 9cc0fbd..0000000
--- a/SY-wl.zip
+++ /dev/null
Binary files differ
diff --git "a/lishui \0502\051.zip" "b/lishui \0502\051.zip"
index e5b5c98..71698b9 100644
--- "a/lishui \0502\051.zip"
+++ "b/lishui \0502\051.zip"
Binary files differ
diff --git a/dist.zip "b/lishui \0503\051.zip"
similarity index 90%
rename from dist.zip
rename to "lishui \0503\051.zip"
index 9edbb2c..d826b91 100644
--- a/dist.zip
+++ "b/lishui \0503\051.zip"
Binary files differ
diff --git a/dist.zip "b/lishui \0504\051.zip"
similarity index 90%
copy from dist.zip
copy to "lishui \0504\051.zip"
index 9edbb2c..28694e7 100644
--- a/dist.zip
+++ "b/lishui \0504\051.zip"
Binary files differ
diff --git a/lishui.zip b/lishui.zip
index 0bd45a3..4ae2447 100644
--- a/lishui.zip
+++ b/lishui.zip
Binary files differ
diff --git a/src/api/login.js b/src/api/login.js
index 9c838af..77dc52e 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,12 +1,13 @@
import request from "@/utils/request";
// 鐧诲綍鏂规硶
-export function login(username, password, code, orgid) {
+export function login(username, password, code, orgid,campusid) {
const data = {
username,
password,
code,
orgid,
+ campusid,
};
return request({
url: "/login",
diff --git a/src/components/CallButton/index.vue b/src/components/CallButton/index.vue
index 7c7798c..594842b 100644
--- a/src/components/CallButton/index.vue
+++ b/src/components/CallButton/index.vue
@@ -56,8 +56,8 @@
sipStatusClass: "status-disconnected",
sipConfig: {
// 绉婚櫎纭紪鐮佺殑wsUrl鍜宒omain
- wsUrl:'',
- sipUri:'',
+ wsUrl: "",
+ sipUri: "",
password: "Smartor@2023",
displayName: "Web 灏忛緳",
// realm: "9.208.5.18:8090",
@@ -199,6 +199,8 @@
this.sipConfig.sipUri = `${this.randomNum}@192.168.10.124`;
} else if (orgName == "榫欐硥甯備汉姘戝尰闄�") {
this.sipConfig.sipUri = `${this.randomNum}@10.10.0.220`;
+ } else if (orgName == "鏉窞甯傜涓�浜烘皯鍖婚櫌婀栨花闄㈠尯"||orgName == "鏉窞甯傜涓�浜烘皯鍖婚櫌鍚村北闄㈠尯") {
+ this.sipConfig.sipUri = `${this.randomNum}@192.169.5.248`;
}
} catch (error) {
console.error("鑾峰彇鍒嗘満鍙峰け璐�:", error);
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8f6edaa..6ca39c3 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -125,10 +125,11 @@
const username = userInfo.username.trim();
const password = userInfo.password;
const code = userInfo.code;
+ const campusid = userInfo.campusid;
const orgid = userInfo.orgid;
return new Promise((resolve, reject) => {
- login(username, password, code, orgid)
+ login(username, password, code, orgid, campusid)
.then((res) => {
setToken(res.token);
commit("SET_TOKEN", res.token);
@@ -199,13 +200,24 @@
localStorage.setItem("deptCode", "");
localStorage.setItem("YongHuID", "1497875635748474880");
localStorage.setItem("YongHuXM", "SYZYY");
- }
- else if (orgid == "47231077933110211A1101") {
+ } else if (orgid == "47231077933110211A1101") {
localStorage.setItem("orgname", "鑾查兘鍖轰汉姘戝尰闄�");
localStorage.setItem("ZuHuID", "1429338802177000011");
localStorage.setItem("deptCode", "");
localStorage.setItem("YongHuID", "1512710152715767808");
localStorage.setItem("YongHuXM", "LDRMYY");
+ } else if (orgid == "1") {
+ localStorage.setItem("orgname", "鏉窞甯傜涓�浜烘皯鍖婚櫌婀栨花闄㈠尯");
+ localStorage.setItem("ZuHuID", "");
+ localStorage.setItem("deptCode", "");
+ localStorage.setItem("YongHuID", "");
+ localStorage.setItem("YongHuXM", "");
+ } else if (orgid == "2") {
+ localStorage.setItem("orgname", "鏉窞甯傜涓�浜烘皯鍖婚櫌鍚村北闄㈠尯");
+ localStorage.setItem("ZuHuID", "");
+ localStorage.setItem("deptCode", "");
+ localStorage.setItem("YongHuID", "");
+ localStorage.setItem("YongHuXM", "");
}
resolve();
})
diff --git a/src/utils/sipService.js b/src/utils/sipService.js
index 5ce3b1a..7b917f0 100644
--- a/src/utils/sipService.js
+++ b/src/utils/sipService.js
@@ -10,6 +10,14 @@
wsUrl: "wss://10.10.0.220:7443",
domain: "10.10.0.220",
},
+ 鏉窞甯傜涓�浜烘皯鍖婚櫌婀栨花闄㈠尯: {
+ wsUrl: "wss://192.169.5.248:5060",
+ domain: "192.169.5.248",
+ },
+ 鏉窞甯傜涓�浜烘皯鍖婚櫌鍚村北闄㈠尯: {
+ wsUrl: "wss://192.169.5.248:5060",
+ domain: "192.169.5.248",
+ },
// 鍙互缁х画娣诲姞鍏朵粬鍖婚櫌閰嶇疆
default: {
wsUrl: "wss://192.168.10.124:7443",
diff --git a/src/views/login.vue b/src/views/login.vue
index 9876eac..1260bd7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -186,43 +186,56 @@
};
},
handleLogin() {
- this.$refs.loginForm.validate((valid) => {
- if (valid) {
- this.loading = true;
- if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
- Cookies.set("password", encrypt(this.loginForm.password), {
- expires: 30,
- });
- Cookies.set("rememberMe", this.loginForm.rememberMe, {
- expires: 30,
- });
- } else {
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove("rememberMe");
- }
- // this.loginForm.orgid = '1',
- this.$store
- .dispatch("Login", this.loginForm)
- .then((res) => {
- if (this.loginForm.username == "admin") {
- this.$router.push({ path: "/index" }).catch(() => {});
- } else {
- this.$router
- .push({ path: "/followvisit/discharge" })
- .catch(() => {});
- }
- })
- .catch(() => {
- this.loading = false;
- if (this.captchaEnabled) {
- this.getCode();
- }
- });
+ this.$refs.loginForm.validate((valid) => {
+ if (valid) {
+ this.loading = true;
+
+ if (this.loginForm.rememberMe) {
+ Cookies.set("username", this.loginForm.username, { expires: 30 });
+ Cookies.set("password", encrypt(this.loginForm.password), {
+ expires: 30,
+ });
+ Cookies.set("rememberMe", this.loginForm.rememberMe, {
+ expires: 30,
+ });
+ } else {
+ Cookies.remove("username");
+ Cookies.remove("password");
+ Cookies.remove("rememberMe");
+ }
+
+ // 鍔ㄦ�佽缃� campusid 鍙傛暟
+ const selectedOrg = this.options.find(item => item.value === this.loginForm.orgid);
+ if (selectedOrg) {
+ if (selectedOrg.label.includes('婀栨花')) {
+ this.loginForm.campusid = 1;
+ } else if (selectedOrg.label.includes('鍚村北')) {
+ this.loginForm.campusid = 2;
+ } else {
+ this.loginForm.campusid = 1; // 榛樿鍊兼垨鍏朵粬澶勭悊
}
- });
- },
+ }
+
+ this.$store
+ .dispatch("Login", this.loginForm)
+ .then((res) => {
+ if (this.loginForm.username == "admin") {
+ this.$router.push({ path: "/index" }).catch(() => {});
+ } else {
+ this.$router
+ .push({ path: "/followvisit/discharge" })
+ .catch(() => {});
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ if (this.captchaEnabled) {
+ this.getCode();
+ }
+ });
+ }
+ });
+}
},
};
</script>
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index 34a7bdb..de63b4a 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -1227,8 +1227,6 @@
},
// 鏌ヨ鏍囩鍒楄〃鍙傛暟
queryParams: {
- pageNum: 1,
- pageSize: 10,
serviceType: [2],
dateRange: [],
statisticaltype: 1,
diff --git a/src/views/sfstatistics/percentage/satisfaction.vue b/src/views/sfstatistics/percentage/satisfaction.vue
index 1b39d4d..087e7b3 100644
--- a/src/views/sfstatistics/percentage/satisfaction.vue
+++ b/src/views/sfstatistics/percentage/satisfaction.vue
@@ -248,13 +248,13 @@
</el-table-column>
</el-table>
- <pagination
+ <!-- <pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
- />
+ /> -->
</el-col>
</el-row>
</div>
@@ -730,8 +730,7 @@
},
// 鏌ヨ鏍囩鍒楄〃鍙傛暟
queryParams: {
- pageNum: 1,
- pageSize: 10,
+
serviceType: [2],
dateRange: [],
statisticaltype: 1,
diff --git a/vue.config.js b/vue.config.js
index 4d566cb..d333df1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,12 +36,12 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://www.health-y.cn/lssf`,
- target: `http://192.168.100.10:8096`,
+ // target: `http://192.168.100.10:8096`,
// target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
// target: `http://192.168.100.10:8095`,//鏂板崕
// target:`http://localhost:8095`,
// target:`http://35z1t16164.qicp.vip`,
- // target: `http://192.168.100.111:8095`,
+ target: `http://192.168.100.172:8095`,
// target: `http://192.168.101.166:8093`,
// target: `http://192.168.191.181:8095`,
changeOrigin: true,
diff --git a/wailian.zip b/wailian.zip
deleted file mode 100644
index 5df2f74..0000000
--- a/wailian.zip
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3