diff --git a/.env.development b/.env.development index 9ff868f..f3e5720 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = 工业园区工业上楼项目系统 ENV = 'development' # 工业园区工业上楼项目系统/开发环境 -VUE_APP_BASE_API = '' +VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/assets/fonts/AlibabaSans-Bold.otf b/src/assets/fonts/AlibabaSans-Bold.otf new file mode 100644 index 0000000..1029756 Binary files /dev/null and b/src/assets/fonts/AlibabaSans-Bold.otf differ diff --git a/src/assets/fonts/AlibabaSans-Medium.otf b/src/assets/fonts/AlibabaSans-Medium.otf new file mode 100644 index 0000000..71a2177 Binary files /dev/null and b/src/assets/fonts/AlibabaSans-Medium.otf differ diff --git a/src/assets/fonts/AlibabaSans-Regular.otf b/src/assets/fonts/AlibabaSans-Regular.otf new file mode 100644 index 0000000..317ebe9 Binary files /dev/null and b/src/assets/fonts/AlibabaSans-Regular.otf differ diff --git a/src/assets/fonts/DIN-Bold.otf b/src/assets/fonts/DIN-Bold.otf new file mode 100644 index 0000000..782e68e Binary files /dev/null and b/src/assets/fonts/DIN-Bold.otf differ diff --git a/src/assets/fonts/DIN-Light.otf b/src/assets/fonts/DIN-Light.otf new file mode 100644 index 0000000..349739e Binary files /dev/null and b/src/assets/fonts/DIN-Light.otf differ diff --git a/src/assets/fonts/DIN-Medium.otf b/src/assets/fonts/DIN-Medium.otf new file mode 100644 index 0000000..3296d1e Binary files /dev/null and b/src/assets/fonts/DIN-Medium.otf differ diff --git a/src/assets/images/bluelogo@2x.png b/src/assets/images/bluelogo@2x.png new file mode 100644 index 0000000..0fb9e22 Binary files /dev/null and b/src/assets/images/bluelogo@2x.png differ diff --git a/src/assets/images/dingtalk_downloader.exe b/src/assets/images/dingtalk_downloader.exe deleted file mode 100644 index c76c12c..0000000 Binary files a/src/assets/images/dingtalk_downloader.exe and /dev/null differ diff --git a/src/assets/images/loginleft.jpg b/src/assets/images/loginleft.jpg deleted file mode 100644 index 946f522..0000000 Binary files a/src/assets/images/loginleft.jpg and /dev/null differ diff --git a/src/assets/images/loginleft.png b/src/assets/images/loginleft.png new file mode 100644 index 0000000..ea1614a Binary files /dev/null and b/src/assets/images/loginleft.png differ diff --git a/src/assets/images/map@2x.png b/src/assets/images/map@2x.png new file mode 100644 index 0000000..d417991 Binary files /dev/null and b/src/assets/images/map@2x.png differ diff --git a/src/assets/images/new@2x.png b/src/assets/images/new@2x.png new file mode 100644 index 0000000..65711e2 Binary files /dev/null and b/src/assets/images/new@2x.png differ diff --git a/src/assets/images/other.png b/src/assets/images/other.png new file mode 100644 index 0000000..25ac697 Binary files /dev/null and b/src/assets/images/other.png differ diff --git a/src/assets/images/top@1x.png b/src/assets/images/top@1x.png new file mode 100644 index 0000000..ae0bfc3 Binary files /dev/null and b/src/assets/images/top@1x.png differ diff --git a/src/assets/images/侧边栏@1x.png b/src/assets/images/侧边栏@1x.png new file mode 100644 index 0000000..72e76ed Binary files /dev/null and b/src/assets/images/侧边栏@1x.png differ diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss index 3296c1d..c47b3b4 100644 --- a/src/assets/styles/variables.scss +++ b/src/assets/styles/variables.scss @@ -37,7 +37,6 @@ $base-sub-menu-hover:#001528; */ $base-header-height: 60px; // 头部高度 $base-sidebar-width: 200px; -$base-sidebar-background: #304156; // 侧边栏背景色 // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3f77e97..41060ef 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -1,15 +1,28 @@ + + + + \ No newline at end of file diff --git a/src/views/components/map.vue b/src/views/components/map.vue index e7363dc..59df5bc 100644 --- a/src/views/components/map.vue +++ b/src/views/components/map.vue @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/src/views/components/projectList.vue b/src/views/components/projectList.vue index a06ab30..835adda 100644 --- a/src/views/components/projectList.vue +++ b/src/views/components/projectList.vue @@ -1,13 +1,99 @@ - - - - - \ No newline at end of file +
+ + + + + + + + + + + + + + +
+ + + + + \ No newline at end of file diff --git a/src/views/detail/detail/index.vue b/src/views/detail/detail/index.vue new file mode 100644 index 0000000..afd6317 --- /dev/null +++ b/src/views/detail/detail/index.vue @@ -0,0 +1,59 @@ + + + + + \ No newline at end of file diff --git a/src/views/index.vue b/src/views/index.vue index b27ea38..a692e99 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -3,31 +3,51 @@
-
+
-
+
+ 消息通知 +
+
-
+
+ 功能区 +
+
+
+ 384 + 项目总数 +
-
+
+ 项目列表 +
+
-
+
+ 投资主体 +
+
+
+ 112 + 项目总数 +
@@ -84,18 +104,78 @@ export default { } .grid-item { - background-color: #f0f0f0; - border: 1px solid #ccc; - padding: 1rem; - text-align: center; - font-size: 1.2rem; - font-weight: bold; + background-color: #FFFFFF; + border-radius: 0.5rem 0.5rem 0.5rem 0.5rem; +} + +.itemhead { + width: 100%; + border-left: 0.25rem solid #2B62F1; + margin: 0.94rem 0; + height: 1.25rem; + display: flex; + align-items: center; +} +.relaitem{ + position: relative; +} +.itemsall{ + position: absolute; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + top: 5.5rem; + left: 7.2rem; +} +.itemsall span:nth-child(1){ + font-family: DIN, DIN; + font-weight: 500; + font-size: 1.75rem; + color: #292C33; + line-height: 2.44rem; + text-align: left; + font-style: normal; + text-transform: none; +} +.itemsall span:nth-child(2){ + font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; + font-weight: 400; + font-size: 0.88rem; + color: #9E9E9E; + line-height: 1.25rem; + text-align: left; + font-style: normal; + text-transform: none; +} +.itemhead span { + margin-left: 1rem; + font-family: AlibabaPuHuiTi, AlibabaPuHuiTi; + font-weight: 600; + font-size: 1rem; + color: #3D424C; + line-height: 1.69rem; + text-align: left; + font-style: normal; + text-transform: none; +} +.mainarea{ + padding: 0rem 0rem 0 1.4rem; + overflow: auto; } /* 第一行:第一个模块占两列 */ .item-1 { grid-column: span 2; - /* 占两列 */ + background-image: url(../../src/assets/images/allbg.png); + background-size: 100% 100%; + background-repeat: no-repeat; +} + +.allarea { + width: 100%; + height: 15.5rem; + padding: 1rem 1.5rem; } /* 最后一行:一个模块占一整行 */ diff --git a/src/views/login.vue b/src/views/login.vue index 285603e..42ae760 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -191,7 +191,7 @@ export default { }.loginleft { width: 35rem; height: 40rem; - background-image: url('../assets/images/loginleft.jpg'); + background-image: url('../assets/images/loginleft.png'); background-size: 100% 100%; background-repeat: no-repeat; } @@ -253,8 +253,8 @@ export default { } .login-code { - width: 33%; - height: 38px; + width: 35%; + height: 1.8rem; float: right; img { diff --git a/src/views/manage/analysis/index.vue b/src/views/manage/analysis/index.vue new file mode 100644 index 0000000..48b3df7 --- /dev/null +++ b/src/views/manage/analysis/index.vue @@ -0,0 +1,321 @@ + + + diff --git a/src/views/manage/message/index.vue b/src/views/manage/message/index.vue new file mode 100644 index 0000000..e1a03f0 --- /dev/null +++ b/src/views/manage/message/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index db5090d..339ec9c 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,7 +36,7 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `https://vue.ruoyi.vip/prod-api`, + target: `http://192.168.0.125:7071`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''