乙方运维-【无】-入场资料及月度总结代码迁移
Showing
4 changed files
with
24 additions
and
13 deletions
@@ -63,10 +63,9 @@ export default { | @@ -63,10 +63,9 @@ export default { | ||
63 | // 查询绑定的文件列表 | 63 | // 查询绑定的文件列表 |
64 | let params = { | 64 | let params = { |
65 | opsId: props.projectId, | 65 | opsId: props.projectId, |
66 | - personId: personId, | ||
67 | - code: code ? code : props.treeNode.map.nodeType.code | 66 | + personId: props.parentNode.id, |
67 | + code: props.treeNode.map.nodeType.code | ||
68 | } | 68 | } |
69 | - | ||
70 | proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { | 69 | proxy.$http.get('/api-web/bOpsFile/search', params, function (res) { |
71 | if (res && res.code == 0 && res.data && res.data.length > 0) { | 70 | if (res && res.code == 0 && res.data && res.data.length > 0) { |
72 | 71 | ||
@@ -91,7 +90,7 @@ export default { | @@ -91,7 +90,7 @@ export default { | ||
91 | id: docIds.join(','), | 90 | id: docIds.join(','), |
92 | } | 91 | } |
93 | proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) { | 92 | proxy.$http.get('/api-web/bOpsFile/deleteSearch', param, function (res) { |
94 | - | 93 | + emit('callback',true); |
95 | }) | 94 | }) |
96 | } | 95 | } |
97 | 96 | ||
@@ -108,8 +107,7 @@ export default { | @@ -108,8 +107,7 @@ export default { | ||
108 | 107 | ||
109 | proxy.$http.post('/api-web/bOpsFile/fileSynchronization', params, function (res) { | 108 | proxy.$http.post('/api-web/bOpsFile/fileSynchronization', params, function (res) { |
110 | if (res && res.code == 0) { | 109 | if (res && res.code == 0) { |
111 | - // proxy.$global.showMsg(""); | ||
112 | - console.log('执行回调成功', res) | 110 | + emit('callback',true); |
113 | } | 111 | } |
114 | }); | 112 | }); |
115 | } | 113 | } |
1 | <div> | 1 | <div> |
2 | <div> | 2 | <div> |
3 | <!-- 人员信息总汇--> | 3 | <!-- 人员信息总汇--> |
4 | - <el-divider content-position="left">人员信息汇总</el-divider> | 4 | + <el-divider content-position="left"> |
5 | + 人员信息汇总 | ||
6 | + <el-tooltip placement="bottom-start" effect="light"> | ||
7 | + <template #content> 人员信息统计规则:<br/> • 左侧树:只统计业务下在职运维人员<br/> •人员信息汇总:统计业务下所有运维人员 </template> | ||
8 | + <i class="iconfont icon-tishi" style="color:rgb(30,159,255);"></i> | ||
9 | + </el-tooltip> | ||
10 | + </el-divider> | ||
5 | <el-button :size="$global.elementConfig.size.button" @click="deleteUser()" | 11 | <el-button :size="$global.elementConfig.size.button" @click="deleteUser()" |
6 | style="float:right;margin-right: 6px;margin-bottom: 6px">删除 | 12 | style="float:right;margin-right: 6px;margin-bottom: 6px">删除 |
7 | </el-button> | 13 | </el-button> |
@@ -31,7 +37,7 @@ | @@ -31,7 +37,7 @@ | ||
31 | :pageSize="pageSize" | 37 | :pageSize="pageSize" |
32 | :parentNode="parentNode" | 38 | :parentNode="parentNode" |
33 | :projectId="projectId" :treeNode="treeNode" @showPopout="showPopout" height="500" | 39 | :projectId="projectId" :treeNode="treeNode" @showPopout="showPopout" height="500" |
34 | - v-bind:is="componentName"></component> | 40 | + v-bind:is="componentName" @callback="refreshPage"></component> |
35 | </div> | 41 | </div> |
36 | </template> | 42 | </template> |
37 | </cm-dialog> | 43 | </cm-dialog> |
@@ -135,7 +135,8 @@ export default { | @@ -135,7 +135,8 @@ export default { | ||
135 | docType.value = "THREE_PERSONAGE_NDA"; | 135 | docType.value = "THREE_PERSONAGE_NDA"; |
136 | docTypeName.value = "入场资料"; | 136 | docTypeName.value = "入场资料"; |
137 | props.parentNode.id = row.id; | 137 | props.parentNode.id = row.id; |
138 | - // showDialog(true); | 138 | + props.treeNode.map.nodeType.code ="THREE_PERSONAGE_NDA"; |
139 | + showDialog(true); | ||
139 | }, | 140 | }, |
140 | render: function (row) { | 141 | render: function (row) { |
141 | if (row.personalSecrecyBook == "YES") { | 142 | if (row.personalSecrecyBook == "YES") { |
@@ -156,8 +157,8 @@ export default { | @@ -156,8 +157,8 @@ export default { | ||
156 | docType.value = "THREE_MONTHLY_SUMMARY"; | 157 | docType.value = "THREE_MONTHLY_SUMMARY"; |
157 | docTypeName.value = "月度总结"; | 158 | docTypeName.value = "月度总结"; |
158 | props.parentNode.id = row.id; | 159 | props.parentNode.id = row.id; |
159 | - | ||
160 | - // showDialog(true); | 160 | + props.treeNode.map.nodeType.code ="THREE_MONTHLY_SUMMARY"; |
161 | + showDialog(true); | ||
161 | }, | 162 | }, |
162 | render: function (row) { | 163 | render: function (row) { |
163 | if (row.monthlySummary == "YES") { | 164 | if (row.monthlySummary == "YES") { |
@@ -244,7 +245,9 @@ export default { | @@ -244,7 +245,9 @@ export default { | ||
244 | }); | 245 | }); |
245 | } | 246 | } |
246 | 247 | ||
247 | - | 248 | + let refreshPage= () => { |
249 | + getPage(); | ||
250 | + } | ||
248 | // 挂载完 | 251 | // 挂载完 |
249 | Vue.onMounted(() => { | 252 | Vue.onMounted(() => { |
250 | getPage(); | 253 | getPage(); |
@@ -277,7 +280,8 @@ export default { | @@ -277,7 +280,8 @@ export default { | ||
277 | deleteUser, | 280 | deleteUser, |
278 | showPopout, | 281 | showPopout, |
279 | selectionChange, | 282 | selectionChange, |
280 | - id | 283 | + id, |
284 | + refreshPage | ||
281 | } | 285 | } |
282 | } | 286 | } |
283 | } | 287 | } |
@@ -64,6 +64,7 @@ export default { | @@ -64,6 +64,7 @@ export default { | ||
64 | proxy.$http.get("/api-web/bOpsProject/getTree", params, function (res) { | 64 | proxy.$http.get("/api-web/bOpsProject/getTree", params, function (res) { |
65 | if (res && res.data) { | 65 | if (res && res.data) { |
66 | dataSource.value = res.data; | 66 | dataSource.value = res.data; |
67 | + projectId.value = res.data[0].dataList[0].id; | ||
67 | treeNode.value = res.data[0]; | 68 | treeNode.value = res.data[0]; |
68 | } else { | 69 | } else { |
69 | proxy.$global.showMsg('暂无数据!'); | 70 | proxy.$global.showMsg('暂无数据!'); |
@@ -110,7 +111,9 @@ export default { | @@ -110,7 +111,9 @@ export default { | ||
110 | pageSize.value = 10; | 111 | pageSize.value = 10; |
111 | } | 112 | } |
112 | getParent(dataSource.value, data.parentId); | 113 | getParent(dataSource.value, data.parentId); |
114 | + if (data.level==1){ | ||
113 | projectId.value = data.map.nodeType.projectId; | 115 | projectId.value = data.map.nodeType.projectId; |
116 | + } | ||
114 | treeNode.value = data; | 117 | treeNode.value = data; |
115 | componentName.value = comName; | 118 | componentName.value = comName; |
116 | } | 119 | } |
-
Please register or login to post a comment