admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'yanyan_dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl

Browse Source
This commit is contained in:
jxj_yjl 2023-05-15 16:34:26 +08:00
commit 5421cb3a94
11 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/doc/h52/index.html
View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>过磅预约</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)')) <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>过磅预约</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.48293eda.js></script><script src=./static/js/index.6b4b2665.js></script></body></html> document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.48293eda.js></script><script src=./static/js/index.c066cd70.js></script></body></html>

2
public/doc/h52/static/js/index.6b4b2665.js → public/doc/h52/static/js/index.c066cd70.js
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-index.085fc621.js
View File

File diff suppressed because one or more lines are too long

1
public/doc/h52/static/js/pages-index-index.9de11076.js Normal file
View File

File diff suppressed because one or more lines are too long

24
src/views/companyAdmin/bigScreen/rightMenu.vue
View File

@ -5,7 +5,7 @@
<div class="list-item" v-if="pageType == 1"> <div class="list-item" v-if="pageType == 1">
<div class="item-content"> <div class="item-content">
<div class="item-title"><span></span>智能监测</div> <div class="item-title"><span></span>智能监测</div>
<div class="item-detail"> <div>
<ul class="monitor-list"> <ul class="monitor-list">
<li v-for="(item,index) in statisticsDevCount" :key="index"> <li v-for="(item,index) in statisticsDevCount" :key="index">
<p><b>{{item.devOnline}}</b>/{{item.devNum}}</p> <p><b>{{item.devOnline}}</b>/{{item.devNum}}</p>
@ -19,9 +19,9 @@
<div class="list-item" v-if="pageType == 1"> <div class="list-item" v-if="pageType == 1">
<div class="item-content"> <div class="item-content">
<div class="item-title"><span></span>巡检情况</div> <div class="item-title"><span></span>巡检情况</div>
<div class="item-detail"> <div class="item-detail">暂无数据
<div class="condition-title">检查总数<span>208</span></div> <!-- <div class="condition-title">检查总数<span>208</span></div>
<div ref="echart1" style="width:100%; height:148px"></div> <div ref="echart1" style="width:100%; height:148px"></div> -->
</div> </div>
</div> </div>
</div> </div>
@ -29,8 +29,8 @@
<div class="list-item" v-if="pageType == 1"> <div class="list-item" v-if="pageType == 1">
<div class="item-content"> <div class="item-content">
<div class="item-title"><span></span>累计预警工程排行</div> <div class="item-title"><span></span>累计预警工程排行</div>
<div class="item-detail"> <div class="item-detail">暂无数据
<div ref="echart2" style="width:100%; height:177px"></div> <!-- <div ref="echart2" style="width:100%; height:177px"></div> -->
</div> </div>
</div> </div>
</div> </div>
@ -723,6 +723,18 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 6px; padding-bottom: 6px;
} }
.item-detail:nth-child(2){
line-height: 180px;
text-align: center;
width: 100%;
height:180px;
}
.item-detail:nth-child(3){
line-height: 180px;
text-align: center;
width: 100%;
height:180px;
}
.monitor-list{ .monitor-list{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

2
src/views/projectAdmin/zjsj/command/index.vue
View File

@ -39,7 +39,7 @@
<script> <script>
import LeftOne from './leftOne' import LeftOne from './leftOne'
import LeftTwo from './leftTwo' import LeftTwo from './leftTwo'
import LeftThree from './LeftThree' import LeftThree from './leftThree'
import LeftFour from './leftFour' import LeftFour from './leftFour'
import Center from './center' import Center from './center'
import CenterBOne from './centerBOne' import CenterBOne from './centerBOne'

6
src/views/projectFront/quality/material/forwardingUnit.vue
View File

@ -124,7 +124,7 @@ export default {
downloadData: {}, //下载数据 downloadData: {}, //下载数据
tableList: [], tableList: [],
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize:10,
total: 0, total: 0,
dialogVisibleAdd: false, dialogVisibleAdd: false,
dialogVisibleEdit: false, dialogVisibleEdit: false,
@ -293,8 +293,8 @@ export default {
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {
this.pageNo = val this.pageNo = 1
this.pageSize = 10 this.pageSize = val
this.getListData() this.getListData()
}, },
//查看页 //查看页

6
src/views/projectFront/quality/material/makeAnAppointment.vue
View File

@ -177,7 +177,7 @@ export default {
downloadData: {}, //下载数据 downloadData: {}, //下载数据
tableList: [], tableList: [],
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: 10,
total: 0, total: 0,
dialogVisibleAdd: false, dialogVisibleAdd: false,
dialogVisibleEdit: false, dialogVisibleEdit: false,
@ -254,8 +254,8 @@ export default {
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {
this.pageNo = val this.pageNo = 1
this.pageSize = 10 this.pageSize = val
this.getListData() this.getListData()
}, },
//查看页 //查看页

6
src/views/projectFront/quality/material/receivingUnit.vue
View File

@ -124,7 +124,7 @@ export default {
downloadData: {}, //下载数据 downloadData: {}, //下载数据
tableList: [], tableList: [],
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize:10,
total: 0, total: 0,
dialogVisibleAdd: false, dialogVisibleAdd: false,
dialogVisibleEdit: false, dialogVisibleEdit: false,
@ -290,8 +290,8 @@ export default {
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {
this.pageNo = val this.pageNo = 1
this.pageSize = 10 this.pageSize = val
this.getListData() this.getListData()
}, },
//查看页 //查看页

6
src/views/projectFront/quality/material/tradeName.vue
View File

@ -119,7 +119,7 @@ export default {
downloadData: {}, //下载数据 downloadData: {}, //下载数据
tableList: [], tableList: [],
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: 10,
total: 0, total: 0,
dialogVisibleAdd: false, dialogVisibleAdd: false,
dialogVisibleEdit: false, dialogVisibleEdit: false,
@ -280,8 +280,8 @@ export default {
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {
this.pageNo = val this.pageNo = 1
this.pageSize = 10 this.pageSize = val
this.getListData() this.getListData()
}, },
//查看页 //查看页

14
src/views/projectFront/quality/material/weighInfo.vue
View File

@ -21,11 +21,11 @@
<el-table-column prop="goodsName" label="货名" align="center"></el-table-column> <el-table-column prop="goodsName" label="货名" align="center"></el-table-column>
<el-table-column prop="specifications" label="规格" align="center"></el-table-column> <el-table-column prop="specifications" label="规格" align="center"></el-table-column>
<el-table-column prop="reserve" label="备注 " align="center"></el-table-column> <el-table-column prop="reserve" label="备注 " align="center"></el-table-column>
<el-table-column prop="tare" label="毛重" align="center"></el-table-column> <el-table-column prop="grossWeight" label="毛重" align="center"></el-table-column>
<el-table-column prop="grossWeight" label="皮重" align="center"></el-table-column> <el-table-column prop="tare" label="皮重" align="center"></el-table-column>
<el-table-column prop="netWeight" label="净重" align="center"></el-table-column> <el-table-column prop="netWeight" label="净重" align="center"></el-table-column>
<el-table-column prop="tareTime" width="200px" label="毛重时间" align="center"></el-table-column> <el-table-column prop="grossTime" width="200px" label="毛重时间" align="center"></el-table-column>
<el-table-column prop="grossTime" width="200px" label="皮重时间" align="center"></el-table-column> <el-table-column prop="tareTime" width="200px" label="皮重时间" align="center"></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="tableBtns"> <div class="tableBtns">
@ -105,7 +105,7 @@ export default {
downloadData: {}, //下载数据 downloadData: {}, //下载数据
tableList: [], tableList: [],
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize:10,
total: 0, total: 0,
dialogVisiblePhone: false, dialogVisiblePhone: false,
phoneList: [], phoneList: [],
@ -170,8 +170,8 @@ export default {
}, },
//查看条数 //查看条数
handleSizeChange(val) { handleSizeChange(val) {
this.pageNo = val this.pageNo = 1
this.pageSize = 10 this.pageSize = val
this.getListData() this.getListData()
}, },
//查看页 //查看页