From acb1c6cc9902bf1ba5c00f5e1473d6e6bc169227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 26 Apr 2022 11:17:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Config/SwaggerDoc.xml | 37 +++++++++++++++++-
Yi.Vue2.x/.env.development | 2 +-
Yi.Vue2.x/package-lock.json | 10 +++++
Yi.Vue2.x/package.json | 2 +
Yi.Vue2.x/public/favicon.ico | Bin 0 -> 4286 bytes
Yi.Vue2.x/public/index.html | 20 ++++++++++
Yi.Vue2.x/src/plugins/vuetify.js | 9 +++++
Yi.Vue2.x/vue.config.js | 2 +-
8 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 Yi.Vue2.x/public/favicon.ico
create mode 100644 Yi.Vue2.x/public/index.html
diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
index 94301420..d51448d9 100644
--- a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
+++ b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
@@ -6,7 +6,7 @@
- 账户控制器
+ 账户管理
@@ -68,6 +68,29 @@
+
+
+ 菜单管理
+
+
+
+
+ 得到树形菜单
+
+
+
+
+
+ 角色管理
+
+
+
+
+ 给多用户设置多角色
+
+
+
+
测试控制器
@@ -127,5 +150,17 @@
+
+
+ 用户管理
+
+
+
+
+ 给多用户设置多角色
+
+
+
+
diff --git a/Yi.Vue2.x/.env.development b/Yi.Vue2.x/.env.development
index 9aaa02b4..2a32b7ed 100644
--- a/Yi.Vue2.x/.env.development
+++ b/Yi.Vue2.x/.env.development
@@ -1,4 +1,4 @@
#接口服务地址
-VUE_APP_SERVICE_URL='https://localhost:19001/api'
+VUE_APP_SERVICE_URL='http://localhost:19001/api'
#开发环境路径前缀
VUE_APP_BASE_API='/dev-apis'
\ No newline at end of file
diff --git a/Yi.Vue2.x/package-lock.json b/Yi.Vue2.x/package-lock.json
index d3eb569a..d3376d8d 100644
--- a/Yi.Vue2.x/package-lock.json
+++ b/Yi.Vue2.x/package-lock.json
@@ -80,6 +80,11 @@
"postcss": "^7.0.0"
}
},
+ "@mdi/font": {
+ "version": "6.6.96",
+ "resolved": "https://registry.npmmirror.com/@mdi/font/-/font-6.6.96.tgz",
+ "integrity": "sha512-FbcvG9z17hwZ7IwX5XeOR1UYGoLq+gTKq6XNPvJFuCpn599GdiPCJbAmmDBJb+jMYXjKYr0lCxfouWGxDA82sA=="
+ },
"@mrmlnc/readdir-enhanced": {
"version": "2.2.1",
"resolved": "https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz",
@@ -8520,6 +8525,11 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
"dev": true
},
+ "typeface-roboto": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmmirror.com/typeface-roboto/-/typeface-roboto-1.1.13.tgz",
+ "integrity": "sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw=="
+ },
"uglify-js": {
"version": "3.4.10",
"resolved": "https://registry.nlark.com/uglify-js/download/uglify-js-3.4.10.tgz?cache=0&sync_timestamp=1631026555366&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fuglify-js%2Fdownload%2Fuglify-js-3.4.10.tgz",
diff --git a/Yi.Vue2.x/package.json b/Yi.Vue2.x/package.json
index 0e1983c0..1156390b 100644
--- a/Yi.Vue2.x/package.json
+++ b/Yi.Vue2.x/package.json
@@ -7,7 +7,9 @@
"build": "vue-cli-service build"
},
"dependencies": {
+ "@mdi/font": "^6.6.96",
"axios": "^0.22.0",
+ "typeface-roboto": "^1.1.13",
"vue": "^2.6.11",
"vue-chartist": "^2.3.1",
"vue-router": "^3.2.0",
diff --git a/Yi.Vue2.x/public/favicon.ico b/Yi.Vue2.x/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..df36fcfb72584e00488330b560ebcf34a41c64c2
GIT binary patch
literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S
literal 0
HcmV?d00001
diff --git a/Yi.Vue2.x/public/index.html b/Yi.Vue2.x/public/index.html
new file mode 100644
index 00000000..15b610c5
--- /dev/null
+++ b/Yi.Vue2.x/public/index.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+ Yi-Vue
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Yi.Vue2.x/src/plugins/vuetify.js b/Yi.Vue2.x/src/plugins/vuetify.js
index 8634eeef..42c6b780 100644
--- a/Yi.Vue2.x/src/plugins/vuetify.js
+++ b/Yi.Vue2.x/src/plugins/vuetify.js
@@ -3,6 +3,10 @@
import Vue from 'vue'
import Vuetify from 'vuetify/lib/framework'
import ripple from 'vuetify/lib/directives/ripple'
+import zhHans from 'vuetify/es5/locale/zh-Hans' // 引入中文语言包
+import 'typeface-roboto/index.css' // 引入本地的Roboto字体资源
+import '@mdi/font/css/materialdesignicons.css' // 引入本地的Material Design Icons资源
+
Vue.use(Vuetify, { directives: { ripple } })
@@ -17,8 +21,13 @@ const theme = {
}
export default new Vuetify({
+ lang:{
+ locales: {zhHans},
+ current: 'zhHans'
+ },
breakpoint: { mobileBreakpoint: 960 },
icons: {
+ iconfont: 'mdi',
values: { expand: 'mdi-menu-down' },
},
theme: {
diff --git a/Yi.Vue2.x/vue.config.js b/Yi.Vue2.x/vue.config.js
index ee782210..735dc799 100644
--- a/Yi.Vue2.x/vue.config.js
+++ b/Yi.Vue2.x/vue.config.js
@@ -4,7 +4,7 @@ module.exports = {
'vuetify'
],
devServer: {
- port: 6789,
+ port: 18000,
open: true,
https: false,
host: "localhost",