Skip to content

K
kd_control
Commit 1e48282f authored by zhanglw's avatar zhanglw
Browse files
Options

在线编辑excel

parent 58aaf2c6
Show whitespace changes
Inline Side-by-side
Showing with 456 additions and 56 deletions
package.json
View file @ 1e48282f
......@@ -56,6 +56,8 @@
"jssip": "^3.10.0",
"jswebrtc": "^1.0.0",
"jszip": "3.1.5",
"less": "^4.2.0",
"less-loader": "^7.3.0",
"mars3d": "^3.1.3",
"mavon-editor": "^2.9.0",
"moment": "^2.29.4",
......@@ -82,6 +84,7 @@
"vuedraggable": "2.20.0",
"vuex": "3.1.0",
"wangeditor": "^3.1.1",
"x-data-spreadsheet": "^1.1.9",
"xlsx": "^0.14.5"
},
"devDependencies": {
......
src/assets/js/common.js
View file @ 1e48282f
......@@ -3185,6 +3185,14 @@ var HttpReq = function(){
method: 'get'
})
},
//开采管理-修改excel报表
scUpdateExcel: function(data){
return request({
url: '/api/miningManagement/updateExcel',
method: 'PUT',
data: data,
})
},
//开采管理-下载文件
downloadExcelOrFbx: function(params){
return request({
......
src/views/productionPlanManagement/mineFile/index.vue
View file @ 1e48282f
......@@ -6,7 +6,7 @@
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">文件名</label>
<el-input v-model="query.fileName" clearable size="small" placeholder="请输入文件名称" style="width:180px;"/>
<el-input v-model="query.fileName" clearable size="small" placeholder="请输入文件名称" style="width:180px;" />
<label class="el-form-item-label" style="font-weight: 500;">上传时间</label>
<el-date-picker
v-model="query.modificationTime"
......@@ -15,8 +15,8 @@
range-separator="至"
:default-time="['00:00:00', '23:59:59']"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
end-placeholder="结束日期"
/>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div>
......@@ -32,37 +32,46 @@
</div>
<div class="content">
<el-tabs v-model="query.type" @tab-click="loadData">
<el-tab-pane label="Excel报表" name="excel"></el-tab-pane>
<el-tab-pane label="三维模型" name="fbx"></el-tab-pane>
<el-tab-pane label="Excel报表" name="excel" />
<el-tab-pane label="三维模型" name="fbx" />
</el-tabs>
<el-table :data="tableData" v-loading="loading" border style="width:auto">
<el-table-column prop="fileName" label="文件名" align="center"></el-table-column>
<el-table-column prop="url" label="文件路由" align="center"></el-table-column>
<el-table-column prop="modificationTime" label="上传时间" align="center"></el-table-column>
<el-table v-loading="loading" :data="tableData" border style="width:auto">
<el-table-column prop="fileName" label="文件名" align="center" />
<el-table-column prop="url" label="文件路由" align="center" />
<el-table-column prop="modificationTime" label="上传时间" align="center" />
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-if="query.type==='excel'" size="mini" type="text" icon="el-icon-view" @click="viewTable(scope.row)">在线预览</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="downloadFile(scope.row)">下载</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="toDelete(scope.row)">删除</el-button>
<!-- <el-progress type="dashboard" :percentage="scope.row.percentage||20" :color="colors"></el-progress>-->
<!-- <el-progress type="dashboard" :percentage="scope.row.percentage||20" :color="colors"></el-progress>-->
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange"/>
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
</div>
</div>
</div>
</div>
</div>
<!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="title" width="1400px" top="8vh">
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="openFile.fileName" width="1400px" top="8vh">
<el-tabs v-model="activeTab" type="border-card" style="margin:0;width:1360px;" @tab-click="handleTabClick">
<el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item" :name="item"></el-tab-pane>
<div v-html="tableHtml" style="width:1328px;max-height:66vh;overflow:auto;"/>
<el-tab-pane v-for="(item, index) in tabList" :key="index" :label="item" :name="item" />
<div style="width:1328px;max-height:66vh;overflow:auto;">
<table border="1" bordercolor="black" cellspacing="0" cellpadding="5" style="margin: 0 auto">
<tr v-for="(rowList, rowIndex) in excelTableData" :key="'r'+rowIndex">
<td v-for="(cell, colIndex) in rowList" :key="'c'+colIndex" :rowspan="cell.rowspan" :colspan="cell.colspan" style="min-width:150px;text-align:center;">
<el-input v-model="cell.text" placeholder="空" :textcolor="cell.textcolor||'black'" @input="cell.textcolor='red'" />
</td>
</tr>
</table>
</div>
</el-tabs>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="cancelForm">关闭</el-button>
<el-button type="primary" @click="updataEcxel">保存</el-button>
</div>
</el-dialog>
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="uploadVisible" title="文件上传" width="560px">
......@@ -81,7 +90,7 @@
:data="{type:query.type}"
>
<div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
<div slot="tip" class="el-upload__tip">请上传{{query.type}}文件，且不超过100M</div>
<div slot="tip" class="el-upload__tip">请上传{{ query.type }}文件，且不超过100M</div>
</el-upload>
</el-form-item>
</el-form>
......@@ -96,13 +105,13 @@
<script>
import { getToken } from '@/utils/auth'
import {Tools, HttpReq, Dates} from '@/assets/js/common.js';
import { Tools, HttpReq, Dates } from '@/assets/js/common.js'
export default {
name: 'visitPeople',
name: 'VisitPeople',
data() {
return {
colors: [{color: '#f56c6c', percentage: 20}, {color: '#e6a23c', percentage: 40}, {color: '#5cb87a', percentage: 60}, {color: '#1989fa', percentage: 80}, {color: '#6f7ad3', percentage: 100}],
colors: [{ color: '#f56c6c', percentage: 20 }, { color: '#e6a23c', percentage: 40 }, { color: '#5cb87a', percentage: 60 }, { color: '#1989fa', percentage: 80 }, { color: '#6f7ad3', percentage: 100 }],
title: '',
fileUploadApi: '',
headers: { 'Authorization': getToken() },
......@@ -110,16 +119,19 @@ export default {
uploadVisible: false,
loading: false,
query: {
type: 'excel',
type: 'excel'
},
page: 1,
size: 10,
total: 0,
tableData: [],
openFile: {
fileName: ''
},
tabList: ['Sheet1'],
activeTab: 'Sheet1',
tableHtml: '',
form: {},
excelTableData: [],
form: {}
}
},
mounted() {
......@@ -128,13 +140,26 @@ export default {
})
},
methods: {
updataEcxel() {
HttpReq.truckDispatching.scUpdateExcel({ url: this.openFile.url, json: JSON.stringify(this.excelTableData) }).then((res) => {
this.$notify({
title: res.msg,
type: res.code === 200 ? 'success' : 'error',
duration: 2500
})
if (res.code === 200) {
this.cancelForm()
this.loadData()
}
})
},
toDelete(item) {
this.$confirm(`确认删除文件：${item.fileName}?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
HttpReq.truckDispatching.deleteExcelOrFbx({fileName:item.fileName, type:this.query.type}).then((res) => {
HttpReq.truckDispatching.deleteExcelOrFbx({ fileName: item.fileName, type: this.query.type }).then((res) => {
this.$notify({
title: res.msg,
type: res.code === 200 ? 'success' : 'error',
......@@ -147,23 +172,23 @@ export default {
}).catch(() => {})
},
download(text, name, suffix) {
var link = document.createElement('a');
link.style.display = 'none';
link.href = URL.createObjectURL(new Blob([text], { type: this.query.type==='excel'?"application/vnd.ms-excel":"application/octet-stream" }));
link.setAttribute('download', name + '.' + suffix);
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
var link = document.createElement('a')
link.style.display = 'none'
link.href = URL.createObjectURL(new Blob([text], { type: this.query.type === 'excel' ? 'application/vnd.ms-excel' : 'application/octet-stream' }))
link.setAttribute('download', name + '.' + suffix)
document.body.appendChild(link)
link.click()
document.body.removeChild(link)
},
downloadFile(item) {
if(item.isLoading){
if (item.isLoading) {
return
}
item.isLoading = true
item.percentage = 0
let strArr = item.fileName.split('.')
HttpReq.truckDispatching.downloadExcelOrFbx({url:item.url, type:this.query.type}).then((res) => {
this.download(res, strArr[0], strArr[1]||'xlsx')
const strArr = item.fileName.split('.')
HttpReq.truckDispatching.downloadExcelOrFbx({ url: item.url, type: this.query.type }).then((res) => {
this.download(res, strArr[0], strArr[1] || 'xlsx')
item.isLoading = false
})
},
......@@ -203,29 +228,20 @@ export default {
this.loading = false
},
handleTabClick(tab, event) {
console.log(tab, event);
console.log(tab, event)
},
viewTable (item) {
viewTable(item) {
this.visible = true
this.title = item.fileName
this.tableHtml = ``
HttpReq.truckDispatching.scReadExcel({url:item.url}).then((res) => {
this.openFile = item
this.excelTableData = []
HttpReq.truckDispatching.scReadExcel({ url: item.url }).then((res) => {
this.$notify({
title: res.msg,
type: res.code === 200 ? 'success' : 'error',
duration: 2500
})
if (res.code == 200) {
let data = res.data
this.tableHtml+=`<table border="1" bordercolor="black" cellspacing="0" cellpadding="5" style="margin: 0 auto">`
data.forEach(rowArr=>{
this.tableHtml+=`<tr>`
rowArr.forEach(cell=>{
this.tableHtml+=`<td rowspan="${cell.rowspan}" colspan="${cell.colspan}" style="min-width:150px;text-align:center;">${cell.text}</td>`
})
this.tableHtml+=`</tr>`
})
this.tableHtml+=`</table>`
if (res.code === 200) {
this.excelTableData = res.data
}
})
},
......@@ -234,25 +250,27 @@ export default {
if (this.query[item] === null || this.query[item] === '') this.query[item] = undefined
})
HttpReq.truckDispatching.scFindAllExcelInfo(this.query).then((res) => {
if (res.code == 200) {
this.tableData = res.data;
if (res.code === 200) {
this.tableData = res.data
}
})
},
cancelForm() {
this.visible = false
this.uploadVisible = false
if (this.$refs.upload) {
this.$refs.upload.clearFiles()
}
this.loadData()
},
// 点击搜索
toSearch() {
this.page = 1;
this.loadData();
this.page = 1
this.loadData()
},
// 重置搜索
clearLimit() {
this.query = {};
this.query = {}
this.loadData()
},
pageChange(e) {
......@@ -264,7 +282,7 @@ export default {
this.size = e
this.loadData()
}
},
}
}
</script>
......@@ -316,4 +334,10 @@ export default {
width: 680px;
overflow: hidden;
}
>>>.el-input__inner {
border: 0;
}
>>>.el-input__inner[textcolor="red"] {
color: #F00
}
</style>
src/views/productionPlanManagement/mineFile/index_.vue 0 → 100644
View file @ 1e48282f
<template>
<div class="common-page device-manage">
<div class="option page-row">
<!--工具栏-->
<div class="head-container">
<!-- 搜索 -->
<label class="el-form-item-label" style="font-weight: 500;">文件名</label>
<el-input v-model="query.fileName" clearable size="small" placeholder="请输入文件名称" style="width:180px;"/>
<label class="el-form-item-label" style="font-weight: 500;">上传时间</label>
<el-date-picker
v-model="query.modificationTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
:default-time="['00:00:00', '23:59:59']"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
</div>
</div>
<!-- 表格 -->
<div class="panel-bottom page-row">
<div class="ctin-box">
<div class="content-within">
<div class="content-fix">
<div class="toolbar">
<el-button slot="left" class="filter-item" size="mini" type="primary" icon="el-icon-upload" @click="uploadVisible=true">上传</el-button>
</div>
<div class="content">
<el-tabs v-model="query.type" @tab-click="loadData">
<el-tab-pane label="Excel报表" name="excel"></el-tab-pane>
<el-tab-pane label="三维模型" name="fbx"></el-tab-pane>
</el-tabs>
<el-table :data="tableData" v-loading="loading" border style="width:auto">
<el-table-column prop="fileName" label="文件名" align="center"></el-table-column>
<el-table-column prop="url" label="文件路由" align="center"></el-table-column>
<el-table-column prop="modificationTime" label="上传时间" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope">
<el-button v-if="query.type==='excel'" size="mini" type="text" icon="el-icon-view" @click="viewTable(scope.row)">在线预览</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="downloadFile(scope.row)">下载</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="toDelete(scope.row)">删除</el-button>
<!-- <el-progress type="dashboard" :percentage="scope.row.percentage||20" :color="colors"></el-progress>-->
</template>
</el-table-column>
</el-table>
<!--分页组件-->
<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange"/>
</div>
</div>
</div>
</div>
</div>
<!-- 表单渲染 -->
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="visible" :title="openFile.fileName" width="1600px" top="1vh">
<div id="x-spreadsheet-excel"></div>
<div slot="footer" class="dialog-footer" style="text-align: center">
<el-button @click="cancelForm">关闭</el-button>
<el-button type="primary" @click="updataEcxel">保存</el-button>
</div>
</el-dialog>
<el-dialog append-to-body :close-on-click-modal="false" :before-close="cancelForm" :visible.sync="uploadVisible" title="文件上传" width="560px">
<el-form ref="form" :model="form" size="small" label-width="80px">
<!-- 上传文件 -->
<el-form-item label="">
<el-upload
ref="upload"
:before-upload="beforeUpload"
:auto-upload="false"
:headers="headers"
:on-change="handleFileChange"
:on-success="handleSuccess"
:on-error="handleError"
action="/api/miningManagement/uploadExcelOrFbx"
:data="{type:query.type}"
>
<div class="eladmin-upload"><i class="el-icon-upload" /> 添加文件</div>
<div slot="tip" class="el-upload__tip">请上传{{query.type}}文件，且不超过100M</div>
</el-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="cancelForm">取消</el-button>
<el-button :loading="loading" type="primary" @click="upload">确认</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getToken } from '@/utils/auth'
import Spreadsheet from "x-data-spreadsheet";
import {Tools, HttpReq, Dates} from '@/assets/js/common.js';
export default {
name: 'visitPeople',
data() {
return {
colors: [{color: '#f56c6c', percentage: 20}, {color: '#e6a23c', percentage: 40}, {color: '#5cb87a', percentage: 60}, {color: '#1989fa', percentage: 80}, {color: '#6f7ad3', percentage: 100}],
title: '',
fileUploadApi: '',
headers: { 'Authorization': getToken() },
visible: false,
uploadVisible: false,
loading: false,
query: {
type: 'excel',
},
page: 1,
size: 10,
total: 0,
tableData: [],
openFile: {
fileName: ''
},
tabList: ['Sheet1'],
activeTab: 'Sheet1',
excelTableData: [],
form: {},
xs: null
}
},
mounted() {
this.$nextTick(() => {
this.loadData()
})
},
methods: {
updataEcxel() {
console.log(this.xs.getData())
},
viewTable (item) {
this.visible = true
this.openFile = item
this.excelTableData = []
HttpReq.truckDispatching.scReadExcel({url:item.url}).then((res) => {
this.$notify({
title: res.msg,
type: res.code === 200 ? 'success' : 'error',
duration: 2500
})
if (res.code == 200) {
this.excelTableData = res.data
let rowsMap={}
res.data.forEach((row,ri)=>{
let cells={}
row.forEach((col,ci)=>{
cells.ci={}
})
rowsMap.ri={cells:cells}
})
if(!this.xs){
this.xs = new Spreadsheet("#x-spreadsheet-excel", {
view:{
width: () =>{return 1600},
height: () =>{return 800}
},
style: {
align: 'center',
valign: 'middle',
}
})
}
this.xs.loadData({
name: '表格111',
merges:["C2:D5", "A2:A4", "A1:C1"],
rows: {
0:{
cells:{
0:{
merge:[0, 2],
text: '1121212'
},
3:{
text: 'xxxxx'
}
}
}
}
})
}
})
},
toDelete(item) {
this.$confirm(`确认删除文件：${item.fileName}?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
HttpReq.truckDispatching.deleteExcelOrFbx({fileName:item.fileName, type:this.query.type}).then((res) => {
this.$notify({
title: res.msg,
type: res.code === 200 ? 'success' : 'error',
duration: 2500
})
if (res.code === 200) {
this.loadData()
}
})
}).catch(() => {})
},
download(text, name, suffix) {
var link = document.createElement('a');
link.style.display = 'none';
link.href = URL.createObjectURL(new Blob([text], { type: this.query.type==='excel'?"application/vnd.ms-excel":"application/octet-stream" }));
link.setAttribute('download', name + '.' + suffix);
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
},
downloadFile(item) {
if(item.isLoading){
return
}
item.isLoading = true
item.percentage = 0
let strArr = item.fileName.split('.')
HttpReq.truckDispatching.downloadExcelOrFbx({url:item.url, type:this.query.type}).then((res) => {
this.download(res, strArr[0], strArr[1]||'xlsx')
item.isLoading = false
})
},
upload() {
this.$refs.upload.submit()
},
handleFileChange(file) {
},
beforeUpload(file) {
let isLt2M = true
isLt2M = file.size / 1024 / 1024 < 100
if (!isLt2M) {
this.loading = false
this.$message.error('上传文件大小不能超过 100MB!')
}
return isLt2M
},
handleSuccess(res, file, fileList) {
this.$notify({
title: res.msg,
type: res.code === 200 ? 'success' : 'error',
duration: 2500
})
if (res.code === 200) {
this.cancelForm()
}
},
// 监听上传失败
handleError(e, file, fileList) {
const msg = JSON.parse(e.message)
this.$notify({
title: msg.message,
type: 'error',
duration: 2500
})
this.loading = false
},
handleTabClick(tab, event) {
console.log(tab, event);
},
loadData() {
Object.keys(this.query).length !== 0 && Object.keys(this.query).forEach(item => {
if (this.query[item] === null || this.query[item] === '') this.query[item] = undefined
})
HttpReq.truckDispatching.scFindAllExcelInfo(this.query).then((res) => {
if (res.code == 200) {
this.tableData = res.data;
}
})
},
cancelForm() {
this.visible = false
this.uploadVisible = false
if(this.$refs.upload){
this.$refs.upload.clearFiles()
}
this.loadData()
},
// 点击搜索
toSearch() {
this.page = 1;
this.loadData();
},
// 重置搜索
clearLimit() {
this.query = {};
this.loadData()
},
pageChange(e) {
this.page = e
this.loadData()
},
sizeChange(e) {
this.page = 1
this.size = e
this.loadData()
}
},
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
.el-table .warning-row {
background: oldlace;
}
.el-table .success-row {
background: #f0f9eb;
}
.cell-input {
//min-width: 220px;
}
.form-cell {
margin: 0 !important;
width: 100%;
}
.grid-content {
//border: 1px solid rgba(100, 100, 100, 0.1);
padding: 5px 30px;
}
.cell-box {
min-width: 120px;
}
.cell-box .el-input__inner {
border: 1px solid rgba(100, 100, 100, 0.1);
}
.cell-box .el-input.is-disabled .el-input__inner {
border: 1px solid rgba(100, 100, 100, 0.1);
background: white;
cursor: text;
}
.cell-box .el-input.is-disabled .el-input__icon {
cursor: text;
}
.cell-box .el-icon-arrow-up:before {
content: '';
}
.mapcontainer {
height: 30vh;
width: 680px;
overflow: hidden;
}
>>>.el-input__inner {
border: 0;
}
>>>.el-input__inner[textcolor="red"] {
color: #F00
}
>>>.el-dialog__body {
padding: 0;
margin: 0;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment