From 5ec1554f347f91bcd1fbc8e7550fde8edec5a3d3 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 21 五月 2021 15:00:02 +0800
Subject: [PATCH] 修复运行时提示的错误
---
vue.config.js | 2
src/pages/maintain/index/App.vue | 26 ---
src/pages/systemSettings/views/keyboardLanguage.vue | 21 +--
src/pages/maintain/views/systemClean.vue | 40 +---
src/pages/systemSettings/views/generalSettings.vue | 81 ++++------
src/pages/systemSettings/views/NetSettings.vue | 189 +++++++-------------------
src/api/shuohuang.ts | 35 ++--
7 files changed, 129 insertions(+), 265 deletions(-)
diff --git a/src/api/shuohuang.ts b/src/api/shuohuang.ts
index 592f571..20883d8 100644
--- a/src/api/shuohuang.ts
+++ b/src/api/shuohuang.ts
@@ -36,7 +36,7 @@
method: 'get',
params: query
})
- export const getCarVideos = (query: any) =>
+export const getCarVideos = (query: any) =>
request({
url: '/data/api-c/lkg/getCarVideos',
method: 'get',
@@ -125,39 +125,44 @@
method: 'post',
data
})
-export const uploadDirectory = (data:any) =>
+export const uploadDirectory = (data: any) =>
request({
- url:'/data/api-c/user/uploadMulti',
- method:'post',
+ url: '/data/api-c/user/uploadMulti',
+ method: 'post',
data
})
-export const getTransferRecord = (query:any) => request({
- url:'/data/api-c/saverecord/getlst',
+export const getTransferRecord = (query: any) => request({
+ url: '/data/api-c/saverecord/getlst',
method: 'get',
params: query
})
export const getTransferStatusList = () => request({
- url:'/data/api-c/saverecord/getStatusList',
+ url: '/data/api-c/saverecord/getStatusList',
method: 'get'
})
-export const addDevice = (data:any)=>request({
- url:'/data/api-c/device/add',
+export const addDevice = (data: any) => request({
+ url: '/data/api-c/device/add',
method: 'post',
data
})
-export const getDeviceList = ()=>request({
- url:'/data/api-c/device/getlst',
+export const getDeviceList = () => request({
+ url: '/data/api-c/device/getlst',
method: 'get'
})
-export const getDeviceInfoById = (query:any) => request({
- url:'/data/api-c/slot/getlst',
+export const getDeviceInfoById = (query: any) => request({
+ url: '/data/api-c/slot/getlst',
method: 'get',
params: query
})
-export const getEventVideo = (query:any) => request({
- url:'/data/api-c/lkg/getEventClip',
+export const getEventVideo = (query: any) => request({
+ url: '/data/api-c/lkg/getEventClip',
+ method: 'get',
+ params: query
+})
+export const downloadFile = (query: any) => request({
+ url: '/data/api-c/lkg/getEventClip',
method: 'get',
params: query
})
\ No newline at end of file
diff --git a/src/pages/maintain/index/App.vue b/src/pages/maintain/index/App.vue
index 3f6e78e..1c4e7a8 100644
--- a/src/pages/maintain/index/App.vue
+++ b/src/pages/maintain/index/App.vue
@@ -11,22 +11,10 @@
<span class="card-text">{{ item.name }}</span>
</div>
</div>
- <systemClean
- v-if="activePage == '绯荤粺娓呯悊'"
- style="width: 100%"
- ></systemClean>
- <updateSettings
- v-if="activePage == '鏇存柊璁剧疆'"
- style="width: 100%"
- ></updateSettings>
- <back-up
- v-if="activePage == '澶囦唤杩樺師'"
- style="width: 100%"
- ></back-up>
- <restartSettings
- v-if="activePage == '閲嶅惎璁剧疆'"
- style="width: 100%"
- ></restartSettings>
+ <systemClean v-if="activePage == '绯荤粺娓呯悊'" style="width: 100%"></systemClean>
+ <updateSettings v-if="activePage == '鏇存柊璁剧疆'" style="width: 100%"></updateSettings>
+ <back-up v-if="activePage == '澶囦唤杩樺師'" style="width: 100%"></back-up>
+ <restartSettings v-if="activePage == '閲嶅惎璁剧疆'" style="width: 100%"></restartSettings>
</div>
</template>
@@ -36,8 +24,6 @@
saveClockInfo,
testNTPserver,
} from "@/api/system";
-import switchBar from "../components/switchBar";
-import ipInput from "@/components/subComponents/IPInput";
import systemClean from "../views/systemClean";
import updateSettings from "../views/updateSettings";
import BackUp from "../views/backUp";
@@ -45,8 +31,6 @@
export default {
name: "settings",
components: {
- switchBar,
- ipInput,
systemClean,
updateSettings,
BackUp,
@@ -140,7 +124,6 @@
border-right: 5px solid rgba(248, 248, 248, 1);
box-sizing: border-box;
.account-left {
-
.add-account {
color: rgba(61, 104, 225, 1);
margin-top: 50px;
@@ -171,7 +154,6 @@
font-size: 14px;
}
}
-
}
.datetime-left {
.time-card {
diff --git a/src/pages/maintain/views/systemClean.vue b/src/pages/maintain/views/systemClean.vue
index ca5bb8f..5ac8eed 100644
--- a/src/pages/maintain/views/systemClean.vue
+++ b/src/pages/maintain/views/systemClean.vue
@@ -1,9 +1,5 @@
<template>
- <div class="clear"
-
- v-loading="loading"
- :element-loading-text="loadingText"
- >
+ <div class="clear" v-loading="loading" :element-loading-text="loadingText">
<div class="head">
<span class="t">璇烽�夋嫨瑕佹竻鐞嗙殑鏁版嵁鑼冨洿</span>
<el-date-picker
@@ -16,8 +12,7 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"
- >
- </el-date-picker>
+ ></el-date-picker>
</div>
<div class="desc">
@@ -34,9 +29,7 @@
<div class="warm">
<!-- <span class="icon iconfont" style="margin-right:5px"></span> -->
<i class="iconfont icontishi-zhuyi"></i>
- <span class="text"
- >璇锋敞鎰忥紝鎸変互涓婃棩鏈熻寖鍥村垹闄ょ殑鏁版嵁涓嶅彲鎭㈠锛岀珛鍗崇敓鏁堬紝璇疯皑鎱庢搷浣�!</span
- >
+ <span class="text">璇锋敞鎰忥紝鎸変互涓婃棩鏈熻寖鍥村垹闄ょ殑鏁版嵁涓嶅彲鎭㈠锛岀珛鍗崇敓鏁堬紝璇疯皑鎱庢搷浣�!</span>
</div>
</div>
</div>
@@ -59,17 +52,10 @@
dataRange: [
this.$moment().format("YYYY-MM-DD HH:mm:ss"),
this.$moment().format("YYYY-MM-DD HH:mm:ss"),
- ],
- pickerOptions: {
- disabledDate(time) {
- var day = new Date();
- day.setTime(day.getTime() - 24 * 60 * 60 * 1000);
- return time.getTime() > day;
- },
- },
+ ]
};
},
- mounted() {},
+ mounted() { },
methods: {
deleteData() {
@@ -78,10 +64,10 @@
var showEndTime = timeRange[1];
this.$confirm(
"鎻愮ず锛�" +
- showStartTime +
- " 鑷� " +
- showEndTime +
- " 浜х敓鐨勫叏閮ㄦ暟鎹皢琚垹闄わ紝姝ゆ搷浣滅珛鍗崇敓鏁堬紝涓嶅彲鎭㈠锛屾槸鍚﹀垹闄わ紵",
+ showStartTime +
+ " 鑷� " +
+ showEndTime +
+ " 浜х敓鐨勫叏閮ㄦ暟鎹皢琚垹闄わ紝姝ゆ搷浣滅珛鍗崇敓鏁堬紝涓嶅彲鎭㈠锛屾槸鍚﹀垹闄わ紵",
{
center: true,
cancelButtonClass: "comfirm-class-cancle",
@@ -112,7 +98,7 @@
this.loading = false
});
})
- .catch(() => {});
+ .catch(() => { });
},
format(array) {
return [
@@ -151,8 +137,8 @@
border: none;
}
.el-range-editor--small .el-range-separator {
- line-height: 26px;
-}
+ line-height: 26px;
+ }
}
.desc {
margin-top: 50px;
@@ -200,7 +186,7 @@
align-items: center;
justify-content: center;
.iconfont {
- font-size: 16px;
+ font-size: 16px;
color: #e99038;
margin-right: 5px;
diff --git a/src/pages/systemSettings/views/NetSettings.vue b/src/pages/systemSettings/views/NetSettings.vue
index 246006a..27d2e22 100644
--- a/src/pages/systemSettings/views/NetSettings.vue
+++ b/src/pages/systemSettings/views/NetSettings.vue
@@ -3,15 +3,21 @@
<div class="cluster-content">
<div class="cluster-center" ref="left">
<div class="menu-item" @click="openRight('net')">
- <div><span class="icon iconfont"></span>缃戠粶璁剧疆</div>
+ <div>
+ <span class="icon iconfont"></span>缃戠粶璁剧疆
+ </div>
<div class="status">宸茶繛鎺�</div>
</div>
<div class="menu-item" @click="openRight('wifi')">
- <div><span class="icon iconfont"></span>鏃犵嚎缃戠粶</div>
+ <div>
+ <span class="icon iconfont"></span>鏃犵嚎缃戠粶
+ </div>
<div class="status">宸茶繛鎺�</div>
</div>
<div class="menu-item" @click="openRight('wire')">
- <div><span class="icon iconfont"></span>鏈夌嚎缃戠粶</div>
+ <div>
+ <span class="icon iconfont"></span>鏈夌嚎缃戠粶
+ </div>
<div class="status">宸茶繛鎺�</div>
</div>
</div>
@@ -27,35 +33,23 @@
v-loading="joinLoading"
>
<el-form-item label="璁惧鍚嶇О" prop="deviceName">
- <el-input
- v-model="ruleForm.deviceName"
- size="small"
- placeholder="蹇呭～"
- ></el-input>
+ <el-input v-model="ruleForm.deviceName" size="small" placeholder="蹇呭～"></el-input>
</el-form-item>
<el-form-item label="绔彛" prop="port">
- <el-input
- v-model="ruleForm.port"
- placeholder="閫夊～锛屽閮ㄨ闂殑绔彛"
- size="small"
- ></el-input>
+ <el-input v-model="ruleForm.port" placeholder="閫夊～锛屽閮ㄨ闂殑绔彛" size="small"></el-input>
</el-form-item>
<div class="save-btn">淇濆瓨</div>
</el-form>
</div>
<div class="wifi" v-if="activePage == 'wifi' && !inWifiDetail">
- <switchBar
- :barName="`鏃犵嚎缃戝崱`"
- @switchChange="wifiControl"
- :value="isOpenWifi"
- ></switchBar>
+ <switchBar :barName="`鏃犵嚎缃戝崱`" @switchChange="wifiControl" :value="isOpenWifi"></switchBar>
<div class="wifi-option" v-for="(item, i) in wifiList" :key="i">
<div class="name">
<span class="icon iconfont"></span>
- <span> {{ item.name }} </span>
+ <span>{{ item.name }}</span>
</div>
<div class="more-detail">
@@ -64,8 +58,7 @@
class="icon iconfont"
style="margin-left: 10px"
@click="checkWifi(item)"
- ></span
- >
+ ></span>
</div>
</div>
</div>
@@ -90,20 +83,11 @@
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
- <el-input
- v-model="wifiForm.password"
- placeholder="璇疯緭鍏ュ瘑鐮�"
- size="small"
- show-password
- ></el-input>
+ <el-input v-model="wifiForm.password" placeholder="璇疯緭鍏ュ瘑鐮�" size="small" show-password></el-input>
</el-form-item>
</el-form>
- <switchBar
- :barName="`楂樼骇璁剧疆`"
- @switchChange="highClassSetting"
- :value="isHighClass"
- ></switchBar>
+ <switchBar :barName="`楂樼骇璁剧疆`" @switchChange="highClassSetting" :value="isHighClass"></switchBar>
<div class="title">IPV4</div>
<!-- <el-form
@@ -121,14 +105,9 @@
show-password
></el-input>
</el-form-item>
- </el-form> -->
+ </el-form>-->
- <el-form
- :model="ipv4Form"
- :rules="ipv4FormRules"
- ref="ipv4Form"
- label-width="150px"
- >
+ <el-form :model="ipv4Form" :rules="ipv4FormRules" ref="ipv4Form" label-width="150px">
<el-form-item label="鏂规硶">
<el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
<el-option
@@ -136,51 +115,30 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="IP" prop="ip">
- <ip-input
- :ip="ipv4Form.ip"
- @on-blur="ipv4Form.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.ip" @on-blur="ipv4Form.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="瀛愮綉鎺╃爜" prop="subMask">
- <ip-input
- :ip="ipv4Form.subMask"
- @on-blur="ipv4Form.subMask = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.subMask" @on-blur="ipv4Form.subMask = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="缃戝叧" prop="gateway">
- <ip-input
- :ip="ipv4Form.gateway"
- @on-blur="ipv4Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.gateway" @on-blur="ipv4Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="棣栭�塂NS" prop="dns">
- <ip-input
- :ip="ipv4Form.dns1"
- @on-blur="ipv4Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns1" @on-blur="ipv4Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="澶囩敤DNS" prop="dns">
- <ip-input
- :ip="ipv4Form.dns2"
- @on-blur="ipv4Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns2" @on-blur="ipv4Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
<div class="title">IPV6</div>
- <el-form
- :model="ipv6Form"
- :rules="ipv6FormRules"
- ref="ipv4Form"
- label-width="150px"
- >
+ <el-form :model="ipv6Form" :rules="ipv6FormRules" ref="ipv4Form" label-width="150px">
<el-form-item label="鏂规硶">
<el-select v-model="value" placeholder="璇烽�夋嫨" size="small">
<el-option
@@ -188,23 +146,15 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="IP鍦板潃" prop="ip">
- <ip-input
- :ip="ipv6Form.ip"
- @on-blur="ipv6Form.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.ip" @on-blur="ipv6Form.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="鍓嶇紑" prop="subMask">
<div style="display: flex">
- <el-input
- v-model="wifiForm.password"
- placeholder=""
- size="small"
- ></el-input>
+ <el-input v-model="wifiForm.password" placeholder size="small"></el-input>
<div class="ad">-</div>
<div class="ad">+</div>
@@ -213,22 +163,13 @@
</el-form-item>
<el-form-item label="缃戝叧" prop="gateway">
- <ip-input
- :ip="ipv6Form.gateway"
- @on-blur="ipv6Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.gateway" @on-blur="ipv6Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="棣栭�塂NS" prop="dns">
- <ip-input
- :ip="ipv6Form.dns1"
- @on-blur="ipv6Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.dns1" @on-blur="ipv6Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="澶囩敤DNS" prop="dns">
- <ip-input
- :ip="ipv6Form.dns2"
- @on-blur="ipv6Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv6Form.dns2" @on-blur="ipv6Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
@@ -239,12 +180,7 @@
</div>
<div class="wire" v-if="activePage == 'wire' && !inWireDetail">
- <div
- class="wire-bar"
- v-for="(item, i) in wireArr"
- :key="i"
- @click="checkWire(item)"
- >
+ <div class="wire-bar" v-for="(item, i) in wireArr" :key="i" @click="checkWire(item)">
<div class="name">{{ item.name }}</div>
<div class="right">
@@ -254,55 +190,34 @@
v-model="value"
active-color="rgba(61, 104, 225, 1)"
@change="switchChange"
- >
- </el-switch>
+ ></el-switch>
</div>
</div>
</div>
<div class="wire-detail" v-if="activePage == 'wire' && inWireDetail">
- <div class="title">缃戠粶璁剧疆</div>
- <el-form
- :model="wireForm"
- :rules="wireFormRules"
- ref="wireForm"
- label-width="150px"
- >
- <el-form-item label="缃戠粶鍚嶇О" prop="name">
+ <div class="title">缃戠粶璁剧疆</div>
+ <el-form :model="wireForm" :rules="wireFormRules" ref="wireForm" label-width="150px">
+ <el-form-item label="缃戠粶鍚嶇О" prop="name">
<div class="wifi-name">{{ 12123 }}</div>
</el-form-item>
<el-form-item label="缃戝崱" prop="name">
<div class="wifi-name">{{ 12123 }}</div>
</el-form-item>
<el-form-item label="IP" prop="ip">
- <ip-input
- :ip="wireForm.ip"
- @on-blur="wireForm.ip = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.ip" @on-blur="wireForm.ip = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="瀛愮綉鎺╃爜" prop="subMask">
- <ip-input
- :ip="wireForm.subMask"
- @on-blur="wireForm.subMask = arguments[0]"
- ></ip-input>
+ <ip-input :ip="wireForm.subMask" @on-blur="wireForm.subMask = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="缃戝叧" prop="gateway">
- <ip-input
- :ip="ipv4Form.gateway"
- @on-blur="ipv4Form.gateway = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.gateway" @on-blur="ipv4Form.gateway = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="棣栭�塂NS" prop="dns">
- <ip-input
- :ip="ipv4Form.dns1"
- @on-blur="ipv4Form.dns1 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns1" @on-blur="ipv4Form.dns1 = arguments[0]"></ip-input>
</el-form-item>
<el-form-item label="澶囩敤DNS" prop="dns">
- <ip-input
- :ip="ipv4Form.dns2"
- @on-blur="ipv4Form.dns2 = arguments[0]"
- ></ip-input>
+ <ip-input :ip="ipv4Form.dns2" @on-blur="ipv4Form.dns2 = arguments[0]"></ip-input>
</el-form-item>
</el-form>
</div>
@@ -328,12 +243,15 @@
addESNode,
getEsClusterInfo,
} from "@/api/clusterManage";
-import cloudNode from "../components/CloudNode";
import ipInput from "@/components/subComponents/IPInput";
import { isIPv4 } from "@/scripts/validate";
import switchBar from "../components/switchBar";
export default {
+ components: {
+ ipInput,
+ switchBar,
+ },
data() {
const checkPwd = (rule, value, callback) => {
if (!value) {
@@ -363,10 +281,10 @@
wifiList: [{ name: "鏃犵嚎缃戠粶1" }, { name: "鏃犵嚎缃戠粶2" }],
isOpenWifi: false,
inWireDetail: false,
- wireForm:{
+ wireForm: {
},
- wireFormRules:{
+ wireFormRules: {
},
activePage: "net",
@@ -392,19 +310,13 @@
value: "",
};
},
- components: {
- cloudNode,
- ipInput,
- switchBar,
- },
- mounted() {},
- beforeDestroy() {},
+ beforeDestroy() { },
props: ["barName"],
methods: {
openRight(typ) {
this.activePage = typ;
},
- wifiControl(val) {},
+ wifiControl(val) { },
checkWifi() {
this.inWifiDetail = true;
},
@@ -432,7 +344,8 @@
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
- padding: 10px; border-right: 5px solid #f8f8f8;
+ padding: 10px;
+ border-right: 5px solid #f8f8f8;
// background-color: lavender;
.menu-item {
diff --git a/src/pages/systemSettings/views/generalSettings.vue b/src/pages/systemSettings/views/generalSettings.vue
index 7507fbc..787e192 100644
--- a/src/pages/systemSettings/views/generalSettings.vue
+++ b/src/pages/systemSettings/views/generalSettings.vue
@@ -31,8 +31,7 @@
:min="0"
:max="100"
:show-tooltip="false"
- >
- </el-slider>
+ ></el-slider>
</div>
<el-input-number
v-model="alarmConf.min_video_len"
@@ -40,8 +39,7 @@
:min="0"
:max="100"
size="mini"
- ></el-input-number>
- s
+ ></el-input-number> s
</div>
</div>
<div class="min-dur">
@@ -55,8 +53,7 @@
:min="0"
:max="100"
:show-tooltip="false"
- >
- </el-slider>
+ ></el-slider>
</div>
<el-input-number
v-model="alarmConf.max_video_len"
@@ -64,8 +61,7 @@
:min="0"
:max="100"
size="mini"
- ></el-input-number>
- s
+ ></el-input-number> s
</div>
</div>
@@ -82,34 +78,33 @@
>
<div class="left-part">
<span class="icon iconfont"></span>
- <span class="name"> {{ item.name }}</span>
+ <span class="name">{{ item.name }}</span>
</div>
<div class="btns">
<span class="icon iconfont"></span>
<span class="icon iconfont"></span>
</div>
</div>
- <div class="add-group">
- <el-upload
- class="upload-demo"
- drag
- action="https://jsonplaceholder.typicode.com/posts/"
- multiple
- v-show="showUpload"
- >
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">
- 浜嬩欢澹伴煶鏂囦欢鎷栧埌姝ゅ锛屾垨<em>鐐瑰嚮涓婁紶</em> <br />
- 浠呮敮鎸乵p3/wma绛夋牸寮�
+ <div class="add-group">
+ <el-upload
+ class="upload-demo"
+ drag
+ action="https://jsonplaceholder.typicode.com/posts/"
+ multiple
+ v-show="showUpload"
+ >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 浜嬩欢澹伴煶鏂囦欢鎷栧埌姝ゅ锛屾垨
+ <em>鐐瑰嚮涓婁紶</em>
+ <br />浠呮敮鎸乵p3/wma绛夋牸寮�
+ </div>
+ </el-upload>
+ <div v-show="!showUpload"></div>
+ <div class="add-btn">
+ <span class="icon iconfont" @click="showUpload=!showUpload"></span>
</div>
- </el-upload>
- <div v-show="!showUpload"
-></div>
- <div class="add-btn">
- <span class="icon iconfont" @click="showUpload=!showUpload"></span>
</div>
-
- </div>
</div>
</div>
</div>
@@ -118,11 +113,7 @@
<script>
import { saveAlarmConfig } from "@/api/system";
-
-import cloudNode from "../components/CloudNode";
-import ipInput from "@/components/subComponents/IPInput";
import { isIPv4 } from "@/scripts/validate";
-import switchBar from "../components/switchBar";
export default {
data() {
@@ -155,7 +146,7 @@
isOpenWifi: false,
inWireDetail: false,
wireForm: {},
- showUpload:false,
+ showUpload: false,
alarmConf: {
min_video_len: 0,
max_video_len: 0,
@@ -191,19 +182,14 @@
value: "",
};
},
- components: {
- cloudNode,
- ipInput,
- switchBar,
- },
- mounted() {},
- beforeDestroy() {},
+ mounted() { },
+ beforeDestroy() { },
props: ["barName"],
methods: {
openRight(typ) {
this.activePage = typ;
},
- wifiControl(val) {},
+ wifiControl(val) { },
checkWifi() {
this.inWifiDetail = true;
},
@@ -348,13 +334,12 @@
.bar:hover {
background-color: rgba(233, 233, 233, 1);
}
- .add-group{
- margin-top: 170px;
- height: 235px;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-
+ .add-group {
+ margin-top: 170px;
+ height: 235px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
}
.upload-demo {
.el-upload-dragger {
diff --git a/src/pages/systemSettings/views/keyboardLanguage.vue b/src/pages/systemSettings/views/keyboardLanguage.vue
index 33cdca9..bbde4e1 100644
--- a/src/pages/systemSettings/views/keyboardLanguage.vue
+++ b/src/pages/systemSettings/views/keyboardLanguage.vue
@@ -46,10 +46,7 @@
addESNode,
getEsClusterInfo,
} from "@/api/clusterManage";
-import cloudNode from "../components/CloudNode";
-import ipInput from "@/components/subComponents/IPInput";
import { isIPv4 } from "@/scripts/validate";
-import switchBar from "../components/switchBar";
export default {
data() {
@@ -87,11 +84,11 @@
{ name: "鑻辨枃" },
{ name: "绻佷綋涓枃锛堥娓級" },
],
- keyboardList: [
+ keyboardList: [
{ name: "Hanyu Pinyin(algtr)" },
{ name: "ENG" },
],
-
+
wireFormRules: {},
activePage: "lang",
rules: {
@@ -116,19 +113,14 @@
value: "",
};
},
- components: {
- cloudNode,
- ipInput,
- switchBar,
- },
- mounted() {},
- beforeDestroy() {},
+ mounted() { },
+ beforeDestroy() { },
props: ["barName"],
methods: {
openRight(typ) {
this.activePage = typ;
},
- wifiControl(val) {},
+ wifiControl(val) { },
checkWifi() {
this.inWifiDetail = true;
},
@@ -156,7 +148,8 @@
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
- padding: 10px; border-right: 5px solid #f8f8f8;
+ padding: 10px;
+ border-right: 5px solid #f8f8f8;
// background-color: lavender;
.menu-item {
diff --git a/vue.config.js b/vue.config.js
index db0d789..54f38e8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,7 +41,7 @@
})
// const serverUrl = "http://58.118.225.79:41243" // 缇婁簲
-const serverUrl = "http://192.168.20.106:7009"
+const serverUrl = "http://192.168.20.189:7003"
module.exports = {
pages,
--
Gitblit v1.8.0