From 5cbdd24aed653c1c36ad370f9dcc29155ce92bff Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期六, 01 八月 2020 18:12:45 +0800
Subject: [PATCH] fix: login app file name
---
src/pages/settings/components/BasicSetting.vue | 316 ++++++----------------------------------------------
1 files changed, 40 insertions(+), 276 deletions(-)
diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index 5806be8..255e35d 100644
--- a/src/pages/settings/components/BasicSetting.vue
+++ b/src/pages/settings/components/BasicSetting.vue
@@ -5,6 +5,7 @@
v-model="activeName"
v-loading="loading"
:element-loading-text="loadingText"
+ type="card"
>
<!-- 鏈満淇℃伅 -->
<el-tab-pane label="鏈満淇℃伅" name="first">
@@ -158,7 +159,7 @@
</el-menu-item-group>
</el-submenu>
<!-- 瀵瑰鏈嶅姟IP 鏀瑰悕涓哄閮ㄧ綉缁�(鏂皌ab)-->
-
+
<!-- 鏂囦欢闊宠棰� -->
<!-- <el-submenu index="4">
<template slot="title">
@@ -351,180 +352,39 @@
<cluster-management></cluster-management>
</el-tab-pane>
<el-tab-pane label="澶栭儴缃戠粶" name="fourth">
- <el-row :gutter="20">
- <el-col :span="10">
- <div>
- <div class="flex-box">
- <div style="line-height:32px;">
- <el-radio v-model="ipServer.diyOrLocalIP" :label="1">璁剧疆澶栭儴IP</el-radio>
- <el-radio v-model="ipServer.diyOrLocalIP" :label="0">閫夌敤鏈満IP</el-radio>
- </div>
- <div class="ml10" style="width:205px;">
- <ip-input :ip="ipServer.ip" @on-blur="ipServer.ip = arguments[0]"></ip-input>
- </div>
- </div>
- <div class="flex-box p5" >
- <span style="line-height:32px;">鍩熷悕</span>
- <div style="margin-left:14px;width:205px;">
- <el-input size="small" style v-model="ipServer.localhost"></el-input>
- </div>
- </div>
- <div class="flex-box" >
- <span style="line-height:32px;">鏈湴鏂囦欢绔彛</span>
- <div style="margin-left:14px;width:205px;">
- <el-input size="small" style v-model="ipServer.localFilePort"></el-input>
- </div>
- </div>
- </div>
- </el-col>
- <!-- <el-col :span="14">
- <div>
- <el-table
- :data="ipServer.fileTable"
- border
- fit
- style="width: 100%">
- <el-table-column
- type="index"
- label="搴忓彿"
- align="center"
- width="50">
- </el-table-column>
- <el-table-column
- prop="date"
- label="鍚嶇О"
- align="center"
- >
- </el-table-column>
- <el-table-column
- prop="name"
- label="ID"
- align="center"
- >
- </el-table-column>
- <el-table-column
- prop="name"
- label="IP"
- align="center"
- >
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍦ㄧ嚎鐘舵��"
- align="center"
- >
- </el-table-column>
- </el-table>
- </div>
- </el-col>-->
- </el-row>
- <div class="mt15 save-btn" style="width:1000px;float:left;">
+ <div class="flex-box">
+ <label>璁剧疆澶栭儴IP</label>
+ <div style="width:300px;">
+ <ip-input :ip="ipServer.ip" @on-blur="ipServer.ip = arguments[0]"></ip-input>
+ </div>
+ <el-checkbox label="閫夌敤鏈満IP" size="small" style="margin-left: 20px"></el-checkbox>
+ </div>
+ <div class="flex-box">
+ <label>鍩熷悕</label>
+ <el-input size="small" v-model="ipServer.localhost"></el-input>
+ </div>
+ <div class="flex-box">
+ <label>鏈湴鏂囦欢绔彛</label>
+ <el-input size="small" v-model="ipServer.localFilePort"></el-input>
+ </div>
+ <div class="mt15 save-btn" style="width:460px; margin-bottom:20px; float:left;">
<el-button type="primary" @click="submitResource" size="small">淇濆瓨</el-button>
</div>
+ <div>
+ <el-table :data="ipServer.fileTable" border fit style="width: 100%">
+ <el-table-column type="index" label="搴忓彿" align="center" width="50"></el-table-column>
+ <el-table-column prop="date" label="鍚嶇О" align="center"></el-table-column>
+ <el-table-column prop="name" label="ID" align="center"></el-table-column>
+ <el-table-column prop="name" label="IP" align="center"></el-table-column>
+ <el-table-column prop="name" label="鍦ㄧ嚎鐘舵��" align="center"></el-table-column>
+ </el-table>
+ </div>
</el-tab-pane>
- <el-tab-pane label="鏉冮檺绠＄悊" name="user" >
+ <el-tab-pane label="鏉冮檺绠＄悊" name="user">
<authority-management v-if="activeName === 'user'"></authority-management>
</el-tab-pane>
- <el-tab-pane label="骞挎挱璁剧疆" name="radio" >
+ <el-tab-pane label="骞挎挱璁剧疆" name="radio">
<radio-set v-if="activeName === 'radio'"></radio-set>
- </el-tab-pane>
- <!-- GB28181璁剧疆 -->
- <el-tab-pane label="GB28181璁剧疆" name="fifth">
- <el-form
- :model="gb28181"
- :rules="rules"
- label-width="140px"
- class="alarmSetting"
- ref="gb28181"
- >
- <!-- <el-form-item label="鍥介檯鏈嶅姟鍣↖P" prop="ServerIp">
- <ip-input :ip="gb28181.ServerIp" @on-blur="gb28181.ServerIp = arguments[0]"></ip-input>
- </el-form-item>-->
-
- <div style="text-align: left;margin-bottom: 22px;">
- <el-radio-group v-model="gb28181.idType">
- <el-radio :label="0">杈撳叆宸叉湁ID</el-radio>
- <el-radio :label="1">鐢熸垚鏂扮殑ID</el-radio>
- </el-radio-group>
- </div>
-
- <el-form-item label="鎵�鍦ㄥ湴">
- <el-select
- v-model="locationCity.province"
- @change="changeProvince"
- size="small"
- placeholder="璇烽�夋嫨鐪佷唤"
- >
- <el-option
- v-for="item in locationCity.provinceOptions"
- :key="item.id"
- :label="item.name"
- size="small"
- :value="item.id"
- ></el-option>
- </el-select>
- <el-select
- class="ml10 mr10"
- v-model="locationCity.city"
- :disabled="!locationCity.province"
- @change="changeCity"
- size="small"
- placeholder="璇烽�夋嫨鍩庡競"
- >
- <el-option
- v-for="item in locationCity.cityOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option>
- </el-select>
- <el-select
- v-model="locationCity.county"
- :disabled="!locationCity.city"
- size="small"
- placeholder="璇烽�夋嫨鍖哄幙"
- >
- <el-option
- v-for="item in locationCity.countyOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option>
- </el-select>
- <el-button
- type="text"
- style="position: absolute"
- v-show="gb28181.idType === 1"
- @click="newGBID"
- >鐢熸垚ID</el-button>
- </el-form-item>
-
- <!-- <el-form-item label="鍥介檯鏈嶅姟鍣ㄧ鍙�" prop="GbServerPort">
- <el-input v-model.number="gb28181.ServerPort" placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>-->
-
- <el-form-item label="鍥芥爣ID">
- <el-input v-model="gb28181.PublicId" placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
-
- <el-form-item label="鍥芥爣绔彛" prop="ServerPort">
- <el-input v-model.number="gb28181.GbServerPort" placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
-
- <el-form-item label="寮�鍚壌鏉�">
- <el-switch v-model="gb28181.IsAuth"></el-switch>
- </el-form-item>
-
- <el-form-item label="閴存潈瀵嗙爜" v-show="gb28181.IsAuth">
- <el-input v-model="gb28181.Password" placeholder="璇疯緭鍏�" size="small"></el-input>
- </el-form-item>
-
- <el-col :span="12">
- <el-form-item>
- <el-button type="primary" @click="submitGB28281" size="small">淇濆瓨</el-button>
- </el-form-item>
- </el-col>
- </el-form>
</el-tab-pane>
</el-tabs>
</div>
@@ -534,17 +394,13 @@
import {
getDevInfo,
getAlarmConfig,
- getGB28181Config,
saveDevInfo,
saveAlarmConfig,
- saveGB28181Config,
getClockInfo,
saveClockInfo,
testNTPserver,
getResourceConfig,
saveResourceConfig,
- getGb28181AreaList,
- newGb28181ID
} from "@/api/system";
import { isPort, isIPv4 } from "@/scripts/validate";
@@ -600,7 +456,6 @@
timestamp: 0,
sysinfo: {},
alarmConf: {},
- gb28181: {},
originNetConfig: {
ip: "",
gw: "",
@@ -714,7 +569,6 @@
this.initSysinfo();
// this.initAlarmConf();
this.initResourceConfig();
- this.initGB28181Conf();
this.initClockConf();
});
},
@@ -785,19 +639,6 @@
this.ipServer.ip = rsp.data.serviceIp
this.ipServer.localhost = rsp.data.domain
this.ipServer.localFilePort = rsp.data.filePort
- }
- })
- },
- initGB28181Conf() {
- getGB28181Config().then(rsp => {
- if (rsp && rsp.success) {
- this.gb28181 = rsp.data;
- this.gb28181.idType = 0;
- }
- });
- getGb28181AreaList().then(rsp => {
- if (rsp && rsp.success) {
- this.locationCity.provinceOptions = rsp.data;
}
})
},
@@ -981,23 +822,6 @@
}
})
},
- submitGB28281() {
- this.$refs["gb28181"].validate(valid => {
- if (valid) {
- saveGB28181Config(this.gb28181).then(rsp => {
- if (rsp && rsp.success) {
- this.$notify({
- type: "success",
- message: "GB28181璁剧疆淇濆瓨鎴愬姛"
- });
- }
- });
- } else {
- console.log("error submit!!");
- return false;
- }
- });
- },
onIpBlur(e, ip) {
console.log(e, ip);
},
@@ -1052,33 +876,6 @@
let re = /^(?=^.{3,255}$)(http(s)?:\/\/)?(www\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\d+)*(\/\w+\.\w+)*$/
return re.test(str)
},
- changeProvince() {
- let pid = this.locationCity.province;
- getGb28181AreaList({ parentId: pid }).then(rsp => {
- if (rsp && rsp.success) {
- this.locationCity.cityOptions = rsp.data;
- this.locationCity.city = this.locationCity.cityOptions[0].id;
- this.changeCity();
- }
- })
- },
- changeCity() {
- let pid = this.locationCity.city;
- getGb28181AreaList({ parentId: pid }).then(rsp => {
- if (rsp && rsp.success) {
- this.locationCity.countyOptions = rsp.data;
- this.locationCity.county = this.locationCity.countyOptions[0].id;
- }
- })
- },
- newGBID() {
- let cCode = this.locationCity.county + "";
- newGb28181ID({ code: cCode }).then(rsp => {
- if (rsp && rsp.success) {
- this.gb28181.PublicId = rsp.data;
- }
- })
- }
}
};
</script>
@@ -1088,7 +885,7 @@
height: 100%;
.el-form {
width: 1000px;
- margin-top: 30px;
+
// margin-left: -80px;
.el-form-item {
text-align: left;
@@ -1147,49 +944,6 @@
font-size: 14px;
font-weight: 600;
background-color: #e4e6ed;
- }
- #e-basic-setting {
- .el-tabs__header {
- border: 0px solid #dcdfe6;
- .el-tabs__item {
- padding: 5px 50px;
- height: 50px;
- font-family: PingFangSC-Regular;
- font-size: 14px;
- color: #222222;
- text-align: center;
- border: 0px solid transparent;
- }
- .el-tabs__item:nth-child(2) {
- padding-left: 50px;
- }
- .el-tabs__item:last-child {
- padding-right: 50px;
- }
- .el-tabs__item.is-active {
- color: #ff7733;
- font-weight: bold;
- // border-right-color: #fff;
- // border-left-color: #fff;
- }
- .el-tabs__item:not(.is-disabled):hover {
- color: #ff7733;
- }
- }
- .el-tabs__active-bar {
- background-color: #ff7733;
- }
- .xiangqin-label {
- text-align: left;
- width: 85px;
- font-size: 14px;
- line-height: 30px;
- }
- .xiangqing-info {
- text-align: left;
- font-size: 14px;
- line-height: 30px;
- }
}
#cut_min_duration {
@@ -1272,6 +1026,16 @@
}
</style>
<style lang="scss" scoped>
+.flex-box {
+ display: flex;
+ height: 50px;
+ label {
+ width: 120px;
+ }
+ .el-input {
+ width: 300px;
+ }
+}
.menu-css,
.el-menu {
border-right: none;
--
Gitblit v1.8.0