diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2fbb6786..fdd30735 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -54,7 +54,7 @@ export default { - diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue index 6d562da8..356e2683 100644 --- a/src/views/xm/rpt/branch/menuDayTrend.vue +++ b/src/views/xm/rpt/branch/menuDayTrend.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue index 18c9291d..32966da1 100644 --- a/src/views/xm/rpt/branch/questionDayTrend.vue +++ b/src/views/xm/rpt/branch/questionDayTrend.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/common.scss b/src/views/xm/rpt/common.scss index 0f8c598f..3caea1cb 100644 --- a/src/views/xm/rpt/common.scss +++ b/src/views/xm/rpt/common.scss @@ -1,10 +1,39 @@ -.m_container { - width: 100%; - height: 100%; - background: rgb(238, 238, 238); - .m_content { - padding:30px 18px 18px 18px; - overflow: hidden; - position: relative; + + .row-box{ + margin-left: 20px; + .rpt-title{ + font-weight: 600; + font-size: x-large; + visibility: visible; + text-align: center; + } + .title{ + font-weight: 600; + font-size: large; + visibility: visible; + } + .remark{ + visibility: visible; + } + .input { + visibility: hidden; + z-index: 10000; + top: 0%; + left:0%; + position:absolute; + } + } + .row-box.cfg:hover{ + .rpt-title{ + visibility: hidden; } -} \ No newline at end of file + .title{ + visibility: hidden; + } + .remark{ + visibility: hidden; + } + .input{ + visibility: visible; + } + } \ No newline at end of file diff --git a/src/views/xm/rpt/index.scss b/src/views/xm/rpt/index.scss index 6af3f521..8b137891 100644 --- a/src/views/xm/rpt/index.scss +++ b/src/views/xm/rpt/index.scss @@ -1,98 +1 @@ -.m_top { - background: #fff; - display: flex; - flex-direction: row; - height: 100px; - align-items: center; - border: 1px solid #ebeef5; - margin: 0 10px; - .m_avatar { - width: 52px; - height: 52px; - margin-left: 34px; - } - .m_msg { - margin-left: 22px; - p:nth-child(1) { - font-size: 20px; - font-weight: bold; - color: #7D7D7D; - opacity: 0.92; - } - p:nth-child(2) { - margin-top: 12px; - font-size: 14px; - font-weight: bold; - color: #7D7D7D; - opacity: 0.53; - } - } - .m_btn { - margin-left: auto; - margin-right: 20px; - } -} - - -.m_middle { - display: flex; - flex-direction: row; - margin-top: 20px; - height: 280px; - .m_left, .m_right { - flex: 1; - padding: 30px; - background: #fff; - border: 1px solid #ebeef5; - } - .m_left { - display: flex; - flex-direction: row; - margin-right: 10px; - margin-left: 10px; - .m_left_1 { - flex: 1.5; - p { - font-size: 18px; - margin-bottom: 20px; - } - span { - font-size: 15px; - line-height: 42px; - color: #7D7D7D; - } - } - .m_left_2 { - flex: 1; - img { - width: 100%; - margin-left: 20px; - margin-top: 10px; - } - } - } - - .m_right { - display: flex; - flex-direction: row; - flex-wrap: wrap; - margin-right: 10px; - .m_right_menu { - display: flex; - width: 33.3%; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: 16px; - cursor: pointer; - img { - width: 58px; - height: 58px; - } - span { - margin-top: 12px; - } - } - } -} diff --git a/src/views/xm/rpt/index.vue b/src/views/xm/rpt/index.vue index 9d683cd6..86db9fbc 100644 --- a/src/views/xm/rpt/index.vue +++ b/src/views/xm/rpt/index.vue @@ -48,5 +48,7 @@ export default { } - + \ No newline at end of file diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue index f5226046..9407edc2 100644 --- a/src/views/xm/rpt/iteration/burnout.vue +++ b/src/views/xm/rpt/iteration/burnout.vue @@ -4,10 +4,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue index 7a3b7ed9..e881809e 100644 --- a/src/views/xm/rpt/iteration/menuDayTrend.vue +++ b/src/views/xm/rpt/iteration/menuDayTrend.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue index d04437a6..1b065842 100644 --- a/src/views/xm/rpt/iteration/questionDayTrend.vue +++ b/src/views/xm/rpt/iteration/questionDayTrend.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue index b593fead..eba64af3 100644 --- a/src/views/xm/rpt/product/menuAgeDist.vue +++ b/src/views/xm/rpt/product/menuAgeDist.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue index 849dff97..fd7d1561 100644 --- a/src/views/xm/rpt/product/menuAttDist.vue +++ b/src/views/xm/rpt/product/menuAttDist.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue index 179bf273..17f4f9dd 100644 --- a/src/views/xm/rpt/product/menuDayTrend.vue +++ b/src/views/xm/rpt/product/menuDayTrend.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue index 0846a87a..973b6e74 100644 --- a/src/views/xm/rpt/product/menuSort.vue +++ b/src/views/xm/rpt/product/menuSort.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue index fe16872b..5ae7fc61 100644 --- a/src/views/xm/rpt/product/questionAgeDist.vue +++ b/src/views/xm/rpt/product/questionAgeDist.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue index 56b4be89..dfb9ca2e 100644 --- a/src/views/xm/rpt/product/questionAttDist.vue +++ b/src/views/xm/rpt/product/questionAttDist.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue index 3f25f3e7..a8fb40d7 100644 --- a/src/views/xm/rpt/product/questionDayTrend.vue +++ b/src/views/xm/rpt/product/questionDayTrend.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue index cf6e509e..aa1e1ec8 100644 --- a/src/views/xm/rpt/product/questionRetestDist.vue +++ b/src/views/xm/rpt/product/questionRetestDist.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue index 9425b4bd..9bd30f4a 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -2,10 +2,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue index 595fe457..3036778d 100644 --- a/src/views/xm/rpt/project/taskAgeDist.vue +++ b/src/views/xm/rpt/project/taskAgeDist.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index 5d89bd39..99b3cfe6 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue index 198fa7a1..f0db9b00 100644 --- a/src/views/xm/rpt/project/taskDayTrend.vue +++ b/src/views/xm/rpt/project/taskDayTrend.vue @@ -4,10 +4,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue index b46446df..1f773633 100644 --- a/src/views/xm/rpt/project/taskSort.vue +++ b/src/views/xm/rpt/project/taskSort.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/testCase/testCaseSort.vue b/src/views/xm/rpt/testCase/testCaseSort.vue index 4eddb5ef..676a80b0 100644 --- a/src/views/xm/rpt/testCase/testCaseSort.vue +++ b/src/views/xm/rpt/testCase/testCaseSort.vue @@ -4,10 +4,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue index 63aa136f..41656cfb 100644 --- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue +++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue @@ -3,11 +3,18 @@ - - - - - + + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue index 185dc5f3..6f4a238d 100644 --- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue +++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue @@ -3,10 +3,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue index 63bea354..30a7750a 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue @@ -4,10 +4,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue index 80a70276..39c2e4ea 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue @@ -4,10 +4,17 @@ - - - - + + {{ title?title:(isRptCfg?'标题':'') }} + + + + {{ remark?remark:(isRptCfg?'详细说明':'') }} + + + + + diff --git a/src/views/xm/rpt/testPlan/testPlanRptOverview.vue b/src/views/xm/rpt/testPlan/testPlanRptOverview.vue index 9dc94d23..f47da10f 100644 --- a/src/views/xm/rpt/testPlan/testPlanRptOverview.vue +++ b/src/views/xm/rpt/testPlan/testPlanRptOverview.vue @@ -1,11 +1,13 @@ - - - - - 报告概览 + + {{ rawDatas.name }} + + + {{ title?title:'报告概览' }} + + @@ -37,14 +39,14 @@ - + - + - + @@ -65,7 +67,7 @@ - + @@ -124,7 +126,7 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 } }, - props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas'], + props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas','isRptCfg'], watch: { 'xmTestPlan':function( xmTestPlan ) { @@ -141,6 +143,8 @@ import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修 }, data() { return { + title:'', + remark:'', currOpType:'add',//add/edit load:{ list: false, edit: false, del: false, add: false },//查询中... dicts:{