Skip to content

P
police-jyzb-vue-hzzj
Commit 89fd8240 by T
Options

首页功能完善、bug修复

parent 7baa5c8f
正在显示 包含 140 行增加 和 31 行删除
config/index.js
......@@ -32,8 +32,8 @@ module.exports = {
},
// Various Dev Server settings
host: '192.168.2.104', // can be overwritten by process.env.HOST
port: 8999, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
host: '192.168.2.246', // can be overwritten by process.env.HOST
port: 9998, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: false,
......
index.html
......@@ -9,12 +9,32 @@
<!-- 全局配置 -->
<script>
window._CONFIG = {};
//自建平台
// window._CONFIG['serviceURL'] = 'http://192.168.2.105:8848';
// window._CONFIG['userURL'] = 'http://192.168.2.105:10005';
//总平台
window._CONFIG['serviceURL'] = 'http://192.168.2.105:5000';
window._CONFIG['userURL'] = 'http://192.168.2.105:10004';
// window._CONFIG['serviceURL'] = 'http://41.190.20.132:5000';
// window._CONFIG['userURL'] = 'http://41.190.20.132:10004';
</script>
<script type="text/javascript" src="http://jzpt.gat.zj:10001/web_jznew/js/jquery/jquery-1.8.3.js"></script>
</head>
<!-- 浙警智评-V1.0-202208 BEGIN -->
<link rel="stylesheet" type="text/css" href="http://jzpt.gat.zj:10001/web_jznew/pages/jzwd/zjzp/css/jzwd-zjzp.css">
<link rel="stylesheet" type="text/css" href="http://jzpt.gat.zj:10001/web_jznew/pages/jzwd/zjzp/css/jzwd-zjzp.css">
<script type="text/javascript" src="http://jzpt.gat.zj:10001/web_jznew/pages/jzwd/zjzp/js/jzwd-zjzp.js"></script>
<link rel="stylesheet" type="text/css" href="http://jzpt.gat.zj:10001/web_jznew/pages/jzwd/zjzp/js/hsycmsAlert/hsycmsAlert.min.css">
<script type="text/javascript" src="http://jzpt.gat.zj:10001/web_jznew/pages/jzwd/zjzp/js/hsycmsAlert/hsycmsAlert.min.js"></script>
<script>
$(document).ready(function () {
/**
     * xtbs:系统标识，通过综合资源服务平台获取（*）
    */
$("#zjzp").jzwdZjzp({'xtbs': 'A3301004000002021010002'});
});
</script>
<!-- 浙警智评-V1.0-202208 END-->
<body>
<div id="app">
<div class="sampleContainer">
......@@ -25,6 +45,7 @@
<span class="dot dot_4"></span>
</div>
</div>
<div id="zjzp" class="zjwd-zjzp"></div>
</div>
</body>
</html>
src/api/process.js
......@@ -87,6 +87,14 @@ export function getPageAllOrderList(data) {
})
}
export function getPageAllOrderListHZ(data) {
return request({
url: window._CONFIG['serviceURL'] + '/api/Process/GetPageAllOrderListHZ',
method: 'post',
data: transform(data)
})
}
export function insertInventory(data) {
return request({
url: window._CONFIG['serviceURL'] + '/api/Print/InsertInventory',
......
src/utils/index.js
......@@ -181,6 +181,16 @@
sign: md5('a1dca4cf35a6d460128f5e4ad401b1c1'+parseInt(new Date().getTime()/1000)+'1.0'+escape(JSON.stringify(data)))
}
return k;
// let k = {
// appKey: '8EV3FnNIVaKp8zekBwxpdw==',
// orgId: '',
// version: '1.0',
// timestamp: parseInt(new Date().getTime()/1000),
// body: escape(JSON.stringify(data)),
// sign: md5('f0457716734855a2a9f337a4070c6977'+parseInt(new Date().getTime()/1000)+'1.0'+escape(JSON.stringify(data)))
// }
// return k;
}
export function downloadFile(obj, name, suffix) {
......
src/views/dashboard/ColumnarChart.vue
......@@ -12,7 +12,7 @@
<v-tooltip />
<v-axis />
<v-legend />
<v-bar position="装备类型*使用量" color="parentName" :adjust="adjust" />
<v-bar :position="position" color="parentName" :adjust="adjust" />
</v-chart>
</el-card>
</template>
......@@ -31,20 +31,22 @@ export default {
adjust: [{
type: 'dodge',
marginRatio: 1 / 32,
}]
}],
chartData: [],
position: '装备类型*使用量'
}
},
computed: {
chartData() {
let dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
fields: ['近七天使用次数', '近三十天使用次数'],
key: '装备类型',
value: '使用量',
});
return dv.rows
},
// chartData() {
// let dv = new DataSet.View().source(this.dataSource)
// dv.transform({
// type: 'fold',
// fields: ['近七天使用次数', '近三十天使用次数'],
// key: '装备类型',
// value: '使用量',
// });
// return dv.rows
// },
},
mounted() {
this.init()
......@@ -55,6 +57,15 @@ export default {
getSyPOrg({orgId: this.orgId}).then(res => {
if (res.code == "10000") {
this.dataSource = res.data
let dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
fields: ['近七天使用次数', '近三十天使用次数'],
key: '装备类型',
value: '使用量',
});
this.chartData = dv
this.position = '装备类型*使用量'
} else {
this.$message.error(res.msg)
}
......@@ -65,6 +76,15 @@ export default {
getSyPOrg({orgId: this.orgId}).then(res => {
if (res.code == "10000") {
this.dataSource = res.data
let dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
fields: ['近七天使用次数', '近三十天使用次数'],
key: '装备类型',
value: '使用量',
});
this.chartData = dv
this.position = '装备类型*使用量'
} else {
this.$message.error(res.msg)
}
......@@ -73,6 +93,15 @@ export default {
getWxPOrg({orgId: this.orgId}).then(res => {
if (res.code == "10000") {
this.dataSource = res.data
let dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
fields: ['近三个月维修次数', '近半年维修次数'],
key: '装备类型',
value: '维修数',
});
this.chartData = dv
this.position = '装备类型*维修数'
} else {
this.$message.error(res.msg)
}
......@@ -81,6 +110,15 @@ export default {
getBfPOrg({orgId: this.orgId}).then(res => {
if (res.code == "10000") {
this.dataSource = res.data
let dv = new DataSet.View().source(this.dataSource)
dv.transform({
type: 'fold',
fields: ['近三个月报废数', '近半年使报废数'],
key: '装备类型',
value: '报废数',
});
this.chartData = dv
this.position = '装备类型*报废数'
} else {
this.$message.error(res.msg)
}
......
src/views/dashboard/PanelGroup.vue
......@@ -11,7 +11,8 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<!-- <el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<div class="card-panel" @click="nextpage('在库数量')">
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="zaiku" class-name="card-panel-icon" />
......@@ -43,8 +44,8 @@
<count-to :start-val="0" :end-val="count.lyCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
</el-col> -->
<!-- <el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<div class="card-panel" @click="nextpage('维修数量')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="维修" class-name="card-panel-icon1"/>
......@@ -54,11 +55,12 @@
<count-to :start-val="0" :end-val="count.wxCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
</el-col> -->
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<div class="card-panel" @click="nextpage('即将报废数量')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="30天" class-name="card-panel-icon1"/>
<svg-icon icon-class="30天" class-name="card-panel-icon"/>
</div>
<div class="card-panel-description">
<div class="card-panel-text">临近报废</div>
......@@ -66,7 +68,7 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<!-- <el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<div class="card-panel" @click="nextpage('报废数量')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="garbage" class-name="card-panel-icon" />
......@@ -76,6 +78,28 @@
<count-to :start-val="0" :end-val="count.bfCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col> -->
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<div class="card-panel" >
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="collecting" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">今年出库数</div>
<count-to :start-val="0" :end-val="2600" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<div class="card-panel" >
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="garbage" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">今年报废数</div>
<count-to :start-val="0" :end-val="280" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
</el-row>
</template>
......@@ -153,6 +177,7 @@ export default {
})
}
}
}
}
</script>
......@@ -163,8 +188,15 @@ export default {
.el-col-lg-3-4 {
width: 14.28%;
}
.el-col-lg-3-4 {
width: 20.28%;
}
// .card-panel-col{
// margin-bottom: 15px;
// }
.card-panel-col{
margin-bottom: 15px;
margin-bottom: 20px;
margin-left: 65px;
}
.card-panel {
height: 108px;
......@@ -197,12 +229,12 @@ export default {
}
.card-panel-icon {
float: left;
font-size: 48px;
}
.card-panel-icon1 {
float: left;
font-size: 52px;
font-size: 65px;
}
// .card-panel-icon1 {
// float: left;
// font-size: 52px;
// }
.card-panel-description {
float: right;
font-weight: bold;
......@@ -215,7 +247,7 @@ export default {
margin-bottom: 12px;
}
.card-panel-num {
font-size: 20px;
font-size: 23px;
}
}
}
......
src/views/system/threshold/index.vue
......@@ -19,7 +19,7 @@
<el-table-column label="操作" width="150" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="edit(scope.row)">编辑</el-button>
<el-popconfirm title="确定删除本条数据吗？" @onConfirm="subDelete(scope.row.id)">
<el-popconfirm title="确定删除本条数据吗？" @confirm="subDelete(scope.row.id)">
<el-button slot="reference" type="danger" size="mini">删除</el-button>
</el-popconfirm>
</template>
......@@ -43,7 +43,7 @@
<el-table-column label="操作" width="150" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="edit(scope.row)">编辑</el-button>
<el-popconfirm title="确定删除本条数据吗？" @onConfirm="subDelete(scope.row.id)">
<el-popconfirm title="确定删除本条数据吗？" @confirm="subDelete(scope.row.id)">
<el-button slot="reference" type="danger" size="mini">删除</el-button>
</el-popconfirm>
</template>
......
src/views/warehouse/inAndOutMang/common.vue
......@@ -80,7 +80,7 @@
<template slot-scope="scope">
<el-button size="mini" type="primary" key="2" @click="show(scope.row)">查看</el-button>
<el-button size="mini" type="warning" key="3" @click="printExcel(scope.row.order)" v-if="scope.row.stateType == '0' && scope.row.type == 1">打印</el-button>
<el-button size="mini" type="warning" key="4" @click="printExcel2(scope.row.order)" v-if="(scope.row.type == 0 || scope.row.type == 4)">打印</el-button>
<!-- <el-button size="mini" type="warning" key="4" @click="printExcel2(scope.row.order)" v-if="(scope.row.type == 0 || scope.row.type == 4)">打印</el-button> -->
<el-button size="mini" type="warning" key="1" v-if="scope.row.type == 11 && scope.row.currentState == 1" @click="transfer(scope.row)">转换</el-button>
</template>
</el-table-column>
......
src/views/warehouse/scrap/index.vue
......@@ -165,7 +165,7 @@ export default {
list = res.data.content
import('@/utils/Export2Excel备份').then(excel => {
const tHeader = ['仓库名称', '装备名称', '装备型号名称', '数量']
const filterVal = ['warehouseName', 'equName', 'sizeCount', 'count']
const filterVal = ['warehouseName', 'equName', 'sizeName', 'count']
result = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论