Merge remote-tracking branch 'origin/master'

master
王家东 2 weeks ago
commit c592614fc7
  1. 13
      jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java
  2. 4
      jeecgboot-vue3/.env
  3. 2
      jeecgboot-vue3/index.html
  4. BIN
      jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text2.png
  5. BIN
      jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text3.png
  6. 4
      jeecgboot-vue3/src/components/Application/src/AppLocalePicker.vue
  7. 6
      jeecgboot-vue3/src/components/Application/src/AppLogo.vue
  8. 2
      jeecgboot-vue3/src/layouts/default/header/components/user-dropdown/index.vue
  9. 8
      jeecgboot-vue3/src/layouts/default/tabs/index.vue
  10. 2
      jeecgboot-vue3/src/locales/lang/en/layout.ts
  11. 4
      jeecgboot-vue3/src/locales/lang/zh-CN/sys.ts
  12. 14
      jeecgboot-vue3/src/views/demo/main-home/components/innovationVouchers/index.vue
  13. 13
      jeecgboot-vue3/src/views/demo/main-home/components/instrumentInfo/index.vue
  14. 12
      jeecgboot-vue3/src/views/demo/main-home/components/instrumentSharing/index.vue
  15. 12
      jeecgboot-vue3/src/views/sys/login/TokenLoginPage.vue
  16. 8
      jeecgboot-vue3/src/views/system/loginmini/MiniLogin.vue
  17. 8
      jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts

@ -127,12 +127,13 @@ public class InstrumentController extends JeecgController<Instrument, IInstrumen
//@AutoLog(value = "仪器信息表-通过id查询") //@AutoLog(value = "仪器信息表-通过id查询")
@ApiOperation(value="仪器信息表-通过id查询", notes="仪器信息表-通过id查询") @ApiOperation(value="仪器信息表-通过id查询", notes="仪器信息表-通过id查询")
@GetMapping(value = "/queryByIdCms") @GetMapping(value = "/queryByIdCms")
public Result<Instrument> queryByIdCms(@RequestParam(name="id",required=true) String id) { public Result<IPage<Instrument>> queryByIdCms(@RequestParam(name="id",required=true) String id) {
Instrument instrument = instrumentService.getById(id); QueryWrapper<Instrument> queryWrapper = new QueryWrapper();
if(instrument==null) { queryWrapper.eq("id",id);
return Result.error("未找到对应数据"); Page<Instrument> page = new Page<Instrument>(1, 10);
} IPage<Instrument> pageList = instrumentService.page(page, queryWrapper);
return Result.OK(instrument);
return Result.OK(pageList);
} }
/** /**

@ -2,10 +2,10 @@
VITE_PORT = 3500 VITE_PORT = 3500
# 网站标题 # 网站标题
VITE_GLOB_APP_TITLE = 科技管理信息系统 VITE_GLOB_APP_TITLE = 驻马店市科技大市场管理平台
# 简称,此变量只能是字符/下划线 # 简称,此变量只能是字符/下划线
VITE_GLOB_APP_SHORT_NAME = kjj_Pro VITE_GLOB_APP_SHORT_NAME = 驻马市科技大市场管理平台
# 单点登录服务端地址 # 单点登录服务端地址
VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas

@ -157,7 +157,7 @@
</style> </style>
<div class="app-loading"> <div class="app-loading">
<div class="app-loading-wrap"> <div class="app-loading-wrap">
<img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" /> <!-- <img src="/resource/img/logo.png" class="app-loading-logo" alt="Logo" />-->
<div class="app-loading-dots"> <div class="app-loading-dots">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span> <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div> </div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

@ -11,10 +11,10 @@
@menuEvent="handleMenuEvent" @menuEvent="handleMenuEvent"
overlayClassName="app-locale-picker-overlay" overlayClassName="app-locale-picker-overlay"
> >
<span class="cursor-pointer flex items-center"> <!-- <span class="cursor-pointer flex items-center">
<Icon icon="ion:language" /> <Icon icon="ion:language" />
<span v-if="showText" class="ml-1">{{ getLocaleText }}</span> <span v-if="showText" class="ml-1">{{ getLocaleText }}</span>
</span> </span>-->
</Dropdown> </Dropdown>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>

@ -4,8 +4,8 @@
--> -->
<template> <template>
<div class="anticon" :class="getAppLogoClass" @click="goHome"> <div class="anticon" :class="getAppLogoClass" @click="goHome">
<img src="../../../assets/images/logo.png" /> <!-- <img src="../../../assets/images/logo.png" />-->
<div class="ml-2 truncate md:opacity-100" :class="getTitleClass" v-show="showTitle"> <div class="ml-2 truncate md:opacity-100" :class="getTitleClass" style="font-size: small;" v-show="showTitle">
{{ shortTitle }} {{ shortTitle }}
</div> </div>
</div> </div>
@ -38,7 +38,7 @@
const { getCollapsedShowTitle } = useMenuSetting(); const { getCollapsedShowTitle } = useMenuSetting();
const userStore = useUserStore(); const userStore = useUserStore();
const { title, shortTitle } = useGlobSetting(); const { title, shortTitle } = useGlobSetting();
const go = useGo(); const go = useGo();
const getAppLogoClass = computed(() => [prefixCls, props.theme, { 'collapsed-show-title': unref(getCollapsedShowTitle) }]); const getAppLogoClass = computed(() => [prefixCls, props.theme, { 'collapsed-show-title': unref(getCollapsedShowTitle) }]);

@ -15,7 +15,7 @@
<MenuDivider v-if="getShowDoc" /> <MenuDivider v-if="getShowDoc" />
<MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" /> <MenuItem itemKey="account" :text="t('layout.header.dropdownItemSwitchAccount')" icon="ant-design:setting-outlined" />
<MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" /> <MenuItem itemKey="password" :text="t('layout.header.dropdownItemSwitchPassword')" icon="ant-design:edit-outlined" />
<MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" /> <!-- <MenuItem itemKey="depart" :text="t('layout.header.dropdownItemSwitchDepart')" icon="ant-design:cluster-outlined" />-->
<MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" /> <MenuItem itemKey="cache" :text="t('layout.header.dropdownItemRefreshCache')" icon="ion:sync-outline" />
<!-- <MenuItem <!-- <MenuItem
v-if="getUseLockPage" v-if="getUseLockPage"

@ -21,16 +21,16 @@
<template #rightExtra v-if="getShowRedo || getShowQuick"> <template #rightExtra v-if="getShowRedo || getShowQuick">
<TabRedo v-if="getShowRedo" /> <TabRedo v-if="getShowRedo" />
<!-- <TabContent isExtra :tabItem="$route" v-if="getShowQuick" /> --> <!-- <TabContent isExtra :tabItem="$route" v-if="getShowQuick" /> -->
<!-- 列表页全屏 <!-- 列表页全屏
<FoldButton v-if="getShowFold" />--> <FoldButton v-if="getShowFold" />-->
<!-- <FullscreenOutlined /> --> <!-- <FullscreenOutlined /> -->
<router-link to="/ai" class="ai-icon"> <!-- <router-link to="/ai" class="ai-icon">
<a-tooltip title="AI助手" placement="left"> <a-tooltip title="AI助手88" placement="left">
<svg t="1706259688149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2056" width="17" height="17"> <svg t="1706259688149" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2056" width="17" height="17">
<path d="M826.368 325.632c0-7.168 2.048-10.24 10.24-10.24h123.904c7.168 0 10.24 2.048 10.24 10.24v621.568c0 7.168-2.048 10.24-10.24 10.24h-122.88c-8.192 0-10.24-4.096-10.24-10.24l-1.024-621.568z m-8.192-178.176c0-50.176 35.84-79.872 79.872-79.872 48.128 0 79.872 32.768 79.872 79.872 0 52.224-33.792 79.872-81.92 79.872-46.08 1.024-77.824-27.648-77.824-79.872zM462.848 584.704C441.344 497.664 389.12 307.2 368.64 215.04h-2.048c-16.384 92.16-58.368 247.808-92.16 369.664h188.416zM243.712 712.704l-62.464 236.544c-2.048 7.168-4.096 8.192-12.288 8.192H54.272c-8.192 0-10.24-2.048-8.192-12.288l224.256-783.36c4.096-13.312 7.168-26.624 8.192-65.536 0-6.144 2.048-8.192 7.168-8.192H450.56c6.144 0 8.192 2.048 10.24 8.192l250.88 849.92c2.048 7.168 0 10.24-7.168 10.24H573.44c-7.168 0-10.24-2.048-12.288-7.168l-65.536-236.544c1.024 1.024-251.904 0-251.904 0z" fill="#333333" p-id="19816"></path> <path d="M826.368 325.632c0-7.168 2.048-10.24 10.24-10.24h123.904c7.168 0 10.24 2.048 10.24 10.24v621.568c0 7.168-2.048 10.24-10.24 10.24h-122.88c-8.192 0-10.24-4.096-10.24-10.24l-1.024-621.568z m-8.192-178.176c0-50.176 35.84-79.872 79.872-79.872 48.128 0 79.872 32.768 79.872 79.872 0 52.224-33.792 79.872-81.92 79.872-46.08 1.024-77.824-27.648-77.824-79.872zM462.848 584.704C441.344 497.664 389.12 307.2 368.64 215.04h-2.048c-16.384 92.16-58.368 247.808-92.16 369.664h188.416zM243.712 712.704l-62.464 236.544c-2.048 7.168-4.096 8.192-12.288 8.192H54.272c-8.192 0-10.24-2.048-8.192-12.288l224.256-783.36c4.096-13.312 7.168-26.624 8.192-65.536 0-6.144 2.048-8.192 7.168-8.192H450.56c6.144 0 8.192 2.048 10.24 8.192l250.88 849.92c2.048 7.168 0 10.24-7.168 10.24H573.44c-7.168 0-10.24-2.048-12.288-7.168l-65.536-236.544c1.024 1.024-251.904 0-251.904 0z" fill="#333333" p-id="19816"></path>
</svg> </svg>
</a-tooltip> </a-tooltip>
</router-link> </router-link>-->
</template> </template>
</Tabs> </Tabs>
</div> </div>

@ -8,7 +8,7 @@ export default {
dropdownItemSwitchDepart: 'Switch Department', dropdownItemSwitchDepart: 'Switch Department',
dropdownItemRefreshCache: 'Clean cache', dropdownItemRefreshCache: 'Clean cache',
dropdownItemSwitchAccount: 'Account Setting', dropdownItemSwitchAccount: 'Account Setting',
tooltipErrorLog: 'Error log', tooltipErrorLog: 'Error log',
tooltipLock: 'Lock screen', tooltipLock: 'Lock screen',
tooltipNotify: 'Notification', tooltipNotify: 'Notification',

@ -67,8 +67,8 @@ export default {
signUpFormTitle: '注册', signUpFormTitle: '注册',
forgetFormTitle: '重置密码', forgetFormTitle: '重置密码',
signInTitle: 'Jeecg Boot', signInTitle: 'Jeecg Boot888',
signInDesc: '是中国最具影响力的 企业级低代码平台!在线开发,可视化拖拽设计,零代码实现80%的基础功能~', signInDesc: '8888是中国最具影响力的 企业级低代码平台!在线开发,可视化拖拽设计,零代码实现80%的基础功能~',
policy: '我同意敲敲云隐私政策5', policy: '我同意敲敲云隐私政策5',
scanSign: `扫码后,即可完成登录`, scanSign: `扫码后,即可完成登录`,
scanSuccess: `扫码成功,登录中`, scanSuccess: `扫码成功,登录中`,

@ -1,11 +1,11 @@
<template> <template>
<div class="container"> <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> </div>
</template> </template>
</a-table> </a-table>
</div> </div>
</template> </template>
@ -36,7 +36,7 @@
}, },
{ {
title: '操作', title: '操作',
dataIndex: '',
key: 'setting', key: 'setting',
}, },
]; ];

@ -14,12 +14,12 @@
<img src="@/assets/images/mainHome/aa.png" alt=""> <img src="@/assets/images/mainHome/aa.png" alt="">
</div> </div>
<div class="headerRight"> <div class="headerRight">
<h3>组合型四级杆轨道离子阱质谱仪 Q Exactive Plus Hybrid <br>Quadrupole-Orbitrap Mass<br>Spectrometer</h3> <h3>{{ info.name }}</h3>
<div class="b"> <div class="b">
<div class="bb"> <div class="bb">
<p>状态<br>型号<br>仪器分类<br>生产厂商<br>仪器类别</p> <p>状态<br>型号<br>仪器分类<br>生产厂商<br>仪器类别</p>
</div> </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>
<div class="bbbb"> <div class="bbbb">
<div class="bbbbb">所在地点&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*&nbsp黄淮国际教育学院实验室</div> <div class="bbbbb">所在地点&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*&nbsp黄淮国际教育学院实验室</div>
@ -96,7 +96,16 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import {getindexnew} from'@/api/mainHome/index';
import { ref } from 'vue'; 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> </script>
<style lang="less" scoped> <style lang="less" scoped>
.container { .container {

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

@ -5,7 +5,7 @@
<div class="app-loading-dots"> <div class="app-loading-dots">
<span class="dot dot-spin"><i></i><i></i><i></i><i></i></span> <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>
</div> </div>
<div class="app-loading-title">科技管理信息系统</div> <div class="app-loading-title">驻马店是科技大市场管理平台</div>
</div> </div>
</div> </div>
</template> </template>
@ -19,7 +19,7 @@
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { useUserStore } from '/@/store/modules/user'; import { useUserStore } from '/@/store/modules/user';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
export default { export default {
name: "TokenLogin", name: "TokenLogin",
setup(){ setup(){
@ -31,7 +31,7 @@
if(!routeQuery){ if(!routeQuery){
createMessage.warning('参数无效') createMessage.warning('参数无效')
} }
const token = routeQuery['loginToken']; const token = routeQuery['loginToken'];
if(!token){ if(!token){
createMessage.warning('token无效') createMessage.warning('token无效')
@ -53,12 +53,12 @@
duration: 4, duration: 4,
}); });
} }
function requestSuccess(res){ function requestSuccess(res){
let info = routeQuery.info; let info = routeQuery.info;
if(info){ if(info){
let query = JSON.parse(info); let query = JSON.parse(info);
//update-begin-author:taoyan date:2023-4-27 for: QQYUN-4882 //update-begin-author:taoyan date:2023-4-27 for: QQYUN-4882
let path = ''; let path = '';
if(query.isLowApp === 1){ if(query.isLowApp === 1){
@ -68,7 +68,7 @@
path = '/task/handle/' + taskId path = '/task/handle/' + taskId
} }
//update-end-author:taoyan date:2023-4-27 for: QQYUN-4882 //update-end-author:taoyan date:2023-4-27 for: QQYUN-4882
router.replace({ path, query }); router.replace({ path, query });
notification.success({ notification.success({
message: t('sys.login.loginSuccessTitle'), message: t('sys.login.loginSuccessTitle'),

@ -104,7 +104,7 @@
</div> </div>
</div> </div>
</div> </div>
<a-form @keyup.enter.native="loginHandleClick"> <!-- <a-form @keyup.enter.native="loginHandleClick">
<div class="aui-flex aui-third-text"> <div class="aui-flex aui-third-text">
<div class="aui-flex-box aui-third-border"> <div class="aui-flex-box aui-third-border">
<span>{{ t('sys.login.otherSignIn') }}</span> <span>{{ t('sys.login.otherSignIn') }}</span>
@ -132,7 +132,7 @@
</div> </div>
</div> </div>
</div> </div>
</a-form> </a-form>-->
</div> </div>
</div> </div>
</div> </div>
@ -177,8 +177,8 @@
import MiniForgotpad from './MiniForgotpad.vue'; import MiniForgotpad from './MiniForgotpad.vue';
import MiniRegister from './MiniRegister.vue'; import MiniRegister from './MiniRegister.vue';
import MiniCodelogin from './MiniCodelogin.vue'; import MiniCodelogin from './MiniCodelogin.vue';
import logoImg from '/@/assets/loginmini/icon/jeecg_logo.png'; import logoImg from '/@/assets/loginmini/icon/jeecg_ad_text3.png';
import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png'; // import adTextImg from '/@/assets/loginmini/icon/jeecg_ad_text.png';
import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application'; import { AppLocalePicker, AppDarkModeToggle } from '/@/components/Application';
import { useLocaleStore } from '/@/store/modules/locale'; import { useLocaleStore } from '/@/store/modules/locale';
import { useDesign } from "/@/hooks/web/useDesign"; import { useDesign } from "/@/hooks/web/useDesign";

@ -30,7 +30,7 @@ export const settingList = [
img1: geren1, img1: geren1,
img2: geren2, img2: geren2,
}, },
{ /*{
key: '2', key: '2',
name: '我的组织', name: '我的组织',
component: 'TenantSetting', component: 'TenantSetting',
@ -38,7 +38,7 @@ export const settingList = [
icon:'ant-design:team-outlined', icon:'ant-design:team-outlined',
img1: zuhu1, img1: zuhu1,
img2: zuhu2, img2: zuhu2,
}, },*/
{ {
key: '3', key: '3',
name: '账号安全', name: '账号安全',
@ -47,14 +47,14 @@ export const settingList = [
img1: anquan1, img1: anquan1,
img2: anquan2, img2: anquan2,
}, },
{ /*{
key: '4', key: '4',
name: '第三方APP', name: '第三方APP',
component: 'WeChatDingSetting', component: 'WeChatDingSetting',
icon: 'ant-design:contacts-outlined', icon: 'ant-design:contacts-outlined',
img1: app1, img1: app1,
img2: app2, img2: app2,
}, },*/
]; ];

Loading…
Cancel
Save