Compare commits

..

No commits in common. 'dbdd892484edfd1087ffe6e2c245126f250e25dd' and '701dda3592925895898dffa893f79239d5d347d3' have entirely different histories.

  1. 8
      jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue
  2. 13
      jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue
  3. 12
      jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue

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

@ -14,12 +14,12 @@
<img src="@/assets/images/mainHome/aa.png" alt="">
</div>
<div class="headerRight">
<h3>{{ info.name }}</h3>
<h3>组合型四级杆轨道离子阱质谱仪 Q Exactive Plus Hybrid <br>Quadrupole-Orbitrap Mass<br>Spectrometer</h3>
<div class="b">
<div class="bb">
<p>状态<br>型号<br>仪器分类<br>生产厂商<br>仪器类别</p>
</div>
<div class="bbb">-<br>{{ info.state_dictText }}<br>分析仪器-质谱仪器-有机质谱仪器<br>杭州成功仪器质量高高科技有限公司<br>专用</div>
<div class="bbb">-<br>Q Exactive Plus<br>分析仪器-质谱仪器-有机质谱仪器<br>杭州成功仪器质量高高科技有限公司<br>专用</div>
</div>
<div class="bbbb">
<div class="bbbbb">所在地点&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*&nbsp黄淮国际教育学院实验室</div>
@ -96,16 +96,7 @@
</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 {

@ -80,7 +80,7 @@
</div>
<div class="btn">
<div class="booking" @click="onBooking">机时预约</div>
<div class="show-info" @click="onShowInfo(item)">查看详情</div>
<div class="show-info">查看详情</div>
</div>
</div>
</div>
@ -171,16 +171,6 @@
});
};
getindexawardEvent();
//
const onShowInfo = (item) => {
router.push({
path: '/main-home/instrumentInfo',
query: {
id: item.id,
},
});
}
</script>
<style scoped lang="less">

Loading…
Cancel
Save