@@ -32,29 +32,28 @@ import { initWebsocket, subWebsocketState,closeWebsocket } from '../../apis/requ
import { getSignInfo } from '../../apis/signin'
import { getConfig } from '../../apis/config'
import {Tools} from '@element-plus/icons-vue'
-import { getUpdater } from '@/apis/updater';
export default {
components:{Tools},
setup(props) {
const globalData = injectGlobalData();
- const connected = computed(()=>globalData.value.connected);
+ const connected = computed(()=>globalData.value.api.connected);
const router = useRouter();
const route = useRoute();
const defaultInfo = {api:`${window.location.hostname}:1803`,psd:'snltty'};
- const handleResetConnect = () => {
- localStorage.setItem('api-cache', '');
- router.push({name:route.name});
- window.location.reload();
- }
const queryCache = JSON.parse(localStorage.getItem('api-cache') || JSON.stringify(defaultInfo));
const state = reactive({
api:queryCache.api,
psd:queryCache.psd,
showPort: false
});
- const showPort = computed(() => globalData.value.connected == false && state.showPort);
+ const showPort = computed(() => globalData.value.api.connected == false && state.showPort);
+ const handleResetConnect = () => {
+ localStorage.setItem('api-cache', '');
+ router.push({name:route.name});
+ window.location.reload();
+ }
const handleConnect = () => {
queryCache.api = state.api;
queryCache.psd = state.psd;
@@ -78,7 +77,7 @@ export default {
globalData.value.config.Client = res.Client;
globalData.value.config.Server = res.Server;
globalData.value.config.Running = res.Running;
- globalData.value.configed = true;
+ globalData.value.config.configed = true;
setTimeout(()=>{
_getConfig();
},1000);
@@ -102,21 +101,12 @@ export default {
},1000);
});
}
- const _getUpdater = ()=>{
- getUpdater().then((res)=>{
- if(res){
- globalData.value.updater.Version = res.Version;
- globalData.value.updater.Msg = res.Msg;
- }
- }).catch((err)=>{});
- }
onMounted(() => {
- setTimeout(() => { state.showPort = true; }, 100);
+ setTimeout(() => { state.showPort = true; }, 500);
subWebsocketState((state) => { if (state) {
_getConfig();
_getSignInfoInfo();
- _getUpdater();
}});
router.isReady().then(()=>{
state.api = route.query.api ?`${window.location.hostname}:${route.query.api}` : state.api;
diff --git a/linker.web/src/components/status/Server.vue b/linker.web/src/components/status/Server.vue
index ccbf4e5f..92ea0ea8 100644
--- a/linker.web/src/components/status/Server.vue
+++ b/linker.web/src/components/status/Server.vue
@@ -63,7 +63,6 @@ export default {
state.loading = false;
state.show = false;
ElMessage.success('已操作');
- globalData.value.updateFlag = Date.now();
}).catch((err) => {
state.loading = false;
ElMessage.success('操作失败!');
diff --git a/linker.web/src/provide.js b/linker.web/src/provide.js
index bb7115e4..f8e5a2b6 100644
--- a/linker.web/src/provide.js
+++ b/linker.web/src/provide.js
@@ -1,22 +1,19 @@
import { subWebsocketState } from "@/apis/request";
-import { computed, inject, provide, ref } from "vue";
+import { inject, provide, ref } from "vue";
const globalDataSymbol = Symbol();
export const provideGlobalData = () => {
const globalData = ref({
//已连接
- connected: false,
- updateFlag: false,
+ api: { connected: false },
height: 0,
- config: { Common: {}, Client: {}, Server: {}, Running: {} },
- configed: false,
+ config: { Common: {}, Client: {}, Server: {}, Running: {}, configed: false },
signin: { Connected: false, Connecting: false, Version: 'v1.0.0.0' },
- bufferSize: ['1KB', '2KB', '4KB', '8KB', '16KB', '32KB', '64KB', '128KB', '256KB', '512KB', '1024KB'],
- updater: { Msg: '', Version: '' }
+ bufferSize: ['1KB', '2KB', '4KB', '8KB', '16KB', '32KB', '64KB', '128KB', '256KB', '512KB', '1024KB']
});
subWebsocketState((state) => {
- globalData.value.connected = state;
+ globalData.value.api.connected = state;
});
provide(globalDataSymbol, globalData);
diff --git a/linker.web/src/views/devices/Device.vue b/linker.web/src/views/devices/Device.vue
index 2a0977e1..d2216949 100644
--- a/linker.web/src/views/devices/Device.vue
+++ b/linker.web/src/views/devices/Device.vue
@@ -18,16 +18,29 @@
{{ scope.row.IP }}
-
-
- {{scope.row.Version}}
-
-
- {{scope.row.Version}}
-
-
- {{scope.row.Version}}
-
+
+
+ {{scope.row.Version}}
+
+
+
+
+
+
+
+
+
+ 0%
+ {{parseInt(updater.list[scope.row.MachineId].Current/updater.list[scope.row.MachineId].Length*100)}}%
+
+
+
+
+
+
+
+
+