diff --git a/src/api/system/ipWhitelist.js b/src/api/system/ipWhitelist.js
new file mode 100644
index 00000000..7717928d
--- /dev/null
+++ b/src/api/system/ipWhitelist.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 查询【请填写功能名称】列表
+export function listWhitelist(query) {
+ return request({
+ url: '/system/whitelist/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询【请填写功能名称】详细
+export function getWhitelist(id) {
+ return request({
+ url: '/system/whitelist/' + id,
+ method: 'get'
+ })
+}
+
+// 新增【请填写功能名称】
+export function addWhitelist(data) {
+ return request({
+ url: '/system/whitelist/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改【请填写功能名称】
+export function updateWhitelist(data) {
+ return request({
+ url: '/system/whitelist/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 删除【请填写功能名称】
+export function delWhitelist(id) {
+ return request({
+ url: '/system/whitelist/' + id,
+ method: 'post'
+ })
+}
+
+export function updateSysIpWhitelistStatus(id,status) {
+ const data = {
+ id,
+ status
+ }
+ return request({
+ url: '/system/whitelist/updateSysIpWhitelistStatus',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/components/bonus/IpInput/index.vue b/src/components/bonus/IpInput/index.vue
new file mode 100644
index 00000000..0d889f7d
--- /dev/null
+++ b/src/components/bonus/IpInput/index.vue
@@ -0,0 +1,187 @@
+
+
+
+
checkFormat(e, 'a')"
+ placeholder="0-255"
+ :maxlength="3"
+ v-model="ip.a"
+ size="small"
+ @blur="blur"
+ ref="ipa"
+ @focus="focus"
+ @keydown.enter.native="handleEnter(0)"
+ :disabled="disabled"
+ :validate-event="true"
+ >
+
•
+
checkFormat(e, 'b')"
+ placeholder="0-255"
+ :maxlength="3"
+ v-model="ip.b"
+ size="small"
+ @blur="blur"
+ ref="ipb"
+ @focus="focus"
+ @keydown.enter.native="handleEnter(1)"
+ :disabled="disabled"
+ :validate-event="true"
+ >
+
•
+
checkFormat(e, 'c')"
+ placeholder="0-255"
+ :maxlength="3"
+ v-model="ip.c"
+ size="small"
+ @blur="blur"
+ ref="ipc"
+ @focus="focus"
+ @keydown.enter.native="handleEnter(2)"
+ :disabled="disabled"
+ :validate-event="true"
+ >
+
•
+
checkFormat(e, 'd')"
+ placeholder="0-255"
+ :maxlength="3"
+ v-model="ip.d"
+ style="margin-right: 0"
+ size="small"
+ @blur="blur"
+ ref="ipd"
+ @focus="focus"
+ :disabled="disabled"
+ :validate-event="true"
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/src/utils/request.js b/src/utils/request.js
index eef9240a..c4b397e5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -9,7 +9,7 @@ import { saveAs } from 'file-saver'
import { encryptCBC, decryptCBC } from '@/utils/aescbc'
import { decryptWithSM4, encryptWithSM4, hashWithSM3AndSalt } from '@/utils/sm'
const systemConfig = {
- requestConfig: { encryptRequest: true, checkIntegrity: true, encryptResponse: true }
+ requestConfig: { encryptRequest: false, checkIntegrity: false, encryptResponse: false }
};
let downloadLoadingInstance
diff --git a/src/views/system/ipWhitelist/index.vue b/src/views/system/ipWhitelist/index.vue
new file mode 100644
index 00000000..cb876cd3
--- /dev/null
+++ b/src/views/system/ipWhitelist/index.vue
@@ -0,0 +1,501 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.ipAddress?scope.row.ipAddress:scope.row.ipRangeStart+" - " + scope.row.ipRangeEnd}}
+
+
+
+
+ {{!scope.row.accessStartTime?"不限时间":parseTime(scope.row.accessStartTime,'{h}:{i}:{s}')+" - " + parseTime(scope.row.accessEndTime,'{h}:{i}:{s}')}}
+
+
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 单IP地址
+ IP地址段
+
+
+
+
+
+
+
+
+
+
+
+
+ —
+
+
+
+
+
+
+
+
+
+
+ 不限时间
+ 限制时间
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/lockUser/index.vue b/src/views/system/lockUser/index.vue
new file mode 100644
index 00000000..762e8b79
--- /dev/null
+++ b/src/views/system/lockUser/index.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 240c1664..666885e9 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -113,8 +113,7 @@
:options="menuOptions"
:normalizer="normalizer"
:show-count="true"
- :searchable="false"
- :disable-branch-nodes="true"
+ :searchable="true"
placeholder="选择上级菜单"
/>