Merge branch 'master' of http://182.92.169.222:3000/zhc077/zmd_kejiju

jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="container">
-    <a-table :dataSource="indexaward" :columns="columns" >
+    <a-table :dataSource="indexaward" :columns="columns">
-        <template v-if="columns.Key === 'setting'">
+      <template  #bodyCell="{ column }">
-            <div>
+        <div v-if="column.key === 'setting'">
-                111
+            <a-button type="text" primary>查看详情</a-button>
         </div>
       </template>
     </a-table>
@@ -36,7 +36,7 @@
     },
     {
       title: '操作',
-      dataIndex: '',
+
       key: 'setting',
     },
   ];

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 {

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">