From c62c4a975533e6a69ae43bc0aaab1da431eaf928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Tue, 25 Jan 2022 10:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=90=E5=B9=B3=E5=8F=B0ip?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dataList/research.js | 42 +++++++ src/views/dataList/research/index.vue | 156 +++++++++++++++++++++++++ src/views/subPlatform/tenant/index.vue | 36 +++++- vue.config.js | 3 +- 4 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 src/api/dataList/research.js create mode 100644 src/views/dataList/research/index.vue diff --git a/src/api/dataList/research.js b/src/api/dataList/research.js new file mode 100644 index 0000000..90e3f85 --- /dev/null +++ b/src/api/dataList/research.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +// 科研机构信息 +export function researchList(data) { + return request({ + url: '/admin/v1/manage/research', + method: 'post', + data, + }) +} +// 科研机构筛选信息 +export function researchSelect(data) { + return request({ + url: '/admin/v1/manage/research/select', + method: 'post', + data, + }) +} +// 科研机构信息添加 +export function researchAdd(data) { + return request({ + url: '/admin/v1/manage/research/add', + method: 'post', + data, + }) +} +// 科研机构信息修改 +export function researchEdit(data) { + return request({ + url: '/admin/v1/manage/research/edit', + method: 'post', + data, + }) +} +// 科研机构详细信息 +export function researchDetail(data) { + return request({ + url: '/admin/v1/manage/research/detail', + method: 'post', + data, + }) +} diff --git a/src/views/dataList/research/index.vue b/src/views/dataList/research/index.vue new file mode 100644 index 0000000..a98c47a --- /dev/null +++ b/src/views/dataList/research/index.vue @@ -0,0 +1,156 @@ + + + \ No newline at end of file diff --git a/src/views/subPlatform/tenant/index.vue b/src/views/subPlatform/tenant/index.vue index 96e29ae..a96375a 100644 --- a/src/views/subPlatform/tenant/index.vue +++ b/src/views/subPlatform/tenant/index.vue @@ -56,6 +56,7 @@ prop="contact_mobile" align="center" /> + @@ -125,8 +126,19 @@ + + + - + @@ -251,6 +263,19 @@ import { areaList } from "@/api/config"; import { resetUserPwd } from "@/api/system/user"; export default { data() { + var validateIp = (rule, value, callback) => { + if (value === "" || typeof value === "undefined" || value == null) { + callback(new Error("请输入正确的IP地址")); + } else { + const reg = + /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/; + if (!reg.test(value) && value !== "") { + callback(new Error("请输入正确的IP地址")); + } else { + callback(); + } + } + }; return { loading: true, showSearch: true, @@ -292,6 +317,14 @@ export default { name: [ { required: true, message: "子系统名称不能为空", trigger: "blur" }, ], + ip: [ + { + required: true, + message: "请输入正确的IP地址", + validator: validateIp, + trigger: "blur", + }, + ], domain: [{ required: true, message: "域名不能为空", trigger: "blur" }], province: [ { @@ -351,6 +384,7 @@ export default { this.form = { id: undefined, name: undefined, + ip: undefined, domain: undefined, province: "", city: "", diff --git a/vue.config.js b/vue.config.js index 59d318a..0a84eec 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,7 +35,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.0.142:8000`, + // target: `http://192.168.0.142:8000`, + target: `http://hf.zky.cn:8000`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '',