williamet/vis389
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
cxc
2023-01-18 10:50:52 +08:00
parent 6c5de74adf
commit 53e6ace735
14 changed files with 212 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
src/views/bigScreen/securityManage/center2.vue
View File

@ -2,25 +2,52 @@
<div>
<container4 title="危险作业预报/月度重点安全工作提示">
<div style="text-align: right; margin-right: 30px; margin-bottom: 5px">
<bigScreenTabs v-model="index" :titleArr="['周危险', '月重点']"></bigScreenTabs>
<bigScreenTabs
v-model="index"
:titleArr="['周危险', '月重点']"
></bigScreenTabs>
</div>
<el-row style="padding: 0 30px" v-if="index == 0">
<el-col :span="24" style="margin-bottom: 1px">
<el-row style="font-size: 14px; height: 42px; line-height: 42px; background: rgba(0, 255, 255, 0.3)">
<el-col style="text-align: center" :span="4">序号</el-col>
<el-row
style="
font-size: 14px;
height: 42px;
line-height: 42px;
background: rgba(0, 255, 255, 0.3);
"
>
<!-- <el-col style="text-align: center" :span="4">序号</el-col> -->
<el-col style="text-align: center" :span="8">部门</el-col>
<el-col style="text-align: center" :span="12">作业内容(周危险)</el-col>
<el-col style="text-align: center" :span="12"
>作业内容(周危险)</el-col
>
</el-row>
</el-col>
<vue-seamless-scroll ref="seamlessScroll1" :data="listData1" class="warp-scroll" :class-option="{
singleHeight: 43,
}">
<vue-seamless-scroll
ref="seamlessScroll1"
:data="listData1"
class="warp-scroll"
:class-option="{
singleHeight: 43,
}"
>
<ul class="item">
<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-col style="text-align: center" :span="4">{{ item.id }}</el-col>
<el-col style="text-align: center" :title="item.deptName" :span="8">{{ item.deptName }}</el-col>
<el-col style="text-align: center" :title="item.workContent" :span="12">{{ item.workContent }}</el-col>
<!-- <el-col style="text-align: center" :span="4">{{ item.id }}</el-col> -->
<el-col
style="text-align: center"
:title="item.deptName"
:span="8"
>{{ item.deptName }}</el-col
>
<el-col
style="text-align: center"
:title="item.workContent"
:span="12"
>{{ item.workContent }}</el-col
>
</el-row>
</li>
</ul>
@ -28,21 +55,47 @@
</el-row>
<el-row style="padding: 0 30px" v-if="index == 1">
<el-col :span="24" style="margin-bottom: 1px">
<el-row style="font-size: 14px; height: 42px; line-height: 42px; background: rgba(0, 255, 255, 0.3)">
<el-col style="text-align: center" :span="4">序号</el-col>
<el-row
style="
font-size: 14px;
height: 42px;
line-height: 42px;
background: rgba(0, 255, 255, 0.3);
"
>
<!-- <el-col style="text-align: center" :span="4">序号</el-col> -->
<el-col style="text-align: center" :span="8">部门</el-col>
<el-col style="text-align: center" :span="12">作业内容(月重点)</el-col>
<el-col style="text-align: center" :span="12"
>作业内容(月重点)</el-col
>
</el-row>
</el-col>
<vue-seamless-scroll ref="seamlessScroll2" :data="listData2" class="warp-scroll" :class-option="{
singleHeight: 43,
}">
<vue-seamless-scroll
ref="seamlessScroll2"
:data="listData2"
class="warp-scroll"
:class-option="{
singleHeight: 43,
}"
>
<ul class="item">
<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-col style="text-align: center" :span="4">{{ item.id }}</el-col>
<el-col style="text-align: center" :title="item.deptName" :span="8">{{ item.deptName }}</el-col>
<el-col style="text-align: center" :title="item.workContent" :span="12">{{ item.workContent }}</el-col>
<!-- <el-col style="text-align: center" :span="4">{{
item.id
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.deptName"
:span="8"
>{{ item.deptName }}</el-col
>
<el-col
style="text-align: center"
:title="item.workContent"
:span="12"
>{{ item.workContent }}</el-col
>
</el-row>
</li>
</ul>
@ -53,100 +106,100 @@
</template>
<script>
import container4 from './components/container4/index.vue'
import rocketTit from '../components/rocketTit/index.vue'
import vueSeamlessScroll from 'vue-seamless-scroll'
import bigScreenTabs from '../components/bigScreenTabs/index.vue'
import echarts from 'echarts'
require('echarts/theme/macarons') // echarts theme
import resize from '../../dashboard/mixins/resize'
import container4 from "./components/container4/index.vue";
import rocketTit from "../components/rocketTit/index.vue";
import vueSeamlessScroll from "vue-seamless-scroll";
import bigScreenTabs from "../components/bigScreenTabs/index.vue";
import echarts from "echarts";
require("echarts/theme/macarons"); // echarts theme
import resize from "../../dashboard/mixins/resize";
export default {
mixins: [resize],
name: 'left1',
name: "left1",
components: {
container4,
rocketTit,
vueSeamlessScroll,
bigScreenTabs,
},
data () {
data() {
return {
index: 0,
listData1: [1, 2, 3, 4, 5, 6, 7, 8],
listData2: [1, 2, 3, 4, 5, 6, 7, 8],
scrollList1: Array(8).fill({
createTime: "",
deptName: "",
id: 0,
remark: "",
todayDate: "",
workContent: "",
},),
createTime: "",
deptName: "",
id: 0,
remark: "",
todayDate: "",
workContent: "",
}),
scrollList2: Array(8).fill({
createTime: "",
deptName: "",
id: 0,
remark: "",
todayDate: "",
workContent: "",
},),
}
createTime: "",
deptName: "",
id: 0,
remark: "",
todayDate: "",
workContent: "",
}),
};
},
watch: {
index(newOld, oldVal) {
if (newOld == 0) {
if(this.$refs.seamlessScroll1) {
this.$refs.seamlessScroll1.reset();
watch: {
index(newOld, oldVal) {
if (newOld == 0) {
if (this.$refs.seamlessScroll1) {
this.$refs.seamlessScroll1.reset();
}
} else {
if(this.$refs.seamlessScroll2) {
this.$refs.seamlessScroll2.reset();
} else {
if (this.$refs.seamlessScroll2) {
this.$refs.seamlessScroll2.reset();
}
}
},
},
mounted () {
}
},
},
mounted() {
this.$nextTick(() => {
this.getData()
})
this.getData();
});
},
beforeDestroy () { },
beforeDestroy() {},
methods: {
getData () {
getData() {
this.request({
url: '/hx/securityManagement/dangerousWork',
method: 'get',
params: { type: 1 }
}).then(res => {
url: "/hx/securityManagement/dangerousWork",
method: "get",
params: { type: 1 },
}).then((res) => {
if (200 == res.code) {
this.scrollList1 = res.data;
this.listData1 = Array(this.scrollList1.length).fill(0);
if(this.$refs.seamlessScroll1) {
this.$refs.seamlessScroll1.reset();
}
if (this.$refs.seamlessScroll1) {
this.$refs.seamlessScroll1.reset();
}
} else {
this.$message.error(res.msg);
}
})
});
this.request({
url: '/hx/securityManagement/dangerousWork',
method: 'get',
params: { type: 2 }
}).then(res => {
url: "/hx/securityManagement/dangerousWork",
method: "get",
params: { type: 2 },
}).then((res) => {
if (200 == res.code) {
this.scrollList2 = res.data;
this.listData2 = Array(this.scrollList2.length).fill(0);
if(this.$refs.seamlessScroll2) {
this.$refs.seamlessScroll2.reset();
}
if (this.$refs.seamlessScroll2) {
this.$refs.seamlessScroll2.reset();
}
} else {
this.$message.error(res.msg);
}
})
}
});
},
},
}
};
</script>
<style lang="scss" scoped>