diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java index b17c65c..d17a510 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/instrument/controller/InstrumentController.java @@ -127,12 +127,13 @@ public class InstrumentController extends JeecgController queryByIdCms(@RequestParam(name="id",required=true) String id) { - Instrument instrument = instrumentService.getById(id); - if(instrument==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(instrument); + public Result> queryByIdCms(@RequestParam(name="id",required=true) String id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("id",id); + Page page = new Page(1, 10); + IPage pageList = instrumentService.page(page, queryWrapper); + + return Result.OK(pageList); } /** diff --git a/jeecgboot-vue3/.env b/jeecgboot-vue3/.env index 91dbdb3..528184b 100644 --- a/jeecgboot-vue3/.env +++ b/jeecgboot-vue3/.env @@ -2,10 +2,10 @@ 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 diff --git a/jeecgboot-vue3/index.html b/jeecgboot-vue3/index.html index ef61a19..5970d05 100644 --- a/jeecgboot-vue3/index.html +++ b/jeecgboot-vue3/index.html @@ -157,7 +157,7 @@
- +
diff --git a/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text2.png b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text2.png new file mode 100644 index 0000000..6db4590 Binary files /dev/null and b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text2.png differ diff --git a/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text3.png b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text3.png new file mode 100644 index 0000000..b23f0d6 Binary files /dev/null and b/jeecgboot-vue3/src/assets/loginmini/icon/jeecg_ad_text3.png differ diff --git a/jeecgboot-vue3/src/components/Application/src/AppLocalePicker.vue b/jeecgboot-vue3/src/components/Application/src/AppLocalePicker.vue index d600bba..28eafaa 100644 --- a/jeecgboot-vue3/src/components/Application/src/AppLocalePicker.vue +++ b/jeecgboot-vue3/src/components/Application/src/AppLocalePicker.vue @@ -11,10 +11,10 @@ @menuEvent="handleMenuEvent" overlayClassName="app-locale-picker-overlay" > - +