From cbbebfe3101f3e82abc93b6288797152f1cb1d4f Mon Sep 17 00:00:00 2001
From: JayChou <xxx@gmail.com>
Date: Thu, 7 Nov 2024 15:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jeecgboot-vue3/.env.development                    |  4 ++--
 .../components/innovationVouchers/index.vue        | 14 +++++++-------
 .../main-home/components/instrumentInfo/index.vue  | 13 +++++++++++--
 .../components/instrumentSharing/index.vue         | 12 +++++++++++-
 jeecgboot-vue3/vite.config.ts                      |  2 +-
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/jeecgboot-vue3/.env.development b/jeecgboot-vue3/.env.development
index e37bfea..e090825 100644
--- a/jeecgboot-vue3/.env.development
+++ b/jeecgboot-vue3/.env.development
@@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
 
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
-VITE_PROXY = [["/jeecgboot","http://10.121.2.107:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://localhost:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://10.121.2.107:18086/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://localhost:18086/jeecg-boot
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/jeecgboot
diff --git a/jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue b/jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue
index 9837681..bb04430 100644
--- a/jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue
+++ b/jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="container">
-    <a-table :dataSource="indexaward" :columns="columns" >
-        <template v-if="columns.Key === 'setting'">
-            <div>
-                111
-            </div>
-        </template>
+    <a-table :dataSource="indexaward" :columns="columns">
+      <template  #bodyCell="{ column }">
+        <div v-if="column.key === 'setting'">
+            <a-button type="text" primary>查看详情</a-button>
+        </div>
+      </template>
     </a-table>
   </div>
 </template>
@@ -36,7 +36,7 @@
     },
     {
       title: '操作',
-      dataIndex: '',
+
       key: 'setting',
     },
   ];
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
index 48efe7f..5222e43 100644
--- a/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue
+++ b/jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue
@@ -14,12 +14,12 @@
                 <img src="@/assets/images/mainHome/aa.png" alt="">
             </div>
             <div class="headerRight">
-                <h3>组合型四级杆轨道离子阱质谱仪 Q Exactive Plus Hybrid <br>Quadrupole-Orbitrap Mass<br>Spectrometer</h3>
+                <h3>{{ info.name }}</h3>
                 <div class="b">
                     <div class="bb">
                         <p>状态<br>型号<br>仪器分类<br>生产厂商<br>仪器类别</p>
                     </div>
-                    <div class="bbb">-<br>Q Exactive Plus<br>分析仪器-质谱仪器-有机质谱仪器<br>杭州成功仪器质量高高科技有限公司<br>专用</div>
+                    <div class="bbb">-<br>{{ info.state_dictText }}<br>分析仪器-质谱仪器-有机质谱仪器<br>杭州成功仪器质量高高科技有限公司<br>专用</div>
                 </div>
                 <div class="bbbb">
                     <div class="bbbbb">所在地点&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*&nbsp黄淮国际教育学院实验室</div>
@@ -96,7 +96,16 @@
     </div>
 </template>
 <script setup>
+import {getindexnew} from'@/api/mainHome/index';
 import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+const route = useRoute()
+const info = ref({})
+const getInfo = async () => {
+    const res = await getindexnew({id:route.query.id})
+    info.value = res
+}
+getInfo()
 </script>
 <style lang="less" scoped>
 .container {
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 531ce8c..b4c847f 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
@@ -80,7 +80,7 @@
             </div>
             <div class="btn">
               <div class="booking" @click="onBooking">机时预约</div>
-              <div class="show-info">查看详情</div>
+              <div class="show-info" @click="onShowInfo(item)">查看详情</div>
             </div>
           </div>
         </div>
@@ -171,6 +171,16 @@
     });
   };
   getindexawardEvent();
+
+  // 查看详情
+  const onShowInfo = (item) => {
+    router.push({
+      path: '/main-home/instrumentInfo',
+      query: {
+        id: item.id,
+      },
+    });
+  }
 </script>
 
 <style scoped lang="less">
diff --git a/jeecgboot-vue3/vite.config.ts b/jeecgboot-vue3/vite.config.ts
index 49cb7eb..63ed8f3 100644
--- a/jeecgboot-vue3/vite.config.ts
+++ b/jeecgboot-vue3/vite.config.ts
@@ -67,7 +67,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       https: false,
       port: VITE_PORT,
       // Load proxy configuration from .env
-      // proxy: createProxy(VITE_PROXY),
+      proxy: createProxy(VITE_PROXY),
     },
     build: {
       minify: 'esbuild',