diff --git a/jeecgboot-vue3/.env.development b/jeecgboot-vue3/.env.development index 96218f1..7631bc6 100644 --- a/jeecgboot-vue3/.env.development +++ b/jeecgboot-vue3/.env.development @@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = / # 跨域代理,您可以配置多个 ,请注意,没有换行符 -VITE_PROXY = [["/jeecgboot","http://localhost:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]] +VITE_PROXY = [["/jeecgboot","http://10.121.2.107:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]] #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://localhost:18086/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://10.121.2.107:18086/jeecg-boot #后台接口父地址(必填) VITE_GLOB_API_URL=/jeecgboot diff --git a/jeecgboot-vue3/src/assets/images/mainHome/aa.png b/jeecgboot-vue3/src/assets/images/mainHome/aa.png new file mode 100644 index 0000000..1bc40a1 Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/mainHome/aa.png differ diff --git a/jeecgboot-vue3/src/assets/images/mainHome/declare.png b/jeecgboot-vue3/src/assets/images/mainHome/declare.png new file mode 100644 index 0000000..22c57ee Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/mainHome/declare.png differ diff --git a/jeecgboot-vue3/src/assets/images/mainHome/h.png b/jeecgboot-vue3/src/assets/images/mainHome/h.png new file mode 100644 index 0000000..53ffdbf Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/mainHome/h.png differ diff --git a/jeecgboot-vue3/src/assets/images/mainHome/process.png b/jeecgboot-vue3/src/assets/images/mainHome/process.png new file mode 100644 index 0000000..957eb8c Binary files /dev/null and b/jeecgboot-vue3/src/assets/images/mainHome/process.png differ diff --git a/jeecgboot-vue3/src/router/helper/mainOut.ts b/jeecgboot-vue3/src/router/helper/mainOut.ts index c4e8005..a9d1221 100644 --- a/jeecgboot-vue3/src/router/helper/mainOut.ts +++ b/jeecgboot-vue3/src/router/helper/mainOut.ts @@ -35,6 +35,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '首页', ignoreAuth: true, + hidden: false + }, }, { @@ -44,6 +46,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '仪器共享', ignoreAuth: true, + hidden: false + }, }, { @@ -53,6 +57,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '项目申报', ignoreAuth: true, + hidden: false + }, }, { @@ -62,6 +68,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '专家管理', ignoreAuth: true, + hidden: false + }, }, { @@ -71,6 +79,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '新闻列表', ignoreAuth: true, + hidden: false + }, }, { @@ -80,6 +90,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '新闻详情', ignoreAuth: true, + hidden: false + }, }, { @@ -89,6 +101,8 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '栏目管理', ignoreAuth: true, + hidden: false + }, }, { @@ -98,6 +112,18 @@ export const mainOutRoutes: AppRouteModule[] = [ meta: { title: '文章管理', ignoreAuth: true, + hidden: false + + }, + }, + { + path: '/main-home/instrumentInfo', + name: 'InstrumentInfo', + component: () => import('/@/views/demo/main-home/components/instrumentInfo/index.vue'), + meta: { + title: '', + ignoreAuth: true, + hidden:true }, }, ], diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue new file mode 100644 index 0000000..48efe7f --- /dev/null +++ b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue @@ -0,0 +1,250 @@ + + + \ No newline at end of file diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue index 29bd06d..9415d22 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/components/projectDeclaration/index.vue @@ -1,52 +1,178 @@ diff --git a/jeecgboot-vue3/src/views/demo/main-home/index.vue b/jeecgboot-vue3/src/views/demo/main-home/index.vue index d44baaa..1ce39f1 100644 --- a/jeecgboot-vue3/src/views/demo/main-home/index.vue +++ b/jeecgboot-vue3/src/views/demo/main-home/index.vue @@ -36,7 +36,7 @@