fixBug
This commit is contained in:
@ -6,7 +6,6 @@
|
|||||||
<router-view v-if="refresh" class="content" />
|
<router-view v-if="refresh" class="content" />
|
||||||
</div>
|
</div>
|
||||||
</scalseBox>
|
</scalseBox>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -36,7 +35,6 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
canRefresh () {
|
canRefresh () {
|
||||||
console.log('this.isRefresh',this.isRefresh);
|
|
||||||
if (this.isRefresh) {
|
if (this.isRefresh) {
|
||||||
this.refresh = false;
|
this.refresh = false;
|
||||||
this.$forceUpdate();
|
this.$forceUpdate();
|
||||||
@ -115,6 +113,14 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.warp-scroll div {
|
||||||
|
overflow: hidden;
|
||||||
|
white-space: nowrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.digScreenLayout {
|
.digScreenLayout {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -33,8 +33,8 @@
|
|||||||
<li v-for="item in dataList" :key="item.id">
|
<li v-for="item in dataList" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{ item.responsibilityContent }}</el-col>
|
<el-col style="text-align: center" :span="7" :title="item.responsibilityContent">{{ item.responsibilityContent }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{ item.deptName }}</el-col>
|
<el-col style="text-align: center" :span="7" :title="item.deptName">{{ item.deptName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">
|
<el-col style="text-align: center" :span="7">
|
||||||
<section class="box">
|
<section class="box">
|
||||||
<span
|
<span
|
||||||
@ -104,8 +104,8 @@
|
|||||||
<li v-for="item in listData" :key="item.id">
|
<li v-for="item in listData" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{ item.workPlanName }}</el-col>
|
<el-col style="text-align: center" :title="item.workPlanName" :span="7">{{ item.workPlanName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{ item.deptName }}</el-col>
|
<el-col style="text-align: center" :title="item.deptName" :span="7">{{ item.deptName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">
|
<el-col style="text-align: center" :span="7">
|
||||||
<section class="box">
|
<section class="box">
|
||||||
<span
|
<span
|
||||||
|
@ -47,8 +47,8 @@
|
|||||||
<li v-for="item in listData" :key="item.id">
|
<li v-for="item in listData" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{ item.planName }}</el-col>
|
<el-col style="text-align: center" :title="item.planName" :span="5">{{ item.planName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{ item.deptName }}</el-col>
|
<el-col style="text-align: center" :title="item.deptName" :span="5">{{ item.deptName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{ item.todayDate }}</el-col>
|
<el-col style="text-align: center" :span="7">{{ item.todayDate }}</el-col>
|
||||||
<el-col style="text-align: center" :span="4">
|
<el-col style="text-align: center" :span="4">
|
||||||
<section class="box">
|
<section class="box">
|
||||||
|
@ -48,8 +48,8 @@
|
|||||||
<li v-for="item in scrollList" :key="item.id">
|
<li v-for="item in scrollList" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{ item.projectName }}</el-col>
|
<el-col style="text-align: center" :title="item.projectName" :span="5">{{ item.projectName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5"> {{item.deptName}}</el-col>
|
<el-col style="text-align: center" :title="item.deptName" :span="5"> {{item.deptName}}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{item.todayDate}}</el-col>
|
<el-col style="text-align: center" :span="7">{{item.todayDate}}</el-col>
|
||||||
<el-col style="text-align: center" :span="4">
|
<el-col style="text-align: center" :span="4">
|
||||||
<section class="box">
|
<section class="box">
|
||||||
|
@ -57,8 +57,8 @@
|
|||||||
<li v-for="item in scrollList" :key="item.id">
|
<li v-for="item in scrollList" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{ item.contractName }}</el-col>
|
<el-col style="text-align: center" :title="item.contractName" :span="5">{{ item.contractName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.planQuantity }}</el-col>
|
<el-col style="text-align: center" :title="item.planQuantity" :span="3">{{ item.planQuantity }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{ item.contractAmount }}</el-col>
|
<el-col style="text-align: center" :span="5">{{ item.contractAmount }}</el-col>
|
||||||
<el-col style="text-align: center" :span="3">
|
<el-col style="text-align: center" :span="3">
|
||||||
<section class="box">
|
<section class="box">
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
<li v-for="item in scrollList1" :key="item.id">
|
<li v-for="item in scrollList1" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{item.projectName}}</el-col>
|
<el-col style="text-align: center" :title="item.projectName" :span="5">{{item.projectName}}</el-col>
|
||||||
<el-col style="text-align: center" :span="5"> {{item.director}} </el-col>
|
<el-col style="text-align: center" :span="5"> {{item.director}} </el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{item.deptName}} </el-col>
|
<el-col style="text-align: center" :span="7">{{item.deptName}} </el-col>
|
||||||
<el-col style="text-align: center" :span="4">
|
<el-col style="text-align: center" :span="4">
|
||||||
@ -91,7 +91,7 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{item.deptName}}</el-col>
|
<el-col style="text-align: center" :span="7">{{item.deptName}}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{item.publicityContent}}</el-col>
|
<el-col style="text-align: center" :title="item.publicityContent" :span="7">{{item.publicityContent}}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{item.todayDate}}</el-col>
|
<el-col style="text-align: center" :span="7">{{item.todayDate}}</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</li>
|
</li>
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
<el-row style="font-size: 14px">
|
<el-row style="font-size: 14px">
|
||||||
<el-col style="text-align: center" :span="4">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="4">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="8">{{ item.className }}</el-col>
|
<el-col style="text-align: center" :span="8">{{ item.className }}</el-col>
|
||||||
<el-col style="text-align: center" :span="12">{{ item.faultRevelation }}</el-col>
|
<el-col style="text-align: center" :title="item.faultRevelation" :span="12">{{ item.faultRevelation }}</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
<li v-for="item in scrollList" :key="item.id">
|
<li v-for="item in scrollList" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="4">{{item.id}}</el-col>
|
<el-col style="text-align: center" :span="4">{{item.id}}</el-col>
|
||||||
<el-col style="text-align: center" :span="4">{{item.materialName}}</el-col>
|
<el-col style="text-align: center" :title="item.materialName" :span="4">{{item.materialName}}</el-col>
|
||||||
<el-col style="text-align: center" :span="3">{{item.stock}}</el-col>
|
<el-col style="text-align: center" :span="3">{{item.stock}}</el-col>
|
||||||
|
|
||||||
<el-col style="text-align: center" :span="6">
|
<el-col style="text-align: center" :span="6">
|
||||||
|
@ -18,8 +18,8 @@
|
|||||||
<ul class="item">
|
<ul class="item">
|
||||||
<li v-for="item in scrollList" :key="item.id">
|
<li v-for="item in scrollList" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="3">{{ item.projectName }}</el-col>
|
<el-col style="text-align: center" :title="item.projectName" :span="3">{{ item.projectName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{ item.jobContent }}</el-col>
|
<el-col style="text-align: center" :title="item.jobContent" :span="5">{{ item.jobContent }}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">
|
<el-col style="text-align: center" :span="5">
|
||||||
<span class="state" :class="{success: item.progress == '已完成',
|
<span class="state" :class="{success: item.progress == '已完成',
|
||||||
fault: item.progress == '未完成',
|
fault: item.progress == '未完成',
|
||||||
|
@ -15,12 +15,12 @@
|
|||||||
<ul class="item">
|
<ul class="item">
|
||||||
<li v-for="item in scrollList" :key="item.id">
|
<li v-for="item in scrollList" :key="item.id">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col style="text-align: center" :span="4">{{item.jobContent}}</el-col>
|
<el-col style="text-align: center" :title="item.jobContent" :span="4">{{item.jobContent}}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">{{item.meetingName}}</el-col>
|
<el-col style="text-align: center" :title="item.meetingName" :span="5">{{item.meetingName}}</el-col>
|
||||||
<el-col style="text-align: center" :span="5">
|
<el-col style="text-align: center" :title="item.checkLeader" :span="5">
|
||||||
{{item.checkLeader}}
|
{{item.checkLeader}}
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{item.responsibleUnit}}</el-col>
|
<el-col style="text-align: center" :title="item.responsibleUnit" :span="7">{{item.responsibleUnit}}</el-col>
|
||||||
<el-col style="text-align: center" :span="3">
|
<el-col style="text-align: center" :span="3">
|
||||||
<span class="state" :class="{success: item.workProgress == '已完成',
|
<span class="state" :class="{success: item.workProgress == '已完成',
|
||||||
fault: item.workProgress == '未完成',
|
fault: item.workProgress == '未完成',
|
||||||
|
@ -237,6 +237,7 @@ export default {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
cursor: pointer;
|
||||||
.con_title {
|
.con_title {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 42px;
|
height: 42px;
|
||||||
|
@ -19,8 +19,8 @@
|
|||||||
<li v-for="(item,index) in scrollList1" :key="index">
|
<li v-for="(item,index) in scrollList1" :key="index">
|
||||||
<el-row style="font-size: 14px">
|
<el-row style="font-size: 14px">
|
||||||
<el-col style="text-align: center" :span="4">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="4">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="8">{{ item.deptName }}</el-col>
|
<el-col style="text-align: center" :title="item.deptName" :span="8">{{ item.deptName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="12">{{ item.workContent }}</el-col>
|
<el-col style="text-align: center" :title="item.workContent" :span="12">{{ item.workContent }}</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@ -41,8 +41,8 @@
|
|||||||
<li v-for="(item,index) in scrollList2" :key="index">
|
<li v-for="(item,index) in scrollList2" :key="index">
|
||||||
<el-row style="font-size: 14px">
|
<el-row style="font-size: 14px">
|
||||||
<el-col style="text-align: center" :span="4">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="4">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="8">{{ item.deptName }}</el-col>
|
<el-col style="text-align: center" :title="item.deptName" :span="8">{{ item.deptName }}</el-col>
|
||||||
<el-col style="text-align: center" :span="12">{{ item.workContent }}</el-col>
|
<el-col style="text-align: center" :title="item.workContent" :span="12">{{ item.workContent }}</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
<el-col style="text-align: center" :span="3">{{
|
<el-col style="text-align: center" :span="3">{{
|
||||||
item.id
|
item.id
|
||||||
}}</el-col>
|
}}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">{{
|
<el-col style="text-align: center" :title="item.pointName" :span="7">{{
|
||||||
item.pointName
|
item.pointName
|
||||||
}}</el-col>
|
}}</el-col>
|
||||||
<el-col style="text-align: center" :span="7">
|
<el-col style="text-align: center" :span="7">
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
<li v-for="item in scrollList" :key="item.id">
|
<li v-for="item in scrollList" :key="item.id">
|
||||||
<el-row style="font-size: 14px">
|
<el-row style="font-size: 14px">
|
||||||
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
<el-col style="text-align: center" :span="3">{{ item.id }}</el-col>
|
||||||
<el-col style="text-align: center" :span="12">{{ item.dangerContent }}</el-col>
|
<el-col style="text-align: center" :span="12" :title="item.dangerContent">{{ item.dangerContent }}</el-col>
|
||||||
<el-col style="text-align: center" :span="4">
|
<el-col style="text-align: center" :span="4">
|
||||||
<section class="box">
|
<section class="box">
|
||||||
<span v-if="item.measures == '未整改'" style="color: #f64f58; font-size: 25px; margin-right: 3px">·</span>
|
<span v-if="item.measures == '未整改'" style="color: #f64f58; font-size: 25px; margin-right: 3px">·</span>
|
||||||
|
Reference in New Issue
Block a user