Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
multiSystem
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yulun Yao
multiSystem
Commits
40591865
Commit
40591865
authored
Jan 12, 2021
by
程卓
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.omniview.pro/fangdi/housemanage/web/majorproject
into dev
parents
dc621e02
0e440a4b
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
7 additions
and
6 deletions
+7
-6
Jenkinsfile-yangpu
Jenkinsfile-yangpu
+1
-1
package.json
package.json
+1
-0
feiju.png
src/assets/icon/feiju.png
+0
-0
juwei-icon.png
src/assets/icon/juwei-icon.png
+0
-0
sect-icon.png
src/assets/icon/sect-icon.png
+0
-0
wuqi-icon.png
src/assets/icon/wuqi-icon.png
+0
-0
huangpuRoutes.json
src/router/huangpuRoutes.json
+1
-1
xuhuiRoutes.json
src/router/xuhuiRoutes.json
+1
-1
yangpuRoutes.json
src/router/yangpuRoutes.json
+1
-1
api.js
src/server/api.js
+2
-2
No files found.
Jenkinsfile-yangpu
View file @
40591865
pipeline {
pipeline {
agent {
node {
label 'nodejs'
...
...
package.json
View file @
40591865
...
...
@@ -25,6 +25,7 @@
"
axios
"
:
"^0.19.2"
,
"
babel-polyfill
"
:
"^6.26.0"
,
"
crypto-js
"
:
"^4.0.0"
,
"
echarts
"
:
"^4.9.0"
,
"
js-cookie
"
:
"^2.2.1"
,
"
js-md5
"
:
"^0.7.3"
,
"
qiankun
"
:
"^1.4.6"
,
...
...
src/assets/icon/feiju.png
deleted
100644 → 0
View file @
dc621e02
5.28 KB
src/assets/icon/juwei-icon.png
deleted
100644 → 0
View file @
dc621e02
2.56 KB
src/assets/icon/sect-icon.png
deleted
100644 → 0
View file @
dc621e02
2.18 KB
src/assets/icon/wuqi-icon.png
deleted
100644 → 0
View file @
dc621e02
2.11 KB
src/router/huangpuRoutes.json
View file @
40591865
...
...
@@ -2,7 +2,7 @@
"Layout"
:
[
{
"path"
:
"/hp_order/month"
,
"name"
:
"month"
,
"meta"
:
{
"title"
:
"
房办月查
"
,
"menuIcon"
:
"profile"
,
"menuPath"
:
false
,
"hideInBread"
:
false
},
"meta"
:
{
"title"
:
"
检查单
"
,
"menuIcon"
:
"profile"
,
"menuPath"
:
false
,
"hideInBread"
:
false
},
"children"
:[
{
"path"
:
"/hp_order/month/monthList"
,
"name"
:
"month"
,
...
...
src/router/xuhuiRoutes.json
View file @
40591865
...
...
@@ -18,7 +18,7 @@
},
{
"path"
:
"/order/month"
,
"name"
:
"month"
,
"meta"
:
{
"title"
:
"
房办月查
"
,
"menuIcon"
:
"profile"
,
"menuPath"
:
false
,
"hideInBread"
:
false
},
"meta"
:
{
"title"
:
"
检查单
"
,
"menuIcon"
:
"profile"
,
"menuPath"
:
false
,
"hideInBread"
:
false
},
"children"
:[
{
"path"
:
"/order/month/monthList"
,
"name"
:
"month"
,
...
...
src/router/yangpuRoutes.json
View file @
40591865
...
...
@@ -2,7 +2,7 @@
"Layout"
:
[
{
"path"
:
"/document/month"
,
"name"
:
"month"
,
"meta"
:
{
"title"
:
"
房办月查
"
,
"menuIcon"
:
"profile"
,
"menuPath"
:
false
,
"hideInBread"
:
false
},
"meta"
:
{
"title"
:
"
检查单
"
,
"menuIcon"
:
"profile"
,
"menuPath"
:
false
,
"hideInBread"
:
false
},
"children"
:[
{
"path"
:
"/document/month/monthList"
,
"name"
:
"month"
,
...
...
src/server/api.js
View file @
40591865
...
...
@@ -63,8 +63,8 @@ default: // 默认环境下(开发环境)
// BASE_URL = 'http://31.0.161.39/apiv2'
// BASE_URL = 'http://211.136.105.193/apiv2'
// BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
BASE_URL
=
'http://pudong.hm.omniview.pro/api/v2'
//
BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
//
BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
BASE_URL
=
'http://yangpu-hm.omniview.pro/api/v2'
// MOCK_URL = 'https://yapi.omniview.pro/mock/278'
break
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment