Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…
…eb into master-500-dev-lushangqing
Showing
8 changed files
with
100 additions
and
14 deletions
| @@ -230,11 +230,23 @@ | @@ -230,11 +230,23 @@ | ||
| 230 | </div> | 230 | </div> |
| 231 | </div> | 231 | </div> |
| 232 | </div> | 232 | </div> |
| 233 | - | ||
| 234 | {{# }); }} | 233 | {{# }); }} |
| 235 | {{# if(d && d.list && d.list.length === 0){ }} | 234 | {{# if(d && d.list && d.list.length === 0){ }} |
| 236 | <div class="data-empty">暂无数据</div> | 235 | <div class="data-empty">暂无数据</div> |
| 237 | {{# } }} | 236 | {{# } }} |
| 237 | + | ||
| 238 | + {{# if(d && d.bizId){ }} | ||
| 239 | + | ||
| 240 | + <div style="width: 99.5%;"> | ||
| 241 | + <div class="layui-card"> | ||
| 242 | + <div class="layui-card-header" style="background-color: #F2F2F2;font-size: 18px;font-weight: 700;text-align: center;line-height: 45px;color: #666;">{{d.bizName == undefined ? '' : d.bizName}}业务文档</div> | ||
| 243 | + <div class="layui-card-body" style="border: 1px solid #ECE8E8;margin-bottom: 10px;border-radius: 3px;cursor: pointer;border-top: none;"> | ||
| 244 | + <iframe src="/vue3/index.html#/bus/doc?bizId={{d.bizId}}&bizName={{d.bizName}}" style="width:100%;height:500px;border: none;"/> | ||
| 245 | + </div> | ||
| 246 | + </div> | ||
| 247 | + </div> | ||
| 248 | + {{# } }} | ||
| 249 | + | ||
| 238 | </script> | 250 | </script> |
| 239 | 251 | ||
| 240 | <script type="text/html" id="biz-treetable-countTpl"> | 252 | <script type="text/html" id="biz-treetable-countTpl"> |
| @@ -70,13 +70,9 @@ | @@ -70,13 +70,9 @@ | ||
| 70 | <div class="select-all" v-if="isSelect"> | 70 | <div class="select-all" v-if="isSelect"> |
| 71 | <el-button type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" > | 71 | <el-button type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" > |
| 72 | {{selectText}} | 72 | {{selectText}} |
| 73 | - | ||
| 74 | </el-button> | 73 | </el-button> |
| 75 | - | ||
| 76 | - | ||
| 77 | </div> | 74 | </div> |
| 78 | <div style="text-align: right;width: 150px"> | 75 | <div style="text-align: right;width: 150px"> |
| 79 | - | ||
| 80 | <el-button-group> | 76 | <el-button-group> |
| 81 | <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''" | 77 | <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''" |
| 82 | @click="activeModel('view')"> | 78 | @click="activeModel('view')"> |
| @@ -28,6 +28,12 @@ export default { | @@ -28,6 +28,12 @@ export default { | ||
| 28 | type: String, | 28 | type: String, |
| 29 | default: '' | 29 | default: '' |
| 30 | }, | 30 | }, |
| 31 | + // 是否虚拟，乙方运维文件夹节点是虚拟节点 | ||
| 32 | + // 业务视图管理文档不是虚拟的 | ||
| 33 | + checkAuth:{ | ||
| 34 | + type:Boolean, | ||
| 35 | + default:true | ||
| 36 | + }, | ||
| 31 | fileIds: { | 37 | fileIds: { |
| 32 | type: Array, | 38 | type: Array, |
| 33 | default: [] | 39 | default: [] |
| @@ -185,6 +191,12 @@ export default { | @@ -185,6 +191,12 @@ export default { | ||
| 185 | } | 191 | } |
| 186 | }, | 192 | }, |
| 187 | { | 193 | { |
| 194 | + prop: 'fname', | ||
| 195 | + label: '文档分类', | ||
| 196 | + sortable: true, | ||
| 197 | + width: '120px' | ||
| 198 | + }, | ||
| 199 | + { | ||
| 188 | prop: 'createUser', | 200 | prop: 'createUser', |
| 189 | label: '提交人', | 201 | label: '提交人', |
| 190 | sortable: true, | 202 | sortable: true, |
| @@ -282,7 +294,8 @@ export default { | @@ -282,7 +294,8 @@ export default { | ||
| 282 | id: id, | 294 | id: id, |
| 283 | name: keyWord.value, | 295 | name: keyWord.value, |
| 284 | types: props.types.join(','), | 296 | types: props.types.join(','), |
| 285 | - docIds: docIds | 297 | + docIds: docIds, |
| 298 | + checkAuth: props.checkAuth | ||
| 286 | } | 299 | } |
| 287 | let url = `/inspection-report/file/document/list`; | 300 | let url = `/inspection-report/file/document/list`; |
| 288 | if (props.isRecycle) { | 301 | if (props.isRecycle) { |
| @@ -581,10 +594,10 @@ export default { | @@ -581,10 +594,10 @@ export default { | ||
| 581 | */ | 594 | */ |
| 582 | let searchFile = () => { | 595 | let searchFile = () => { |
| 583 | let keyWords = keyWord.value; | 596 | let keyWords = keyWord.value; |
| 584 | - if (keyWords == '') { | ||
| 585 | - proxy.$global.showMsg("请输入关键字！", "warning") | ||
| 586 | - return; | ||
| 587 | - } | 597 | + // if (keyWords == '') { |
| 598 | + // proxy.$global.showMsg("请输入关键字！", "warning") | ||
| 599 | + // return; | ||
| 600 | + // } | ||
| 588 | getPage(''); | 601 | getPage(''); |
| 589 | 602 | ||
| 590 | } | 603 | } |
| @@ -98,6 +98,11 @@ const routes = [{ | @@ -98,6 +98,11 @@ const routes = [{ | ||
| 98 | name: 'resList', | 98 | name: 'resList', |
| 99 | component: () => myImport('views/res/list/index') | 99 | component: () => myImport('views/res/list/index') |
| 100 | }, | 100 | }, |
| 101 | + { | ||
| 102 | + path: '/bus/doc', | ||
| 103 | + name: 'busDoc', | ||
| 104 | + component: () => myImport('views/busDoc/index') | ||
| 105 | + }, | ||
| 101 | ]; | 106 | ]; |
| 102 | 107 | ||
| 103 | // hash模式： createWebHashHistory | 108 | // hash模式： createWebHashHistory |
| 1 | +export default { | ||
| 2 | + name: 'projectDOCndex', | ||
| 3 | + template: '', | ||
| 4 | + components: {}, | ||
| 5 | + data() { | ||
| 6 | + return {} | ||
| 7 | + }, | ||
| 8 | + props: { | ||
| 9 | + // 文件类型 | ||
| 10 | + docType: { | ||
| 11 | + type: String, | ||
| 12 | + default: '' | ||
| 13 | + }, | ||
| 14 | + // 文件类型 | ||
| 15 | + docTypeName: { | ||
| 16 | + type: String, | ||
| 17 | + default: '业务文档' | ||
| 18 | + }, | ||
| 19 | + // 是否展示新建文件按钮 | ||
| 20 | + canAddFolder: { | ||
| 21 | + type: Boolean, | ||
| 22 | + default: true | ||
| 23 | + }, | ||
| 24 | + | ||
| 25 | + }, | ||
| 26 | + setup(props, {attrs, slots, emit}) { | ||
| 27 | + const {proxy} = Vue.getCurrentInstance(); | ||
| 28 | + let bizId = proxy.$global.getQueryVariable('bizId'); | ||
| 29 | + let bizName = proxy.$global.getQueryVariable('bizName') | ||
| 30 | + if(!bizName){ | ||
| 31 | + bizName = ""; | ||
| 32 | + } | ||
| 33 | + props.docTypeName = decodeURI(bizName) + "业务文档"; | ||
| 34 | + props.docType = bizId; | ||
| 35 | + | ||
| 36 | + // 监听编辑状态 | ||
| 37 | + Vue.watch(() => props.treeNode, (newValue, oldVlaue) => { | ||
| 38 | + }); | ||
| 39 | + | ||
| 40 | + // 挂载完 | ||
| 41 | + Vue.onMounted(() => { | ||
| 42 | + }) | ||
| 43 | + | ||
| 44 | + return {} | ||
| 45 | + } | ||
| 46 | +} |
| @@ -12,6 +12,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -12,6 +12,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 12 | var common = layui.common; | 12 | var common = layui.common; |
| 13 | var commonDetail = layui.commonDetail; | 13 | var commonDetail = layui.commonDetail; |
| 14 | var busId = '';//当前业务Id | 14 | var busId = '';//当前业务Id |
| 15 | + var busName = ''; | ||
| 15 | var appId = ''; | 16 | var appId = ''; |
| 16 | var curTreeNode = ''; | 17 | var curTreeNode = ''; |
| 17 | var curBizResType = '';//当前业务所在的资源类型 | 18 | var curBizResType = '';//当前业务所在的资源类型 |
| @@ -189,8 +190,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -189,8 +190,10 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 189 | curTreeNode = node; | 190 | curTreeNode = node; |
| 190 | curBizResType = node.data.id; | 191 | curBizResType = node.data.id; |
| 191 | if (node.data.code) { | 192 | if (node.data.code) { |
| 192 | - busId = JSON.parse(node.data.code)["busId"]; | ||
| 193 | - appId = JSON.parse(node.data.code)["appId"]; | 193 | + var itemData = JSON.parse(node.data.code); |
| 194 | + busId = itemData["busId"]; | ||
| 195 | + busName = itemData['busTypeName']; | ||
| 196 | + appId = itemData["appId"]; | ||
| 194 | } | 197 | } |
| 195 | var el = null; | 198 | var el = null; |
| 196 | if (node.data.children) { | 199 | if (node.data.children) { |
| @@ -473,7 +476,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | @@ -473,7 +476,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 473 | url: common.domainName + "/api-web/datavis/getResTotal/?busId=" + bizId | 476 | url: common.domainName + "/api-web/datavis/getResTotal/?busId=" + bizId |
| 474 | , done: function (res) { | 477 | , done: function (res) { |
| 475 | if (res.data!=null){ | 478 | if (res.data!=null){ |
| 476 | - laytpl($('#bizindexTpl').html()).render({list: res.data}, function (html) { | 479 | + laytpl($('#bizindexTpl').html()).render({list: res.data,bizId:bizId,bizName:busName}, function (html) { |
| 477 | bizindexTable.html(html); | 480 | bizindexTable.html(html); |
| 478 | }); | 481 | }); |
| 479 | }else { | 482 | }else { |
| @@ -193,7 +193,11 @@ const routes = [{ | @@ -193,7 +193,11 @@ const routes = [{ | ||
| 193 | path: '/alarmsKnowledge', | 193 | path: '/alarmsKnowledge', |
| 194 | name: 'alarmsKnowledge', | 194 | name: 'alarmsKnowledge', |
| 195 | component: () => myImport('views/alarmsClearEditor/knowledge/index'), | 195 | component: () => myImport('views/alarmsClearEditor/knowledge/index'), |
| 196 | - } | 196 | + },{ |
| 197 | + path: '/bus/doc', | ||
| 198 | + name: 'busDoc', | ||
| 199 | + component: () => myImport('views/busDoc/index') | ||
| 200 | + }, | ||
| 197 | ]; | 201 | ]; |
| 198 | 202 | ||
| 199 | // hash模式： createWebHashHistory | 203 | // hash模式： createWebHashHistory |
-
Please register or login to post a comment