diff --git a/.env b/.env
index ca71ee8..b4b77ac 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=https://www.chuangzhikj.com/saas-ics
-VUE_APP_MODEL_BASE_URL=https://www.chuangzhikj.com/saas-ics
\ No newline at end of file
+VUE_APP_API_BASE_URL=https://www.aiparkmeet.com/sass-ics/
+VUE_APP_MODEL_BASE_URL=https://www.aiparkmeet.com/sass-ics/
\ No newline at end of file
diff --git a/.env.preview b/.env.preview
index 5154fc4..b4b77ac 100644
--- a/.env.preview
+++ b/.env.preview
@@ -1,4 +1,4 @@
NODE_ENV=production
-VUE_APP_PREVIEW=true
-VUE_APP_API_BASE_URL=https://www.chuangzhikj.com/saas-ics
-VUE_APP_MODEL_BASE_URL=https://www.chuangzhikj.com/saas-ics
\ No newline at end of file
+VUE_APP_PREVIEW=false
+VUE_APP_API_BASE_URL=https://www.aiparkmeet.com/sass-ics/
+VUE_APP_MODEL_BASE_URL=https://www.aiparkmeet.com/sass-ics/
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 076044c..920e33e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,8 +4,8 @@
-
-
-
Pro
+
人工智能产业园管理系统
diff --git a/src/api/admin/wisdomDevice.js b/src/api/admin/wisdomDevice.js
deleted file mode 100644
index 9173f28..0000000
--- a/src/api/admin/wisdomDevice.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { axios } from '@/utils/request'
-
-const api = {
- wisdomDevice: '/wisdom/wisdomDevice'
-}
-
-export function getWisdomDeviceList (parameter) {
- return axios({
- url: api.wisdomDevice + '/list',
- method: 'get',
- params: parameter
- })
-}
-
-export function saveWisdomDevice (parameter) {
- return axios({
- url: api.wisdomDevice + (parameter.id > 0 ? '/update' : '/save'),
- method: 'post',
- data: parameter,
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
- })
-}
-
-export function delWisdomDevice (parameter) {
- return axios({
- url: api.wisdomDevice + '/remove',
- method: 'post',
- params: parameter
- })
-}
-
-export const wisdomDeviceExport = api.wisdomDevice + '/export'
diff --git a/src/api/admin/wisdomPanel.js b/src/api/admin/wisdomPanel.js
deleted file mode 100644
index 5a76115..0000000
--- a/src/api/admin/wisdomPanel.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { axios } from '@/utils/request'
-
-const api = {
- wisdomPanel: '/wisdomPanel'
-}
-
-export function getWisdomPanelList (parameter) {
- return axios({
- url: api.wisdomPanel + '/list',
- method: 'get',
- params: parameter
- })
-}
-
-export function saveWisdomPanel (parameter) {
- return axios({
- url: api.wisdomPanel + (parameter.id > 0 ? '/update' : '/save'),
- method: 'post',
- data: parameter,
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
- })
-}
-
-export function delWisdomPanel (parameter) {
- return axios({
- url: api.wisdomPanel + '/remove',
- method: 'post',
- params: parameter
- })
-}
-
-export const wisdomPanelExport = api.wisdomPanel + '/export'
diff --git a/src/api/admin/wisdomPanelEquipment.js b/src/api/admin/wisdomPanelEquipment.js
deleted file mode 100644
index a7b5ce5..0000000
--- a/src/api/admin/wisdomPanelEquipment.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { axios } from '@/utils/request'
-
-const api = {
- wisdomPanelEquipment: '/admin/wisdomPanelEquipment'
-}
-
-export function getWisdomPanelEquipmentList (parameter) {
- return axios({
- url: api.wisdomPanelEquipment + '/list',
- method: 'get',
- params: parameter
- })
-}
-
-export function saveWisdomPanelEquipment (parameter) {
- return axios({
- url: api.wisdomPanelEquipment + (parameter.id > 0 ? '/update' : '/save'),
- method: 'post',
- data: parameter,
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
- })
-}
-
-export function delWisdomPanelEquipment (parameter) {
- return axios({
- url: api.wisdomPanelEquipment + '/remove',
- method: 'post',
- params: parameter
- })
-}
-
-export const wisdomPanelEquipmentExport = api.wisdomPanelEquipment + '/export'
diff --git a/src/api/admin/wisdomRoom.js b/src/api/admin/wisdomRoom.js
deleted file mode 100644
index be1eefe..0000000
--- a/src/api/admin/wisdomRoom.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { axios } from '@/utils/request'
-
-const api = {
- wisdomRoom: '/admin/wisdomRoom'
-}
-
-export function getWisdomRoomList (parameter) {
- return axios({
- url: api.wisdomRoom + '/list',
- method: 'get',
- params: parameter
- })
-}
-
-export function selectStaff (parameter) {
- return axios({
- url: api.wisdomRoom + '/selectStaff',
- method: 'get',
- params: parameter
- })
-}
-
-export function saveWisdomRoom (parameter) {
- return axios({
- url: api.wisdomRoom + (parameter.id > 0 ? '/update' : '/save'),
- method: 'post',
- data: parameter,
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
- })
-}
-
-export function delWisdomRoom (parameter) {
- return axios({
- url: api.wisdomRoom + '/remove',
- method: 'post',
- params: parameter
- })
-}
-
-export const wisdomRoomExport = api.wisdomRoom + '/export'
diff --git a/src/api/admin/wisdomStaff.js b/src/api/admin/wisdomStaff.js
deleted file mode 100644
index 5a55eeb..0000000
--- a/src/api/admin/wisdomStaff.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { axios } from '@/utils/request'
-
-const api = {
- wisdomStaff: '/admin/wisdomStaff'
-}
-
-export function getWisdomStaffList (parameter) {
- return axios({
- url: api.wisdomStaff + '/list',
- method: 'get',
- params: parameter
- })
-}
-
-export function saveWisdomStaff (parameter) {
- return axios({
- url: api.wisdomStaff + (parameter.id > 0 ? '/update' : '/save'),
- method: 'post',
- data: parameter,
- headers: {
- 'Content-Type': 'application/json;charset=UTF-8'
- }
- })
-}
-
-export function delWisdomStaff (parameter) {
- return axios({
- url: api.wisdomStaff + '/remove',
- method: 'post',
- params: parameter
- })
-}
-
-export const wisdomStaffExport = api.wisdomStaff + '/export'
diff --git a/src/assets/bg-logo.jpg b/src/assets/bg-logo.jpg
new file mode 100644
index 0000000..1ea76a0
Binary files /dev/null and b/src/assets/bg-logo.jpg differ
diff --git a/src/config/defaultSettings.js b/src/config/defaultSettings.js
index e71c41f..4fcafb9 100644
--- a/src/config/defaultSettings.js
+++ b/src/config/defaultSettings.js
@@ -23,7 +23,7 @@ export default {
menu: {
locale: true
},
- title: '园区管理系统',
+ title: '人工智能产业园',
pwa: false,
iconfontUrl: '',
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
index b05c927..3502ac6 100644
--- a/src/layouts/BasicLayout.vue
+++ b/src/layouts/BasicLayout.vue
@@ -12,7 +12,7 @@
-
+
{{ title }}
diff --git a/src/layouts/UserLayout.vue b/src/layouts/UserLayout.vue
index 33a1aeb..77f8571 100644
--- a/src/layouts/UserLayout.vue
+++ b/src/layouts/UserLayout.vue
@@ -4,8 +4,8 @@
diff --git a/src/utils/request.js b/src/utils/request.js
index 809e96e..66f05af 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,11 +10,13 @@ const baseURL = process.env.VUE_APP_API_BASE_URL
// 创建 axios 实例
const request = axios.create({
baseURL: baseURL, // api base_url
- timeout: 15000 // 请求超时时间
+ timeout: 15000, // 请求超时时间
+ withCredentials: true // 允许跨域携带cookie
})
export const pureAxios = axios.create({
baseURL: baseURL, // api base_url
- timeout: 10000 // 请求超时时间
+ timeout: 10000, // 请求超时时间
+ withCredentials: true // 允许跨域携带cookie
})
const err = (error) => {
diff --git a/src/views/admin/CustomerEdit.vue b/src/views/admin/CustomerEdit.vue
index 972fc54..566544b 100644
--- a/src/views/admin/CustomerEdit.vue
+++ b/src/views/admin/CustomerEdit.vue
@@ -1015,9 +1015,9 @@ export default {
if (!isJpgOrPng) {
this.$message.error('You can only upload JPG file!')
}
- const isLt2M = file.size / 1024 / 1024 < 2
+ const isLt2M = file.size / 1024 / 1024 < 10
if (!isLt2M) {
- this.$message.error('图片必须小于 2MB!')
+ this.$message.error('图片必须小于 10MB!')
}
return isJpgOrPng && isLt2M
},
diff --git a/src/views/admin/WisdomDeviceList.vue b/src/views/admin/WisdomDeviceList.vue
deleted file mode 100644
index 06cc4d3..0000000
--- a/src/views/admin/WisdomDeviceList.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- queryParam = {}">重置
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
-
-
-
-
-
-
diff --git a/src/views/admin/WisdomPanelEquipmentList.vue b/src/views/admin/WisdomPanelEquipmentList.vue
deleted file mode 100644
index fc6f6da..0000000
--- a/src/views/admin/WisdomPanelEquipmentList.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- queryParam = {}">重置
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
-
-
-
-
-
-
diff --git a/src/views/admin/WisdomPanelList.vue b/src/views/admin/WisdomPanelList.vue
deleted file mode 100644
index 3210f3a..0000000
--- a/src/views/admin/WisdomPanelList.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- queryParam = {}">重置
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
-
-
-
-
-
-
diff --git a/src/views/admin/WisdomRoomList.vue b/src/views/admin/WisdomRoomList.vue
deleted file mode 100644
index b6e44db..0000000
--- a/src/views/admin/WisdomRoomList.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- queryParam = {}">重置
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
-
-
-
-
-
-
diff --git a/src/views/admin/WisdomStaffList.vue b/src/views/admin/WisdomStaffList.vue
deleted file mode 100644
index 21e332b..0000000
--- a/src/views/admin/WisdomStaffList.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- queryParam = {}">重置
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
-
-
-
-
-
-
diff --git a/src/views/admin/modules/CustomerContactsModal.vue b/src/views/admin/modules/CustomerContactsModal.vue
index 18210f1..e753ca7 100644
--- a/src/views/admin/modules/CustomerContactsModal.vue
+++ b/src/views/admin/modules/CustomerContactsModal.vue
@@ -28,7 +28,6 @@
-
+
diff --git a/src/views/admin/modules/WisdomDeviceModal.vue b/src/views/admin/modules/WisdomDeviceModal.vue
deleted file mode 100644
index f13e9a7..0000000
--- a/src/views/admin/modules/WisdomDeviceModal.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- {{ item.value }}
-
-
-
-
-
-
-
-
-
-
- {{ item.meetingName }}
-
-
-
-
-
-
-
-
diff --git a/src/views/admin/modules/WisdomPanelEquipmentModal.vue b/src/views/admin/modules/WisdomPanelEquipmentModal.vue
deleted file mode 100644
index d0d74eb..0000000
--- a/src/views/admin/modules/WisdomPanelEquipmentModal.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/admin/modules/WisdomPanelModal.vue b/src/views/admin/modules/WisdomPanelModal.vue
deleted file mode 100644
index 047e61e..0000000
--- a/src/views/admin/modules/WisdomPanelModal.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.meetingName }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/admin/modules/WisdomRoomModal.vue b/src/views/admin/modules/WisdomRoomModal.vue
deleted file mode 100644
index 17dd8ad..0000000
--- a/src/views/admin/modules/WisdomRoomModal.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.username
- }}--{{ item.mobile }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/admin/modules/WisdomStaffModal.vue b/src/views/admin/modules/WisdomStaffModal.vue
deleted file mode 100644
index f1db481..0000000
--- a/src/views/admin/modules/WisdomStaffModal.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 25593ea..4dff212 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,198 +1,201 @@
-
-
-
-
-
- 总已收款 ¥{{ receive | NumFormat }}
- 总未收款 ¥{{ unReceive | NumFormat }}
-
-
-
-
-
-
-
- 已收款 ¥{{ billManagementData.receive | NumFormat }}
- 未收款 ¥{{ billManagementData.unReceive | NumFormat }}
-
-
-
-
-
-
-
- 已收款 ¥{{ billRentData.receive | NumFormat }}
- 未收款 ¥{{ billRentData.unReceive | NumFormat }}
-
-
-
-
-
-
-
- 已收款 ¥{{ billPwData.receive | NumFormat }}
- 未收款 ¥{{ billPwData.unReceive | NumFormat }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 欢迎进入人工智能产业园管理系统
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 操作一
-
-
- 操作二
-
-
-
-
-
-
-
- 搜索用户数
-
-
-
-
-
-
-
-
-
-
-
-
-
- 人均搜索次数
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ text }}%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 操作一
-
-
- 操作二
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 销售额
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 4f9744a..0259bab 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -74,7 +74,7 @@
自动登录
- 注册账户
+
diff --git a/vue.config.js b/vue.config.js
index 28e8c00..d521952 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,16 +21,27 @@ const assetsCDN = {
// main.js里引入了对应的less以使 webpack-theme-color-replacer工作
// https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.css
css: [],
+ // js: [
+ // '/js/vue.min.js',
+ // '/js/axios.min.js',
+ // '/js/vue-router.min.js',
+ // '/js/vuex.min.js',
+ // '/js/moment.min.js',
+ // '/js/zh-cn.min.js',
+ // '/js/g2.min.js',
+ // '/js/data-set.min.js',
+ // '/js/antd-with-locales.min.js'
+ // ]
js: [
- '/js/vue.min.js',
- '/js/axios.min.js',
- '/js/vue-router.min.js',
- '/js/vuex.min.js',
- '/js/moment.min.js',
- '/js/zh-cn.min.js',
- '/js/g2.min.js',
- '/js/data-set.min.js',
- '/js/antd-with-locales.min.js'
+ '/xiongan-meeting/js/vue.min.js',
+ '/xiongan-meeting/js/axios.min.js',
+ '/xiongan-meeting/js/vue-router.min.js',
+ '/xiongan-meeting/js/vuex.min.js',
+ '/xiongan-meeting/js/moment.min.js',
+ '/xiongan-meeting/js/zh-cn.min.js',
+ '/xiongan-meeting/js/g2.min.js',
+ '/xiongan-meeting/js/data-set.min.js',
+ '/xiongan-meeting/js/antd-with-locales.min.js'
]
}
// webpack build externals
@@ -49,6 +60,7 @@ const prodExternals = {
// vue.config.js
const vueConfig = {
+ publicPath: process.env.NODE_ENV === 'production' ? '/xiongan-meeting/' : '/',
configureWebpack: {
externals: prodExternals,
plugins: [
@@ -108,8 +120,8 @@ const vueConfig = {
port: 8000,
proxy: {
'/api': {
- target: 'http://localhost:9227',
- // target: 'https://www.chuangzhikj.com/saas-ics',
+ target: 'http://localhost:9227/',
+ // target: 'https://www.aiparkmeet.com/sass-ics/',
pathRewrite: { '^/api': '' },
ws: false,
changeOrigin: true