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

2
.env.development
View File

@ -9,3 +9,5 @@ VUE_APP_BASE_API = '/dev-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES=true
port='5173'

2
src/views/bigScreen/drivingCabin/center.vue
View File

@ -140,7 +140,9 @@ export default {
method: "get",
}).then((res) => {
if (200 == res.code) {
if (res.data.length) {
this.val = res.data[0];
}
} else {
this.$message.error(res.msg);
}

12
src/views/bigScreen/information/left1.vue
View File

@ -25,7 +25,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="7">责任令</el-col>
<el-col style="text-align: center" :span="7">部门</el-col>
<el-col style="text-align: center" :span="7">完成情况</el-col>
@ -42,9 +42,9 @@
<ul class="item">
<li v-for="item in dataList" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:span="7"
@ -124,7 +124,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="7">项目名称</el-col>
<el-col style="text-align: center" :span="7">计划名称</el-col>
<!-- <el-col style="text-align: center" :span="7">部门</el-col> -->
@ -143,9 +143,9 @@
<ul class="item">
<li v-for="item in listData" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.projectName"

6
src/views/bigScreen/information/right1.vue
View File

@ -35,7 +35,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="5">名称</el-col>
<el-col style="text-align: center" :span="5">部门</el-col>
<el-col style="text-align: center" :span="7">时间</el-col>
@ -52,9 +52,9 @@
<ul class="item">
<li v-for="item in listData" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.planName"

6
src/views/bigScreen/management/left1.vue
View File

@ -67,7 +67,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="5">项目名称</el-col>
<el-col style="text-align: center" :span="5">部门</el-col>
<el-col style="text-align: center" :span="7">时间</el-col>
@ -86,9 +86,9 @@
<ul class="item">
<li v-for="item in scrollList" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.projectName"

6
src/views/bigScreen/management/left2.vue
View File

@ -68,7 +68,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="5">合同名称</el-col>
<el-col style="text-align: center" :span="3">数量</el-col>
<el-col style="text-align: center" :span="5">金额</el-col>
@ -85,9 +85,9 @@
<ul class="item">
<li v-for="item in scrollList" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.contractName"

14
src/views/bigScreen/management/right1.vue
View File

@ -87,7 +87,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="5">项目名称</el-col>
<el-col style="text-align: center" :span="5">负责人</el-col>
<el-col style="text-align: center" :span="7">团队</el-col>
@ -106,9 +106,9 @@
<ul class="item">
<li v-for="item in scrollList1" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.projectName"
@ -158,7 +158,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="7">部门</el-col>
<el-col style="text-align: center" :span="7">公示内容</el-col>
<el-col style="text-align: center" :span="7">时间</el-col>
@ -176,9 +176,9 @@
<ul class="item">
<li v-for="item in scrollList2" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col style="text-align: center" :span="7">{{
item.deptName
}}</el-col>
@ -491,7 +491,7 @@ export default {
{
type: "category",
data: [
"部门一",
"部门5",
"部门二",
"部门三",
"部门四",

2
src/views/bigScreen/qualityManage/center.vue
View File

@ -136,7 +136,7 @@ export default {
url: "/hx/qualityAssurance/getQualityManage",
method: "get",
}).then(({ data }) => {
this.dataInfo = data;
if (data) this.dataInfo = data;
});
},
},

6
src/views/bigScreen/qualityManage/right1.vue
View File

@ -42,7 +42,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="4">序号</el-col>
<!-- <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-row>
@ -58,9 +58,9 @@
<ul class="item">
<li v-for="item in scrollList" :key="item.id">
<el-row style="font-size: 14px">
<el-col style="text-align: center" :span="4">{{
<!-- <el-col style="text-align: center" :span="4">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col style="text-align: center" :span="8">{{
item.className
}}</el-col>

6
src/views/bigScreen/scientific/tab2/center3.vue
View File

@ -10,7 +10,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="4">序号</el-col>
<!-- <el-col style="text-align: center" :span="4">序号</el-col> -->
<el-col style="text-align: center" :span="4">物资名称</el-col>
<el-col style="text-align: center" :span="3">现有库存</el-col>
<el-col style="text-align: center" :span="6"
@ -29,9 +29,9 @@
<ul class="item">
<li v-for="item in scrollList" :key="item.id">
<el-row>
<el-col style="text-align: center" :span="4">{{
<!-- <el-col style="text-align: center" :span="4">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.materialName"

2
src/views/bigScreen/securityManage/center.vue
View File

@ -14,6 +14,7 @@
style="width: 100%; height: 100%"
/>
<section v-for="(v, index) in points" :key="index">
<div v-if="v.ordinate && v.abscissa">
<div
v-if="v.level == 'Ⅰ级'"
class="con_right"
@ -53,6 +54,7 @@
<img src="./img/left1/icon3.png" alt="" />
</div>
</div>
</div>
</section>
<!-- <div class="con_right">
<div class="con_title con_title_bg1">

137
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="{
<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">
<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="{
<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">
<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,16 +106,16 @@
</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,
@ -82,7 +135,7 @@ export default {
remark: "",
todayDate: "",
workContent: "",
},),
}),
scrollList2: Array(8).fill({
createTime: "",
deptName: "",
@ -90,8 +143,8 @@ export default {
remark: "",
todayDate: "",
workContent: "",
},),
}
}),
};
},
watch: {
index(newOld, oldVal) {
@ -108,17 +161,17 @@ export default {
},
mounted() {
this.$nextTick(() => {
this.getData()
})
this.getData();
});
},
beforeDestroy() {},
methods: {
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);
@ -128,12 +181,12 @@ export default {
} 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);
@ -143,10 +196,10 @@ export default {
} else {
this.$message.error(res.msg);
}
})
}
});
},
}
},
};
</script>
<style lang="scss" scoped>

6
src/views/bigScreen/securityManage/left1.vue
View File

@ -66,7 +66,7 @@
background: rgba(0, 255, 255, 0.3);
"
>
<el-col style="text-align: center" :span="3">序号</el-col>
<!-- <el-col style="text-align: center" :span="3">序号</el-col> -->
<el-col style="text-align: center" :span="7">危险点</el-col>
<el-col style="text-align: center" :span="7">危险级别</el-col>
<el-col style="text-align: center" :span="7">运行状态</el-col>
@ -83,9 +83,9 @@
<ul class="item">
<li v-for="(item, index) in points" :key="index">
<el-row>
<el-col style="text-align: center" :span="3">{{
<!-- <el-col style="text-align: center" :span="3">{{
item.id
}}</el-col>
}}</el-col> -->
<el-col
style="text-align: center"
:title="item.pointName"

2
vue.config.js
View File

@ -37,7 +37,7 @@ module.exports = {
// target: `http://120.26.107.74:1818`,
// target: `http://172.18.3.109:1818`,
// target: `http://192.168.10.3:1818`,
target: `http://172.18.3.127:1818`,
target: `http://192.168.110.10:1818`,
// target: `http://124.70.138.50:1818`,
changeOrigin: true,
pathRewrite: {