diff --git a/sample-form-client-ui/admin/src/App.vue b/sample-form-client-ui/admin/src/App.vue
index 0cc910ccdba9daf56158b3294c0cdd3ca8d0507b..30beba5aa6faa36e6eddff309568be9c2fde867d 100644
--- a/sample-form-client-ui/admin/src/App.vue
+++ b/sample-form-client-ui/admin/src/App.vue
@@ -28,6 +28,7 @@ export default {
"$route.path"(newVal) {
if (newVal == "/" || newVal == "/home") {
this.getHomeInfo();
+ this.getSetinfo();
}
},
},
@@ -60,8 +61,11 @@ export default {
homeUrl: "http://192.168.0.24:8080/#/",
serverUrl: "http://192.168.0.98:11078/",
},
- devicenum: "B8-13-32-86-9F-04",
+ devicenum: "18-93-7F-C0-AD-B5",
+ // devicenum: "B8-13-32-86-9F-04",
};
+ local.setLocal(obj.devicenum);
+ this.SET_deviceCodet(obj.devicenum);
this.WebSocketMq(obj);
}
},
@@ -77,7 +81,12 @@ export default {
});
},
methods: {
- ...mapMutations(["SET_homeInfo", "SET_datumList", "SET_matterList"]),
+ ...mapMutations([
+ "SET_homeInfo",
+ "SET_datumList",
+ "SET_matterList",
+ "SET_deviceCodet",
+ ]),
// 绠€鏋恥rl
urlGet() {
let q = {};
@@ -101,6 +110,7 @@ export default {
let { devicenum } = routeQuery;
this.devicenum = devicenum;
local.setLocal("devicenum", devicenum);
+ this.SET_deviceCodet(devicenum);
}
},
// 鑾峰彇棣栭〉淇℃伅
diff --git a/sample-form-client-ui/admin/src/api/index.js b/sample-form-client-ui/admin/src/api/index.js
index 7275c0d7214a0b1985e7ca5e8ed414bc5cc7d7f8..84595241bef663f8a3f41d0e15120d6600919bb5 100644
--- a/sample-form-client-ui/admin/src/api/index.js
+++ b/sample-form-client-ui/admin/src/api/index.js
@@ -1,6 +1,7 @@
// 浜嬮」api
import local from "@/utils/local";
import request from "@/utils/request";
+import store from "@/store";
// 棣栭〉鏁版嵁灞曠ず
export const getHomeInfo = (data) => {
let baseUrl = local.getLocal("serverUrl");
@@ -19,13 +20,13 @@ export const getHomeInfo = (data) => {
export const getdeptList = (data) => {
let baseUrl = local.getLocal("serverUrl");
let siteId = local.getLocal("siteId");
- let deviceCode = local.getLocal("devicenum");
+ // let deviceCode = local.getLocal("devicenum");
return request({
url: `${baseUrl}sampleform/home/depts`,
method: "post",
data: {
siteId,
- deviceCode,
+ deviceCode: store.getters.deviceCode,
...data,
},
});
@@ -49,13 +50,13 @@ export const getSampleformMatterList = (data) => {
export const getDeviceMatterList = (data) => {
let baseUrl = local.getLocal("serverUrl");
let siteId = local.getLocal("siteId");
- let deviceCode = local.getLocal("devicenum");
+ // let deviceCode = local.getLocal("devicenum");
return request({
url: `${baseUrl}sampleform/device/matter/datum/list`,
method: "post",
data: {
siteId,
- deviceCode,
+ deviceCode: store.getters.deviceCode,
...data,
},
});
diff --git a/sample-form-client-ui/admin/src/components/SearchBox.vue b/sample-form-client-ui/admin/src/components/SearchBox.vue
index 485fc940c77866ca6e9b15c030bea75880b58bd2..ba2b990da480d548c1a2adf018ac2fe0d0e10a6b 100644
--- a/sample-form-client-ui/admin/src/components/SearchBox.vue
+++ b/sample-form-client-ui/admin/src/components/SearchBox.vue
@@ -94,5 +94,11 @@ export default {
font-size: 24px;
border-radius: 8px;
color: #333;
+ &:hover {
+ border-color: var(--main-theme-color);
+ }
+ &:focus {
+ border-color: var(--main-theme-color);
+ }
}
</style>
\ No newline at end of file
diff --git a/sample-form-client-ui/admin/src/mixin/mq.js b/sample-form-client-ui/admin/src/mixin/mq.js
index aaa3d082e9eedb838fe0573a37f1c6d09c7e239d..ca5fbeb7fe0a9fec6d2e1dbb2037aa272d6d33f3 100644
--- a/sample-form-client-ui/admin/src/mixin/mq.js
+++ b/sample-form-client-ui/admin/src/mixin/mq.js
@@ -195,8 +195,8 @@ export default {
let deviceInfo = objc.deviceInfo; //璁惧淇℃伅
let serverUrl = serviceInfo.serverUrl; //绯荤粺鍦板潃
let siteId = deviceInfo.siteId; //绔欑偣id
- let devicenum = objc.devicenum;
- local.setLocal("devicenum", devicenum); // 璁惧缂栧彿
+ // let devicenum = objc.devicenum;
+ // local.setLocal("devicenum", devicenum); // 璁惧缂栧彿
// 淇濆瓨鍦板潃
local.setLocal("serverUrl", serverUrl);
local.setLocal("siteId", siteId);
diff --git a/sample-form-client-ui/admin/src/pages/home/Home.vue b/sample-form-client-ui/admin/src/pages/home/Home.vue
index 2552f1f104832eaded0b2c64b0b35dc5790d0b5d..021599ad758712bc61413409b7e9d68b2d75455b 100644
--- a/sample-form-client-ui/admin/src/pages/home/Home.vue
+++ b/sample-form-client-ui/admin/src/pages/home/Home.vue
@@ -450,6 +450,9 @@ export default {
right: 5px;
top: 5px;
}
+:deep(.el-input) {
+ border-radius: 8px;
+}
:deep(.el-input__inner) {
width: 895px;
height: 72px;
@@ -457,6 +460,12 @@ export default {
font-size: 24px;
border-radius: 8px;
color: #333;
+ &:hover {
+ border-color: var(--main-theme-color);
+ }
+ &:focus {
+ border-color: var(--main-theme-color);
+ }
}
.main {
margin-top: 40px;
diff --git a/sample-form-client-ui/admin/src/pages/layouts/Layouts.vue b/sample-form-client-ui/admin/src/pages/layouts/Layouts.vue
index 28994dd6daaf7aa0bfd33931ec599f6e84f93458..d8faba650395b69df7f77ac5f310d5eba55030dd 100644
--- a/sample-form-client-ui/admin/src/pages/layouts/Layouts.vue
+++ b/sample-form-client-ui/admin/src/pages/layouts/Layouts.vue
@@ -19,7 +19,7 @@ export default {
clearInterval(that.timeOut);
this.timeOut = setTimeout(function () {
that.$router.push({ path: "/" });
- }, 1000 * 60 * 2);
+ }, 1000 * 60 * 5);
},
// 鏃犱换浣曟搷浣滆繑鍥為椤�
isTimeOut() {
diff --git a/sample-form-client-ui/admin/src/pages/showpage/MatterList.vue b/sample-form-client-ui/admin/src/pages/showpage/MatterList.vue
index f1953572a8636ffdc688973559edad150b26d932..127a4539811c9440d75ea781cf8993888d0d6a5b 100644
--- a/sample-form-client-ui/admin/src/pages/showpage/MatterList.vue
+++ b/sample-form-client-ui/admin/src/pages/showpage/MatterList.vue
@@ -83,7 +83,6 @@ import SearchBox from "@/components/SearchBox.vue";
import MateralsList from "../../components/MateralsList.vue";
import YEmpty from "@/components/YEmpty.vue";
import { getDeviceMatterList } from "@/api";
-
export default {
components: {
Header,
diff --git a/sample-form-client-ui/admin/src/store/index.js b/sample-form-client-ui/admin/src/store/index.js
index 0a9fdc765a45bd8000b0b1ee2823dec82267e953..605b27d1e2c05686aa53cf49752ee8f3d7efd1fa 100644
--- a/sample-form-client-ui/admin/src/store/index.js
+++ b/sample-form-client-ui/admin/src/store/index.js
@@ -11,8 +11,13 @@ export default new Vuex.Store({
homeInfo: {}, // 棣栭〉鏁版嵁
datumList: [], // 棣栭〉鏉愭枡
matterList: [], // 棣栭〉浜嬮」
+ deviceCode: "", // 璁惧缂栫爜
+ },
+ getters: {
+ deviceCode(state) {
+ return state.deviceCode;
+ },
},
- getters: {},
mutations: {
SET_devicenum(state, devicenum) {
state.devicenum = devicenum;
@@ -26,6 +31,9 @@ export default new Vuex.Store({
SET_matterList(state, matterList) {
state.matterList = matterList;
},
+ SET_deviceCodet(state, deviceCode) {
+ state.deviceCode = deviceCode;
+ },
},
actions: {},
modules: {},