diff --git a/jeecgboot-vue3/.env.development b/jeecgboot-vue3/.env.development
index 96218f1..e090825 100644
--- a/jeecgboot-vue3/.env.development
+++ b/jeecgboot-vue3/.env.development
@@ -13,7 +13,8 @@ VITE_GLOB_DOMAIN_URL=http://localhost:18086/jeecg-boot
#后台接口父地址(必填)
VITE_GLOB_API_URL=/jeecgboot
-
+# 创新券地址
+VITE_GLOB_API_URL_CXQ=http://localhost:18088/jeecg-boot
# 接口前缀
VITE_GLOB_API_URL_PREFIX=
diff --git a/jeecgboot-vue3/src/api/mainHome/index.ts b/jeecgboot-vue3/src/api/mainHome/index.ts
new file mode 100644
index 0000000..143fc1c
--- /dev/null
+++ b/jeecgboot-vue3/src/api/mainHome/index.ts
@@ -0,0 +1,42 @@
+import { defHttp } from '/@/utils/http/axios';
+
+// 获取仪器列表
+export function getindexcomp(params) {
+ return defHttp.request({
+ url: '/instrument/instrument/listcms',
+ method: 'GET',
+ params,
+ });
+}
+// 获取仪器详情
+export function getindexnew(params) {
+ return defHttp.request({
+ url: '/instrument/instrument/queryByIdCms',
+ method: 'GET',
+ params,
+ });
+}
+// 获取学科领域
+export function getindexsubject() {
+ return defHttp.request({
+ url: '/disciplinefieid/disciplineFieid/listcms',
+ method: 'GET',
+
+ });
+}
+// 获取仪器分类
+export function getindexclass() {
+ return defHttp.request({
+ url: '/instrumenttype/instrumentType/listcms',
+ method: 'GET',
+
+ });
+}
+// 获取创新券列表
+export function getindexaward(params) {
+ return defHttp.request({
+ url: '/innovationvoucher/innovationVoucher/listcms',
+ method: 'GET',
+ params,
+ });
+}
\ No newline at end of file
diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue
index b3f05ad..2054432 100644
--- a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue
+++ b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue
@@ -2,63 +2,174 @@
-
机构组织
-
驻马店实验室(共407台)
+
仪器类别
+
-
机构组织
-
驻马店实验室(共407台)
+
仪器分类:
+
-
+
-
组合型四极杆轨道离子阱质谱仪 Q Exactive Plus Hybrid Quadrupole-Orbitrap Mass Spectrometer
+
{{ item.name }}
-
状态
- 使用种
+ {{ item.state_dictText }}
+
+ -
+
类别
+ {{ item.category_dictText }}
+
+ -
+
服务次数
+ {{ item.serviceFrequency }}
-
型号
- Orbitrap Exploris 480
+ {{ item.specification }}
-
-
管理员
- 赵公正、郑婷、张美莹、孙正、李娥
+ 类型
+ {{ item.type_dictText }}
-
+
申报单位
+ {{ item.declarationUnit_dictText }}
+
+
+
+
+
+
-
+