8 changed files with 638 additions and 16 deletions
-
8src/api/serial/checkLog.js
-
12src/assets/scss/global.scss
-
8src/views/modules/base/checkSerialNo.vue
-
277src/views/modules/serial/checkLog.vue
-
331src/views/modules/serial/upLoadSN.vue
-
2src/views/modules/sys/menu.vue
-
12src/views/modules/sys/user-add-or-update.vue
-
4static/config/index-prod.js
@ -0,0 +1,8 @@ |
|||
import { createAPI } from "@/utils/httpRequest.js"; |
|||
|
|||
// 获取工厂列表
|
|||
export const getCheckLogList = data => createAPI(`/serial/getCheckLogList`,'post',data) |
|||
|
|||
export const saveSerialCSV= data => createAPI(`/serial/saveSerialCSV`,'post',data) |
|||
|
|||
export const getCodePackageList= data => createAPI(`/serial/getCodePackageList`,'post',data) |
|||
@ -0,0 +1,277 @@ |
|||
<template> |
|||
<div class="mod-config"> |
|||
|
|||
<el-form :inline="true" label-position="top" :model="searchData"> |
|||
|
|||
<el-form-item :label="'序列号'"> |
|||
<el-input v-model="searchData.serialNo" style="width: 120px"></el-input> |
|||
</el-form-item> |
|||
<el-form-item :label="'查询日期'"> |
|||
<el-date-picker |
|||
style="width: 120px" |
|||
v-model="searchData.startDate" |
|||
type="date" |
|||
value-format="yyyy-MM-dd" |
|||
placeholder="选择日期"> |
|||
</el-date-picker> |
|||
</el-form-item> |
|||
|
|||
<el-form-item :label="'到'"> |
|||
<el-date-picker |
|||
style="width: 120px" |
|||
v-model="searchData.endDate" |
|||
type="date" |
|||
value-format="yyyy-MM-dd" |
|||
placeholder="结束时间"> |
|||
</el-date-picker> |
|||
</el-form-item> |
|||
<el-form-item :label="' '"> |
|||
<el-button @click="getDataList()">查询</el-button> |
|||
<download-excel |
|||
:fields="fields()" |
|||
:data="exportData" |
|||
type="xls" |
|||
:name="exportName" |
|||
:header="exportHeader" |
|||
:footer="exportFooter" |
|||
:fetch="createExportData" |
|||
:before-generate="startDownload" |
|||
:before-finish="finishDownload" |
|||
worksheet="导出信息" |
|||
class="el-button el-button--primary el-button--medium"> |
|||
{{ "导出" }} |
|||
</download-excel> |
|||
</el-form-item> |
|||
</el-form> |
|||
|
|||
<el-table |
|||
:height="height" |
|||
:data="dataList" |
|||
border |
|||
style="width: 100%;"> |
|||
<el-table-column |
|||
v-for="(item,index) in columnList" :key="index" |
|||
:sortable="item.columnSortable" |
|||
:prop="item.columnProp" |
|||
:header-align="item.headerAlign" |
|||
:show-overflow-tooltip="item.showOverflowTooltip" |
|||
:align="item.align" |
|||
:fixed="item.fixed==''?false:item.fixed" |
|||
:min-width="item.columnWidth" |
|||
:label="item.columnLabel"> |
|||
<template slot-scope="scope"> |
|||
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|||
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|||
</template> |
|||
</el-table-column> |
|||
</el-table> |
|||
|
|||
<el-pagination |
|||
@size-change="sizeChangeHandle" |
|||
@current-change="currentChangeHandle" |
|||
:current-page="pageIndex" |
|||
:page-sizes="[20, 50, 100, 200, 500]" |
|||
:page-size="pageSize" |
|||
:total="totalPage" |
|||
layout="total, sizes, prev, pager, next, jumper"> |
|||
</el-pagination> |
|||
|
|||
|
|||
|
|||
</div> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
getCheckLogList, |
|||
} from "@/api/serial/checkLog.js" |
|||
|
|||
export default { |
|||
|
|||
data () { |
|||
return { |
|||
// 是否收藏 |
|||
favorite: false, |
|||
// 导出 start |
|||
exportData: [], |
|||
exportName: "查询日志" + this.dayjs().format('YYYYMMDDHHmmss'), |
|||
exportHeader: ["查询日志"], |
|||
exportFooter: [], |
|||
exportList:[], |
|||
// 导出 end |
|||
searchData: { |
|||
serialNo: '', |
|||
startDate: '', |
|||
endDate: '', |
|||
page: 1, |
|||
limit: 10, |
|||
}, |
|||
height: 200, |
|||
pageIndex: 1, |
|||
pageSize: 50, |
|||
totalPage: 0, |
|||
dataList: [], |
|||
|
|||
// 展示列集 |
|||
columnList: [ |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002CheckTime', |
|||
tableId: "101001002Table1", |
|||
tableName: "查询日志表", |
|||
columnProp: 'checkTime', |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: '查询时间', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 130, |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002Table1SerialNo', |
|||
tableId: "101001002Table1", |
|||
tableName: "查询日志表", |
|||
columnProp: 'serialNo', |
|||
headerAlign: "center", |
|||
align: "left", |
|||
columnLabel: '序列号', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 300, |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002Table1IpAddress', |
|||
tableId: "101001002Table1", |
|||
tableName: "查询日志表", |
|||
columnProp: 'ipAddress', |
|||
headerAlign: "center", |
|||
align: "left", |
|||
columnLabel: 'IP地址', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 100, |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002Table1Location', |
|||
tableId: "101001002Table1", |
|||
tableName: "查询日志表", |
|||
columnProp: 'location', |
|||
headerAlign: "center", |
|||
align: "left", |
|||
columnLabel: '地区', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 100, |
|||
}, |
|||
], |
|||
|
|||
} |
|||
}, |
|||
|
|||
mounted () { |
|||
this.$nextTick(() => { |
|||
this.height = window.innerHeight - 210 |
|||
this. getDataList () |
|||
}) |
|||
}, |
|||
|
|||
created () { |
|||
|
|||
}, |
|||
|
|||
methods: { |
|||
|
|||
|
|||
|
|||
//导出excel |
|||
async createExportData () { |
|||
this.searchData.limit = -1 |
|||
this.searchData.page = 1 |
|||
await getCheckLogList(this.searchData).then(({data}) => { |
|||
this.exportList = data.page.list |
|||
}) |
|||
return this.exportList |
|||
}, |
|||
|
|||
startDownload () {}, |
|||
|
|||
finishDownload () {}, |
|||
|
|||
fields () { |
|||
let json = "{" |
|||
this.columnList.forEach((item, index) => { |
|||
if (index == this.columnList.length - 1) { |
|||
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" |
|||
} else { |
|||
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + "," |
|||
} |
|||
}) |
|||
json += "}" |
|||
let s = eval("(" + json + ")") |
|||
return s |
|||
}, |
|||
|
|||
// 获取数据列表 |
|||
getDataList () { |
|||
this.searchData.limit = this.pageSize |
|||
this.searchData.page = this.pageIndex |
|||
getCheckLogList(this.searchData).then(({data}) => { |
|||
if (data.code === 0) { |
|||
this.dataList = data.page.list |
|||
this.pageIndex = data.page.currPage |
|||
this.pageSize = data.page.pageSize |
|||
this.totalPage = data.page.totalCount |
|||
} |
|||
}) |
|||
}, |
|||
// 每页数 |
|||
sizeChangeHandle (val) { |
|||
this.pageSize = val |
|||
this.pageIndex = 1 |
|||
this.getDataList() |
|||
}, |
|||
// 当前页 |
|||
currentChangeHandle (val) { |
|||
this.pageIndex = val |
|||
this.getDataList() |
|||
}, |
|||
// 多选 |
|||
selectionChangeHandle (val) { |
|||
this.dataListSelections = val |
|||
}, |
|||
|
|||
|
|||
|
|||
|
|||
} |
|||
} |
|||
</script> |
|||
<style scoped> |
|||
/*.el-table /deep/ .cell{*/ |
|||
/* height: auto;*/ |
|||
/* line-height: 1.5;*/ |
|||
/*}*/ |
|||
</style> |
|||
@ -0,0 +1,331 @@ |
|||
<template> |
|||
<div class="mod-config"> |
|||
|
|||
|
|||
<el-form :inline="true" label-position="top" :model="searchData" > |
|||
<el-form-item :label="'文件名'"> |
|||
<el-input v-model="searchData.oriFileName" style="width: 120px"></el-input> |
|||
</el-form-item> |
|||
<el-form-item :label="'上传日期'"> |
|||
<el-date-picker |
|||
style="width: 120px" |
|||
v-model="searchData.startDate" |
|||
type="date" |
|||
value-format="yyyy-MM-dd" |
|||
placeholder="选择日期"> |
|||
</el-date-picker> |
|||
</el-form-item> |
|||
|
|||
<el-form-item :label="'到'"> |
|||
<el-date-picker |
|||
style="width: 120px" |
|||
v-model="searchData.endDate" |
|||
type="date" |
|||
value-format="yyyy-MM-dd" |
|||
placeholder="结束时间"> |
|||
</el-date-picker> |
|||
</el-form-item> |
|||
<el-form-item :label="' '"> |
|||
<el-button @click="getDataList()">查询</el-button> |
|||
<el-button type="primary" @click="addModal()">上传</el-button> |
|||
<download-excel |
|||
:fields="fields()" |
|||
:data="exportData" |
|||
type="xls" |
|||
:name="exportName" |
|||
:header="exportHeader" |
|||
:footer="exportFooter" |
|||
:fetch="createExportData" |
|||
:before-generate="startDownload" |
|||
:before-finish="finishDownload" |
|||
worksheet="导出信息" |
|||
class="el-button el-button--primary el-button--medium"> |
|||
{{ "导出" }} |
|||
</download-excel> |
|||
</el-form-item> |
|||
</el-form> |
|||
|
|||
<el-table |
|||
:height="height" |
|||
:data="dataList" |
|||
border |
|||
style="width: 100%;"> |
|||
<el-table-column |
|||
v-for="(item,index) in columnList" :key="index" |
|||
:sortable="item.columnSortable" |
|||
:prop="item.columnProp" |
|||
:header-align="item.headerAlign" |
|||
:show-overflow-tooltip="item.showOverflowTooltip" |
|||
:align="item.align" |
|||
:fixed="item.fixed==''?false:item.fixed" |
|||
:min-width="item.columnWidth" |
|||
:label="item.columnLabel"> |
|||
<template slot-scope="scope"> |
|||
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|||
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|||
</template> |
|||
</el-table-column> |
|||
</el-table> |
|||
|
|||
<el-pagination |
|||
@size-change="sizeChangeHandle" |
|||
@current-change="currentChangeHandle" |
|||
:current-page="pageIndex" |
|||
:page-sizes="[20, 50, 100, 200, 500]" |
|||
:page-size="pageSize" |
|||
:total="totalPage" |
|||
layout="total, sizes, prev, pager, next, jumper"> |
|||
</el-pagination> |
|||
|
|||
|
|||
<el-dialog title="上传码包" :close-on-click-modal="false" :visible.sync="visible" width="390px" style="height: 520px;" class="customer-dialog"> |
|||
<el-form :inline="true" label-position="top" label-width="80px"> |
|||
<el-row> |
|||
<el-col :span="24"> |
|||
<el-upload class="customer-upload" drag action="javascript:void(0);" ref="uploadFile2" :limit="1" accept=".csv" |
|||
:before-upload="beforeUploadHandle" :on-change="onChange" :auto-upload="false" style="text-align: left;"> |
|||
<i class="el-icon-upload"></i> |
|||
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div> |
|||
</el-upload> |
|||
</el-col> |
|||
</el-row> |
|||
</el-form> |
|||
<span slot="footer" class="dialog-footer"> |
|||
<el-button type="primary" :disabled="updateFlag" @click="saveUploadFile">保存</el-button> |
|||
<el-button type="primary" :disabled="updateFlag" @click="closeDialog">关闭</el-button> |
|||
</span> |
|||
</el-dialog> |
|||
</div> |
|||
</template> |
|||
|
|||
<script> |
|||
import { |
|||
saveSerialCSV,getCodePackageList, |
|||
} from "@/api/serial/checkLog.js" |
|||
|
|||
export default { |
|||
data () { |
|||
return { |
|||
updateFlag:false, |
|||
// 导出 start |
|||
exportData: [], |
|||
exportName: "设备分组" + this.dayjs().format('YYYYMMDDHHmmss'), |
|||
exportHeader: ["设备分组"], |
|||
exportFooter: [], |
|||
exportList:[], |
|||
// 导出 end |
|||
searchData: { |
|||
site: this.$store.state.user.site, |
|||
userName: this.$store.state.user.name, |
|||
oriFileName: '', |
|||
startDate: '', |
|||
endDate: '', |
|||
page: 1, |
|||
limit: 10, |
|||
}, |
|||
height: 200, |
|||
pageIndex: 1, |
|||
pageSize: 50, |
|||
totalPage: 0, |
|||
dataList: [], |
|||
|
|||
// 展示列集 |
|||
columnList: [ |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002Table1OriFileName', |
|||
tableId: "101001002Table1", |
|||
tableName: "码包上传", |
|||
columnProp: 'oriFileName', |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: '码包文件名', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 100, |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002Table1CreatedDate', |
|||
tableId: "101001002Table1", |
|||
tableName: "码包上传", |
|||
columnProp: 'createdDate', |
|||
headerAlign: "center", |
|||
align: "center", |
|||
columnLabel: '上传时间', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 120, |
|||
}, |
|||
{ |
|||
userId: this.$store.state.user.name, |
|||
functionId: 101001002, |
|||
serialNumber: '101001002Table1CreatedBy', |
|||
tableId: "101001002Table1", |
|||
tableName: "码包上传", |
|||
columnProp: 'createdBy', |
|||
headerAlign: "center", |
|||
align: "left", |
|||
columnLabel: '上传人', |
|||
columnHidden: false, |
|||
columnImage: false, |
|||
columnSortable: false, |
|||
sortLv: 0, |
|||
status: true, |
|||
fixed: '', |
|||
columnWidth: 200, |
|||
}, |
|||
|
|||
], |
|||
fileList: [], |
|||
visible:false, |
|||
} |
|||
}, |
|||
|
|||
mounted () { |
|||
this.$nextTick(() => { |
|||
this.height = window.innerHeight - 210 |
|||
this.getDataList () |
|||
}) |
|||
}, |
|||
|
|||
created () { |
|||
|
|||
}, |
|||
|
|||
methods: { |
|||
|
|||
|
|||
|
|||
//导出excel |
|||
async createExportData () { |
|||
this.searchData.limit = -1 |
|||
this.searchData.page = 1 |
|||
await getCodePackageList(this.searchData).then(({data}) => { |
|||
this.exportList = data.page.list |
|||
}) |
|||
return this.exportList |
|||
}, |
|||
|
|||
startDownload () {}, |
|||
|
|||
finishDownload () {}, |
|||
|
|||
fields () { |
|||
let json = "{" |
|||
this.columnList.forEach((item, index) => { |
|||
if (index == this.columnList.length - 1) { |
|||
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" |
|||
} else { |
|||
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + "," |
|||
} |
|||
}) |
|||
json += "}" |
|||
let s = eval("(" + json + ")") |
|||
return s |
|||
}, |
|||
|
|||
// 获取数据列表 |
|||
getDataList () { |
|||
this.searchData.limit = this.pageSize |
|||
this.searchData.page = this.pageIndex |
|||
getCodePackageList(this.searchData).then(({data}) => { |
|||
if (data.code === 0) { |
|||
this.dataList = data.page.list |
|||
this.pageIndex = data.page.currPage |
|||
this.pageSize = data.page.pageSize |
|||
this.totalPage = data.page.totalCount |
|||
} |
|||
}) |
|||
}, |
|||
// 每页数 |
|||
sizeChangeHandle (val) { |
|||
this.pageSize = val |
|||
this.pageIndex = 1 |
|||
this.getDataList() |
|||
}, |
|||
// 当前页 |
|||
currentChangeHandle (val) { |
|||
this.pageIndex = val |
|||
this.getDataList() |
|||
}, |
|||
// 多选 |
|||
selectionChangeHandle (val) { |
|||
this.dataListSelections = val |
|||
}, |
|||
|
|||
// 上传之前 |
|||
beforeUploadHandle (file) { |
|||
let extName = file[0].name.substring(file[0].name.lastIndexOf('.')).toLowerCase() |
|||
if (!(extName === '.csv')) { |
|||
this.$message.error('数据导入失败，请选择正确的csv文件') |
|||
return false |
|||
} |
|||
}, |
|||
|
|||
// 选择上传文件时 |
|||
onChange (file) { |
|||
this.fileList.push(file) |
|||
}, |
|||
// 保修当前的数据 |
|||
saveUploadFile () { |
|||
// 判断文件是否上传 |
|||
if (null == this.fileList || 0 === this.fileList.length) { |
|||
this.$message.error("请先上传文件!") |
|||
return false |
|||
} |
|||
const formData = new FormData() |
|||
formData.append("file", this.fileList[0].raw) |
|||
this.updateFlag=true |
|||
saveSerialCSV(formData).then(({data}) => { |
|||
if (data.code === 0) { |
|||
this.$message.success(data.msg) |
|||
this.updateFlag=false |
|||
// 关闭窗口并刷新页面 |
|||
this.closeDialog() |
|||
this.getDataList(); |
|||
} else { |
|||
this.updateFlag=true |
|||
this.$message.warning(data.msg) |
|||
} |
|||
}) |
|||
}, |
|||
// 关闭modal |
|||
closeDialog () { |
|||
this.fileList = [] |
|||
|
|||
// 关闭当前的页面 |
|||
this.visible = false |
|||
this.$nextTick(() => { |
|||
// 清空文件上传记录 |
|||
this.$refs.uploadFile2.clearFiles() |
|||
|
|||
}); |
|||
}, |
|||
|
|||
addModal(){ |
|||
this.fileList = [] |
|||
// 清空文件上传记录 |
|||
this.updateFlag=false |
|||
this.visible = true |
|||
|
|||
}, |
|||
}, |
|||
} |
|||
</script> |
|||
<style scoped> |
|||
/*.el-table /deep/ .cell{*/ |
|||
/* height: auto;*/ |
|||
/* line-height: 1.5;*/ |
|||
/*}*/ |
|||
</style> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue