This repository has been archived by the owner on May 4, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 428
新增location的管理页面 #20
Open
xuweijiaFrank
wants to merge
6
commits into
openatx:master
Choose a base branch
from
xuweijiaFrank:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
新增location的管理页面 #20
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
新增设备所在地管理, 支持增删改查 数据库添加了1张表 loaction 2. 首页调整所属部门列,支持从设备所在地下拉选择 3. 升级了element版本,从2.4.11~~2.8.2 修复BUG 原先<el-button disabled :loading="true" size="mini" type="primary">释放中</span> 改为<el-button disabled :loading="true" size="mini" type="primary">释放中</el-button>
新增设备所在地管理, 支持增删改查 数据库添加了1张表 loaction 2. device中新增了locationProperties字段,自动去解析 (本来想添加至source里面,但是发现是个dict型,不太好取,所以重新开了个字段) 3. 升级了element版本,从2.4.11~~2.8.2 修复BUG 原先<el-button disabled :loading="true" size="mini" type="primary">释放中</span> 改为<el-button disabled :loading="true" size="mini" type="primary">释放中</el-button>
大佬element-ui 和vue都升级下吧?我这边试了感觉没啥问题,之前版本有点老 |
codeskyblue
reviewed
Jun 20, 2019
codeskyblue
reviewed
Jun 20, 2019
codeskyblue
reviewed
Jun 20, 2019
codeskyblue
reviewed
Jun 20, 2019
codeskyblue
suggested changes
Jun 20, 2019
2. excludeItems -> excludes 3. JS循环改为foreach
大佬都修改好了,麻烦在瞅瞅 |
我看了下代码,大概理解了下,你看下我描述的准确不。 增加一个location表。(这里要改成 locations, 表都是复数) |
IP+ 网络号, 这个网络号是通过子网掩码计算的出的吧?看了server端貌似没有被推送过来?是不是要改provider这块?
|
Thanks, I'll review it later. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
需求:
由于公司设置到多部门,且会有多个provider,需要知道资产在哪里(不光是IP),且希望自动返显出来(最好是中文名)
本次修改内容:
后台管理中,添加tab选项进行切换,管理员管理 和 设备-所在地管理
设备-所在地管理 支持增删改查,主要是为了ip能对应个名字出来
数据库添加了1张表 location
首页调整所属部门列, 支持返显设备-所在地的中文名 或者 ip
database的save方法,新增了个过滤用的入参
备注:
返回的device中,新增了locationProperties, 本来想放在source里面的,但是看作者是做隐藏的,故没有去动