sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

dev-login
姜玉琦 2023-08-20 19:34:54 +08:00
parent 34ff5b9131 bcd4f7b8eb
commit 1a8435d6e9
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/components/ProblemmodifyDetail.vue
View File

@ -42,7 +42,7 @@
<div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">整改超时({{ count['5'] }})</div> <div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">整改超时({{ count['5'] }})</div>
</div> </div>
<div class="data-list scroll" style="max-height:712px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;"> <div class="data-list scroll" style="max-height:712px;overflow-y: auto;margin:12px 0px;overflow-x: hidden;" v-if="dataTable.length>0">
<div v-for="(it, idx) in dataTable" :key="idx" class="data-item" <div v-for="(it, idx) in dataTable" :key="idx" class="data-item"
:class="it.timeout ? 'time-out' : ''"> :class="it.timeout ? 'time-out' : ''">
<div class="item-left"> <div class="item-left">
@ -113,6 +113,10 @@
</div> </div>
</div> </div>
</div> </div>
<div v-else style="text-align: center;margin-top: 200px;">
<img src="images/nodata.png" style="width: 240px;">
<div style="text-align: center;">暂无数据</div>
</div>
</div> </div>
</MyDialog> </MyDialog>
@ -201,7 +205,6 @@ export default {
}) })
}, },
showDialog(row, infoType,roleType) { showDialog(row, infoType,roleType) {
debugger
this.row = row; this.row = row;
this.infoType = infoType; this.infoType = infoType;
this.roleType=roleType; this.roleType=roleType;

19
src/pages/progress/buildNodeDlg.vue
View File

@ -62,7 +62,7 @@
<div class="head-nav" :class="nav == it.lvl ? 'active' : ''" @click="doNavClick(it)" <div class="head-nav" :class="nav == it.lvl ? 'active' : ''" @click="doNavClick(it)"
v-for="(it, idx) in tableData" :key="idx">{{ it.nodeText }}</div> v-for="(it, idx) in tableData" :key="idx">{{ it.nodeText }}</div>
</div> </div>
<div class="node-list scroll" style=" max-height: 675px;overflow-y: auto;"> <div class="node-list scroll" style="max-height: 675px;overflow-y: auto;" :class="'node-type'+(curNode.baseBuildNode?.nodeType||0)">
<NodeItem :item="curNode" :showLabel="false" class="node-item-lvl1 node-item"></NodeItem> <NodeItem :item="curNode" :showLabel="false" class="node-item-lvl1 node-item"></NodeItem>
<div v-for="(it, idx) in curNodes" :key="idx" class="node-item2" <div v-for="(it, idx) in curNodes" :key="idx" class="node-item2"
:class="'children' + (curNodes.length > 1 ? 'more' : 'one')"> :class="'children' + (curNodes.length > 1 ? 'more' : 'one')">
@ -346,7 +346,16 @@ export default {
.node-list { .node-list {
padding: 12px; padding: 12px;
&.node-type0{
.node-item-lvl2 {
.lbl-title {
font-weight: bold;
font-size: 20px;
width: 200px !important;
color: #7fffd4;
}
}
}
.node-item { .node-item {
.date-info { .date-info {
box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%); box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%);
@ -370,12 +379,6 @@ export default {
} }
} }
.lbl-title {
font-weight: bold;
font-size: 20px;
width: 200px !important;
color: #7fffd4;
}
} }
.node-item-lvl3, .node-item-lvl3,