From 9f1e7f80a3260c30e1e534437da5c79e17fc20af Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 四月 2025 14:35:23 +0800
Subject: [PATCH] 代码初始化
---
admin/src/views/business/categoryDbhType.vue | 2
admin/src/views/business/categorySheLocaltion.vue | 2
admin/src/views/business/categorySheType.vue | 2
admin/src/views/business/companyNormal.vue | 2
admin/src/views/business/categoryDcaProblem.vue | 2
server/src/main/java/com/doumee/api/web/WebMemberController.java | 35 +++++++++++++++++
admin/src/components/business/OperaCategoryWindow.vue | 4 +-
admin/src/views/business/category.vue | 2
admin/src/views/business/workorderDbh.vue | 1
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue | 35 +++++++++++++++++
admin/src/views/business/categoryDcaLocaltion.vue | 2
admin/src/views/business/categoryDbhLocaltion.vue | 2
server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java | 5 ++
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 1
admin/src/components/business/OperaCompanyWindow.vue | 6 +-
admin/src/router/index.js | 4 +-
admin/src/components/business/OperaCategoryDcaProblemWindow.vue | 2
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue | 6 ++
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java | 4 +-
19 files changed, 99 insertions(+), 20 deletions(-)
diff --git a/admin/src/components/business/OperaCategoryDcaProblemWindow.vue b/admin/src/components/business/OperaCategoryDcaProblemWindow.vue
index 537ad98..b097f5c 100644
--- a/admin/src/components/business/OperaCategoryDcaProblemWindow.vue
+++ b/admin/src/components/business/OperaCategoryDcaProblemWindow.vue
@@ -125,7 +125,7 @@
open (title, target, categorys, categoryType, parentId) {
this.title = title
this.categorys = JSON.parse(JSON.stringify(categorys||[]));
- console.log(this.categorys)
+ console.log(parentId)
this.visible = true
this.form = {
id: null,
diff --git a/admin/src/components/business/OperaCategoryWindow.vue b/admin/src/components/business/OperaCategoryWindow.vue
index 252600a..6abc7b5 100644
--- a/admin/src/components/business/OperaCategoryWindow.vue
+++ b/admin/src/components/business/OperaCategoryWindow.vue
@@ -113,7 +113,7 @@
this.title = title
this.categorys = JSON.parse(JSON.stringify(categorys||[]));
// this.categorys = this.getTreeData(this.categorys)
- console.log(this.categorys)
+ console.log(parentId)
this.visible = true
this.form = {
id: null,
@@ -122,7 +122,7 @@
remark: '',
categoryList: [],
sortnum: null,
- parentId: parentId
+ parentId: parentId || null
}
this.form.type = categoryType
// 鏂板缓
diff --git a/admin/src/components/business/OperaCompanyWindow.vue b/admin/src/components/business/OperaCompanyWindow.vue
index f4a1a99..7695140 100644
--- a/admin/src/components/business/OperaCompanyWindow.vue
+++ b/admin/src/components/business/OperaCompanyWindow.vue
@@ -80,9 +80,9 @@
status: '',
sortnum: '',
imgurl: '',
- type: '',
- parentId: '',
- code: '',
+ type: null,
+ parentId: null,
+ code: null,
qwId: '',
namePath: '',
idPath: ''
diff --git a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
index 1010211..bd64f1d 100644
--- a/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
@@ -35,7 +35,7 @@
<div class="value">{{ info.submitDate }}</div>
</div>
<div class="item">
- <div class="label">鍙戠敓鏃堕棿</div>
+ <div class="label">鍙戠幇鏃堕棿</div>
<div class="value">{{ info.happenTime}}</div>
</div>
<div class="item">
@@ -50,6 +50,10 @@
<div class="label">椋庨櫓鎻忚堪</div>
<div class="value">{{ info.riskInfo }}</div>
</div>
+ <div class="item">
+ <div class="label">閫氱煡浜�</div>
+ <div class="value">{{ info.memberNames }}</div>
+ </div>
<div class="item" style="width: 100%">
<div class="label">鍥剧墖</div>
<div class="value" v-if="info.multifileList ==null || !info.multifileList.length">鏃�</div>
diff --git a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
index 225d4a7..d1d92d5 100644
--- a/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
+++ b/admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -79,6 +79,9 @@
<div class="table_info">
<div class="title">涓嶇鍚堥」宸ュ崟鍒楄〃</div>
<el-table :data="info.dcaChildList" border fit>
+ <el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
+ <template slot-scope="scope">{{ scope.$index+1}}</template>
+ </el-table-column>
<el-table-column label="宸ュ崟鍙�" prop="code" min-width="100">
<template slot-scope="{row}">
<span style="color: #2E68EC;cursor: pointer" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA涓嶇鍚堥」宸ュ崟璇︽儏', row)" >{{ row.code || '-'}}</span>
@@ -101,6 +104,17 @@
<!--<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">鍒犻櫎</el-button>-->
</template>
</el-table-column>
+ </el-table>
+ </div>
+ <div class="table_info">
+ <div class="title">绗﹀悎椤瑰垪琛�</div>
+ <el-table :data="dataList2" border fit>
+ <el-table-column prop="index" label="搴忓彿" width="55" fixed="left">
+ <template slot-scope="scope">{{ scope.$index+1}}</template>
+ </el-table-column>
+ <el-table-column label="涓�绾т富棰�" prop="typeName" min-width="160"> </el-table-column>
+ <el-table-column label="浜岀骇涓婚" prop="categoryName" min-width="150"> </el-table-column>
+ <el-table-column label="瑙傚療椤�" prop="problemTitle" min-width="400"> </el-table-column>
</el-table>
</div>
</div>
@@ -129,6 +143,7 @@
type: null,
title: '宸ュ崟璇︽儏',
info: {},
+ dataList2: [],
statusMap: {
0: '寰呭垎閰峎TS',
1: '寰呭垎閰嶄换鍔�',
@@ -159,6 +174,7 @@
getDetail () {
getById(this.info.id).then(res => {
this.info = res
+ this.getDataListByRemak()
if (this.info.logList && this.info.logList.length > 0) {
this.info.logList.forEach(item => {
if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
@@ -172,6 +188,25 @@
}
})
},
+ getDataListByRemak () {
+ this.dataList2 =[]
+ if(this.info.remark){
+ var obj = JSON.parse(this.info.remark)
+ console.log(obj)
+ if(obj && obj.childMapList){
+ obj.childMapList.forEach(item =>{
+ if(item && item.problemMapList){
+ item.problemMapList.forEach(item1 =>{
+ if(item1 && item1.status === 1){
+ this.dataList2.push({'typeName':this.info.typeName, 'categoryName':item.childTitle,'problemTitle':item1.title})
+ }
+ })
+ }
+ })
+ }
+
+ }
+ },
reject () { },
handleAvatarSuccess () { },
beforeAvatarUpload () { }
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index 49fa0a7..c8bf2a8 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -111,9 +111,9 @@
const height3 = getEleHeghtByClassName('main-header', 0)
// const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
const height2 = getEleHeghtByClassName('toolbar', 0)
- console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
+ // console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
- console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
+ // console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
}
function getEleHeghtByClassName (name, dv, margin) {
diff --git a/admin/src/views/business/category.vue b/admin/src/views/business/category.vue
index 53c4b8a..f2c1d6a 100644
--- a/admin/src/views/business/category.vue
+++ b/admin/src/views/business/category.vue
@@ -132,7 +132,7 @@
sortnum: '',
imgurl: '',
type: '',
- parentId: '',
+ parentId: null,
namePath: '',
idPath: ''
}
diff --git a/admin/src/views/business/categoryDbhLocaltion.vue b/admin/src/views/business/categoryDbhLocaltion.vue
index 71bb8c6..3d21b0d 100644
--- a/admin/src/views/business/categoryDbhLocaltion.vue
+++ b/admin/src/views/business/categoryDbhLocaltion.vue
@@ -71,7 +71,7 @@
keyword: '',
type: 2,
isRoot: 1,
- parentId: '',
+ parentId: null,
parentIdPath: null
},
loading: false,
diff --git a/admin/src/views/business/categoryDbhType.vue b/admin/src/views/business/categoryDbhType.vue
index 14defd3..365dae2 100644
--- a/admin/src/views/business/categoryDbhType.vue
+++ b/admin/src/views/business/categoryDbhType.vue
@@ -70,7 +70,7 @@
name: '',
keyword: '',
type: 1,
- parentId: '',
+ parentId: null,
isRoot: 1,
parentIdPath: null
},
diff --git a/admin/src/views/business/categoryDcaLocaltion.vue b/admin/src/views/business/categoryDcaLocaltion.vue
index d69d644..33001b4 100644
--- a/admin/src/views/business/categoryDcaLocaltion.vue
+++ b/admin/src/views/business/categoryDcaLocaltion.vue
@@ -71,7 +71,7 @@
keyword: '',
type: 3,
isRoot: 1,
- parentId: '',
+ parentId: null,
parentIdPath: null
},
loading: false,
diff --git a/admin/src/views/business/categoryDcaProblem.vue b/admin/src/views/business/categoryDcaProblem.vue
index 862ab1e..14937da 100644
--- a/admin/src/views/business/categoryDcaProblem.vue
+++ b/admin/src/views/business/categoryDcaProblem.vue
@@ -78,7 +78,7 @@
name: '',
keyword: '',
type: 4,
- parentId: '',
+ parentId: null,
isRoot: 1,
parentIdPath: null
},
diff --git a/admin/src/views/business/categorySheLocaltion.vue b/admin/src/views/business/categorySheLocaltion.vue
index f359fcd..c305190 100644
--- a/admin/src/views/business/categorySheLocaltion.vue
+++ b/admin/src/views/business/categorySheLocaltion.vue
@@ -70,7 +70,7 @@
name: '',
keyword: '',
type: 5,
- parentId: '',
+ parentId: null,
isRoot: 1,
parentIdPath: null
},
diff --git a/admin/src/views/business/categorySheType.vue b/admin/src/views/business/categorySheType.vue
index 61d2307..9061dc5 100644
--- a/admin/src/views/business/categorySheType.vue
+++ b/admin/src/views/business/categorySheType.vue
@@ -70,7 +70,7 @@
name: '',
keyword: '',
type: 0,
- parentId: '',
+ parentId: null,
isRoot: 1,
parentIdPath: null
},
diff --git a/admin/src/views/business/companyNormal.vue b/admin/src/views/business/companyNormal.vue
index cfe4c7e..73439d5 100644
--- a/admin/src/views/business/companyNormal.vue
+++ b/admin/src/views/business/companyNormal.vue
@@ -88,7 +88,7 @@
sortnum: '',
imgurl: '',
type: '',
- parentId: '',
+ parentId: null,
code: '',
qwId: '',
namePath: '',
diff --git a/admin/src/views/business/workorderDbh.vue b/admin/src/views/business/workorderDbh.vue
index a97e340..3e28e14 100644
--- a/admin/src/views/business/workorderDbh.vue
+++ b/admin/src/views/business/workorderDbh.vue
@@ -71,6 +71,7 @@
</template>
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberNames" label="閫氱煡浜�" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
diff --git a/server/src/main/java/com/doumee/api/web/WebMemberController.java b/server/src/main/java/com/doumee/api/web/WebMemberController.java
index 24cca6a..3f8ca41 100644
--- a/server/src/main/java/com/doumee/api/web/WebMemberController.java
+++ b/server/src/main/java/com/doumee/api/web/WebMemberController.java
@@ -19,6 +19,12 @@
import org.springframework.web.server.ServerWebExchange;
import javax.annotation.Resource;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
/**
* JWT鑾峰彇浠ょ墝鍜屽埛鏂颁护鐗屾帴鍙�
@@ -90,4 +96,33 @@
return ApiResponse.failed( "鐧诲綍宸插け鏁�");
}
+ @ApiOperation("鑾峰彇浼佷笟寰俊JS绛惧悕")
+ @PostMapping("/getQwSignature")
+ @ResponseBody
+ public ApiResponse<Object> getQwSignature(@RequestBody String url) {
+
+ /* Map jsapiTicket = s;
+ String ticket = jsapiTicket.get("ticket").toString();
+ String noncestr = UUID.randomUUID().toString();
+ Long timestamp = System.currentTimeMillis() / 1000;
+
+ String jsapiTicketStr = ticket + "&noncestr=" + noncestr + "×tamp=" + timestamp + "&url=" + url;
+ try {
+ MessageDigest instance = MessageDigest.getInstance("SHA-1");
+ instance.update(jsapiTicketStr.getBytes());
+ byte[] digest = instance.digest();
+ BigInteger bigInteger = new BigInteger(1, digest);
+ String string = bigInteger.toString();
+ Map<String, Object> result = new HashMap<>();
+ result.put("noncestr", noncestr);
+ result.put("jsapi_ticket", string);
+ result.put("timestamp", timestamp);
+ result.put("url", url);
+ result.put("ticket", ticket);
+ return ApiResponse.success( result);
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ }*/
+ return ApiResponse.failed( "鑾峰彇绛惧悕澶辫触");
+ }
}
\ No newline at end of file
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
index 87b449b..afd73f1 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
@@ -49,8 +49,11 @@
@ApiModelProperty("鎻愭姤浜哄憳鎵�灞為儴闂�")
@ExcelColumn(name="鎵�灞為儴闂�",index =14,width = 8)
private String companyName;
+ @ApiModelProperty("閫氱煡浜�")
+ @ExcelColumn(name="閫氱煡浜�",index =15,width = 10)
+ private String memberNames;
@ApiModelProperty(value = "鎻愪氦鏃堕棿")
- @ExcelColumn(name="鎻愪氦鏃堕棿",index =15 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
+ @ExcelColumn(name="鎻愪氦鏃堕棿",index =16 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date createDate;
diff --git a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
index 8572770..7fe4129 100644
--- a/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
+++ b/server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
@@ -32,10 +32,10 @@
@ExcelColumn(name="鍙戠幇鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date happenTime;
@ApiModelProperty(value = "绗﹀悎椤规暟閲�", example = "1")
- @ExcelColumn(name="绗﹀悎椤规暟閲�",index =7,width = 4)
+ @ExcelColumn(name="绗﹀悎椤规暟閲�",index =7,width = 8)
private Integer dcaYesNum;
@ApiModelProperty(value = "涓嶇鍚堥」鏁伴噺", example = "1")
- @ExcelColumn(name="涓嶇鍚堥」鏁伴噺",index =8,width = 4)
+ @ExcelColumn(name="涓嶇鍚堥」鏁伴噺",index =8,width = 8)
private Integer dcaNoNum;
@ApiModelProperty(value = "浣嶇疆", example = "1")
@ExcelColumn(name="浣嶇疆",index =9 ,width = 10)
diff --git a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index aa0f18f..80c984b 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -199,6 +199,7 @@
@Override
public List<Category> findList(Category category) {
+ category.setIsdeleted(Constants.ZERO);
MPJLambdaWrapper<Category> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Category.class);
queryWrapper.selectAs(SystemUser::getUsername,Category::getEditorName);
--
Gitblit v1.9.3