From e290789c592db88cfbffac7ecbdcd8f998e45796 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 11:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
minipro_standard/pages.json | 170 +++++++++++++++++++----------------------
server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java | 2
minipro_standard/pages/index/index.vue | 12 +-
server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java | 2
screen_standard/vite.config.js | 12 ---
5 files changed, 88 insertions(+), 110 deletions(-)
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index b77d9e9..4e8cdef 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,104 +1,92 @@
{
- "pages": [
- // {
- // "path": "pages/workbench/workbench",
- // "style": {
- // "navigationBarTitleText": "宸ヤ綔鍙�",
- // "enablePullDownRefresh": false
- // }
- // },
+ "pages": [{
+ "path": "pages/workbench/workbench",
+ "style": {
+ "navigationBarTitleText": "宸ヤ綔鍙�",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "",
"navigationStyle": "custom"
}
+ }, {
+ "path": "pages/mine/mine",
+ "style": {
+ "navigationBarTitleText": "鎴戠殑",
+ "enablePullDownRefresh": false
+ }
+ }, {
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "鐧诲綍",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ }, {
+ "path": "pages/personal/personal",
+ "style": {
+ "navigationBarTitleText": "涓汉淇℃伅",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/changePassword/changePassword",
+ "style": {
+ "navigationBarTitleText": "淇敼瀵嗙爜",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/updatePhone/updatePhone",
+ "style": {
+ "navigationBarTitleText": "鏇存柊鎵嬫満鍙�",
+ "enablePullDownRefresh": false
+ }
+
+ }, {
+ "path": "pages/updateMailbox/updateMailbox",
+ "style": {
+ "navigationBarTitleText": "鏇存柊閭鍙�",
+ "enablePullDownRefresh": false
+ }
+
}
- // , {
- // "path": "pages/mine/mine",
- // "style": {
- // "navigationBarTitleText": "鎴戠殑",
- // "enablePullDownRefresh": false
- // }
- // }
- // ,{
- // "path" : "pages/login/login",
- // "style" :
- // {
- // "navigationBarTitleText": "鐧诲綍",
- // "enablePullDownRefresh": false,
- // "navigationStyle": "custom"
- // }
- // }
- // ,{
- // "path" : "pages/personal/personal",
- // "style" :
- // {
- // "navigationBarTitleText": "涓汉淇℃伅",
- // "enablePullDownRefresh": false
- // }
-
- // }
- // ,{
- // "path" : "pages/changePassword/changePassword",
- // "style" :
- // {
- // "navigationBarTitleText": "淇敼瀵嗙爜",
- // "enablePullDownRefresh": false
- // }
-
- // }
- // ,{
- // "path" : "pages/updatePhone/updatePhone",
- // "style" :
- // {
- // "navigationBarTitleText": "鏇存柊鎵嬫満鍙�",
- // "enablePullDownRefresh": false
- // }
-
- // }
- // ,{
- // "path" : "pages/updateMailbox/updateMailbox",
- // "style" :
- // {
- // "navigationBarTitleText": "鏇存柊閭鍙�",
- // "enablePullDownRefresh": false
- // }
-
- // }
- ],
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
+ "navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#ffffff",
- "backgroundColor": "#ffffff",
- "navigationStyle": "custom"
- },
- // "tabBar": {
- // "color": "#666666",
- // "selectedColor": "#222222",
- // "borderStyle": "black",
- // "backgroundColor": "#fff",
- // "list": [
- // {
- // "pagePath": "pages/index/index",
- // "iconPath": "static/nav_daiban@2x.png",
- // "selectedIconPath": "static/nav_daiban_sel@2x.png",
- // "text": "寰呭姙"
- // },
- // {
- // "pagePath": "pages/workbench/workbench",
- // "iconPath": "static/nav_gongzuotai@2x.png",
- // "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
- // "text": "宸ヤ綔鍙�"
- // },
- // {
- // "pagePath": "pages/mine/mine",
- // "iconPath": "static/nav_wode@2x.png",
- // "selectedIconPath": "static/nav_wode_sel@2x.png",
- // "text": "鎴戠殑"
- // }
- // ]
- // },
+ "backgroundColor": "#ffffff"
+ // "navigationStyle": "custom"
+ },
+ "tabBar": {
+ "color": "#666666",
+ "selectedColor": "#222222",
+ "borderStyle": "black",
+ "backgroundColor": "#fff",
+ "list": [
+ {
+ "pagePath": "pages/index/index",
+ "iconPath": "static/nav_daiban@2x.png",
+ "selectedIconPath": "static/nav_daiban_sel@2x.png",
+ "text": "寰呭姙"
+ },
+ {
+ "pagePath": "pages/workbench/workbench",
+ "iconPath": "static/nav_gongzuotai@2x.png",
+ "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
+ "text": "宸ヤ綔鍙�"
+ },
+ {
+ "pagePath": "pages/mine/mine",
+ "iconPath": "static/nav_wode@2x.png",
+ "selectedIconPath": "static/nav_wode_sel@2x.png",
+ "text": "鎴戠殑"
+ }
+ ]
+ },
"uniIdRouter": {}
}
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
index 74356de..225d435 100644
--- a/minipro_standard/pages/index/index.vue
+++ b/minipro_standard/pages/index/index.vue
@@ -1,16 +1,16 @@
<template>
<view class="index">
- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view>
- <!-- <myTabbar :index="0" /> -->
+ <!-- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view> -->
+ <myTabbar :index="0" />
</view>
</template>
<script>
- // import myTabbar from "@/components/myTabber.vue"
+ import myTabbar from "@/components/myTabber.vue"
export default {
- // components: {
- // myTabbar
- // },
+ components: {
+ myTabbar
+ },
data() {
return {
code: '',
diff --git a/screen_standard/vite.config.js b/screen_standard/vite.config.js
index 722a9a4..bf4e9bc 100644
--- a/screen_standard/vite.config.js
+++ b/screen_standard/vite.config.js
@@ -53,20 +53,8 @@
changeOrigin: true,
ws: false, // 鍏佽websocket浠ｇ悊
secure: false,
-<<<<<<< HEAD
rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/')
}
-=======
- rewrite: (path) => path.replace(env.VITE_BASE_PATH, '/'),
- // rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
- },
- /*'/api' : {
- target: env.VITE_BASE_URL, // 閫氳繃浠ｇ悊鎺ュ彛璁块棶瀹為檯鍦板潃銆傝繖閲屾槸瀹為檯璁块棶鐨勫湴鍧�銆倂ue浼氶�氳繃浠ｇ悊鏈嶅姟鍣ㄦ潵浠ｇ悊璇锋眰
- changeOrigin: true,
- ws: false, // 鍏佽websocket浠ｇ悊
- rewrite: (path) => path.replace(/^\api/, ''), // 灏哸pi鏇挎崲涓虹┖
- }*/
->>>>>>> 7550fb636fec7a84dbdea55196d97ed635d7ab10
}
}
}
diff --git a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
index 958c244..dddd521 100644
--- a/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
+++ b/server/src/main/java/doumeemes/api/ext/UnqualifiedRecordExtController.java
@@ -44,12 +44,14 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
+ @RequiresPermissions("business:unqualifiedRecord:create")
public ApiResponse<PageData<UnqualifiedRecord>> findJoinPage (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap) {
return ApiResponse.success(unqualifiedRecordService.findJoinPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
+ @RequiresPermissions("business:unqualifiedRecord:exportExcel")
public void exportExcel (@RequestBody PageWrap<QueryUnQualifiedRecordDTO> pageWrap, HttpServletResponse response) throws Exception{
List<UnqualifiedRecord> list = unqualifiedRecordService.findJoinPage(pageWrap).getRecords();
List<UnqualifiedRecordVO> voList = new ArrayList<>();
diff --git a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java
index 4ed63b8..d8277a1 100644
--- a/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java
+++ b/server/src/main/java/doumeemes/dao/ext/vo/WorkorderCheckExtListVO.java
@@ -63,7 +63,7 @@
@ApiModelProperty(value = "妫�楠岀被鍨� 0宸＄嚎銆�1宸℃銆�2缁堟", example = "1")
- @ExcelColumn(name="妫�楠岀被鍨�" ,valueMapping = "0=宸＄嚎;1=宸℃;2=缁堟",index = 9,width =15)
+ @ExcelColumn(name="妫�楠岀被鍨�" ,valueMapping = "0=宸＄嚎;1=宸℃;2=瀹屽伐妫�",index = 9,width =15)
private String checkTypename;
--
Gitblit v1.9.3