From 09a1635f5182a166771e0c827450cdfc00f052b8 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期一, 26 二月 2024 16:53:38 +0800
Subject: [PATCH] 代码更新
---
src/api/api.js | 6
src/assets/lang/zh.js | 1
public/config/config.js | 2
src/views/userManage/templateManage.vue | 330 ++++++--------------------
src/assets/lang/en.js | 1
src/views/datamanage/dataStatistics.vue | 374 ++++++++++++------------------
6 files changed, 237 insertions(+), 477 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index cc6a5dd..4950f23 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -11,7 +11,7 @@
var webHost = location.origin; // http://192.168.20.205:8088
if (isLocal) {
- host = "http://192.168.20.205";
+ host = "http://192.168.11.205";
webHost = host + ":8088";
}
diff --git a/src/api/api.js b/src/api/api.js
index 2c88876..b0d4eeb 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -938,8 +938,12 @@
export function dataCount_countSizesByPrj(params) {
return request.get('/dataCount/countSizesByPrj', { params: params });
}
+//鏁版嵁缁熻=>杞瓟鏁版嵁缁熻
+export function dataCount_countExplorationPoints(params) {
+ return request.get('/dataCount/countExplorationPoints', { params: params });
+}
-
+
//鏁版嵁缁熻=>涓嬭浇鎶ュ憡
export function dataCount_downloadReport(params) {
return request.get('/dataCount/downloadReport', { params: params });
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 0eb0e03..2fe6f57 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -116,6 +116,7 @@
type5: 'menu name',
type7: 'visits',
type8: 'Number of statistics',
+ type9: 'Number',
},
projectObj: {
projname: 'Project Name',
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 285f361..85636b9 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -109,6 +109,7 @@
type5: '鑿滃崟鍚嶇О',
type7: '璁块棶娆℃暟',
type8: '缁熻鏉℃暟',
+ type9: '鏁伴噺',
},
projectObj: {
projname: '椤圭洰鍚嶇О',
diff --git a/src/views/datamanage/dataStatistics.vue b/src/views/datamanage/dataStatistics.vue
index be5fdcb..d793e71 100644
--- a/src/views/datamanage/dataStatistics.vue
+++ b/src/views/datamanage/dataStatistics.vue
@@ -1,265 +1,125 @@
<template>
<div class="box_div dataStatistics">
<My-bread :list="[
- `${$t('dataManage.dataManage')}`,
- `${$t('dataManage.dataStatistics')}`,
- ]"></My-bread>
+ `${$t('dataManage.dataManage')}`,
+ `${$t('dataManage.dataStatistics')}`,
+ ]"></My-bread>
<el-divider />
<div class="contentBox">
- <div
- class="content_Left subpage_Div"
- style="border: 1px solid #dcdfe6;"
- >
- <el-tree
- :data="treeData"
- @node-click="handleNodeClick"
- node-key="id"
- ref="tree"
- highlight-current
- :props="defaultProps"
- >
+ <div class="content_Left subpage_Div" style="border: 1px solid #dcdfe6;">
+ <el-tree :data="treeData" @node-click="handleNodeClick" node-key="id" ref="tree" highlight-current
+ :props="defaultProps">
</el-tree>
</div>
- <div
- class="content_Right subpage_Div"
- style="border: 1px solid #dcdfe6;"
- >
- <div
- class=" subpage_Div iquery"
- style="padding-bottom: 14px"
- >
+ <div class="content_Right subpage_Div" style="border: 1px solid #dcdfe6;">
+ <div class=" subpage_Div iquery" style="padding-bottom: 14px">
<div>
- <el-form
- :inline="true"
- :model="tjlxData"
- class="demo-form-inline"
- >
- <el-form-item
- label="缁熻绫诲瀷"
- v-show="!setCountFlag && tjlxData.flag"
- >
- <el-select
- v-model="tjlxData.region"
- size="small"
- @change="setTjlxDataChange"
- >
+ <el-form :inline="true" :model="tjlxData" class="demo-form-inline">
+ <el-form-item label="缁熻绫诲瀷" v-show="!setCountFlag && tjlxData.flag">
+ <el-select v-model="tjlxData.region" size="small" @change="setTjlxDataChange">
- <el-option
- label="鏁版嵁瀛樺偍閲�"
- value="sjccl"
- >
+ <el-option label="鏁版嵁瀛樺偍閲�" value="sjccl">
</el-option>
- <el-option
- label="鏂囦欢涓暟"
- value="sjts"
- >
-
+ <el-option label="鏂囦欢涓暟" value="sjts">
</el-option>
-
</el-select>
+
+ </el-form-item>
+ <el-form-item v-show="!setCountFlag" label="鎬昏:">
+ {{ dataVolume }}
+
</el-form-item>
<el-form-item>
- <el-button
- icon="el-icon-c-scale-to-original"
- size="small"
- type="warning"
- @click="setCountFlagChange(1)"
- >{{ $t("shuJuGuanLi.butten.Report") }}</el-button>
+ <el-button icon="el-icon-c-scale-to-original" size="small" type="warning"
+ @click="setCountFlagChange(1)">{{ $t("shuJuGuanLi.butten.Report") }}</el-button>
</el-form-item>
<el-form-item>
- <el-button
- icon="el-icon-pie-chart"
- size="small"
- type="primary"
- @click="setCountFlagChange(2)"
- >{{ $t("shuJuGuanLi.butten.Histogram") }}</el-button>
+ <el-button icon="el-icon-pie-chart" size="small" type="primary" @click="setCountFlagChange(2)">{{
+ $t("shuJuGuanLi.butten.Histogram") }}</el-button>
</el-form-item>
<el-form-item v-show="setDownloadType">
- <el-button
- icon="el-icon-download"
- size="small"
- type="success"
- @click="setCountFlagChange(3)"
- >{{ $t("shuJuGuanLi.butten.Download") }}</el-button>
+ <el-button icon="el-icon-download" size="small" type="success" @click="setCountFlagChange(3)">{{
+ $t("shuJuGuanLi.butten.Download") }}</el-button>
</el-form-item>
</el-form>
</div>
</div>
<div class="dividing-line"></div>
- <div
- class="contentTable subpage_Div"
- v-show="setCountFlag"
- >
- <el-table
- :data="tableData"
- style="width: 100%"
- height="calc(100% - 1px)"
- ref="table"
- >
- <el-table-column
- v-if="queryData.value == 'countServices'"
- prop="m1"
- key="1"
- align="center"
- :label="$t('dataManage.dataStaticObj.type1')"
- >
+ <div class="contentTable subpage_Div" v-show="setCountFlag">
+ <el-table :data="reportFormsData" style="width: 100%" height="calc(100% - 1px)" ref="table">
+ <el-table-column v-if="queryData.value == 'countServices'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countServices'"
- prop="count"
- key="2"
- align="center"
- :label="$t('dataManage.dataStaticObj.type2')"
- >
+ <el-table-column v-if="queryData.value == 'countServices'" :formatter="formatterColumn2" prop="count" key="2"
+ align="center" :label="$t('dataManage.dataStaticObj.type2')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizes'"
- prop="m1"
- key="3"
- align="center"
- :label="$t('dataManage.dataStaticObj.type3')"
- >
+ <el-table-column v-if="queryData.value == 'countSizes'" prop="m1" key="3" align="center"
+ :label="$t('dataManage.dataStaticObj.type3')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizes'"
- prop="sizes"
- key="4"
- align="center"
- :label="$t('dataManage.dataStaticObj.type4')"
- :formatter="formatterColumn"
- >
+ <el-table-column v-if="queryData.value == 'countSizes'" prop="sizes" key="4" align="center"
+ :label="$t('dataManage.dataStaticObj.type4')" :formatter="formatterColumn">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizes'"
- prop="count"
- key="4"
- align="center"
- :label="$t('dataManage.dataStaticObj.type8')"
- >
+ <el-table-column v-if="queryData.value == 'countSizes'" :formatter="formatterColumn3" prop="count" key="4"
+ align="center" :label="$t('dataManage.dataStaticObj.type8')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countOperates'"
- prop="m1"
- key="5"
- align="center"
- :label="$t('dataManage.dataStaticObj.type5')"
- >
+ <el-table-column v-if="queryData.value == 'countOperates'" prop="m1" key="5" align="center"
+ :label="$t('dataManage.dataStaticObj.type5')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countOperates'"
- prop="count"
- key="6"
- align="center"
- :label="$t('dataManage.dataStaticObj.type7')"
- >
+ <el-table-column v-if="queryData.value == 'countOperates'" prop="count" :formatter="formatterColumn3" key="6"
+ align="center" :label="$t('dataManage.dataStaticObj.type7')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizesByType'"
- prop="m1"
- key="3"
- align="center"
- :label="$t('common.fileType')"
- >
+ <el-table-column v-if="queryData.value == 'countSizesByType'" prop="m1" key="3" align="center"
+ :label="$t('common.fileType')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizesByType'"
- prop="sizes"
- key="4"
- align="center"
- :label="$t('dataManage.dataStaticObj.type4')"
- :formatter="formatterColumn"
- >
+ <el-table-column v-if="queryData.value == 'countSizesByType'" prop="sizes" key="4" align="center"
+ :label="$t('dataManage.dataStaticObj.type4')" :formatter="formatterColumn">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizesByType'"
- prop="count"
- key="4"
- align="center"
- :label="$t('dataManage.dataStaticObj.type8')"
- >
+ <el-table-column v-if="queryData.value == 'countSizesByType'" prop="count" :formatter="formatterColumn3"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type8')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizesByPrj'"
- prop="m1"
- key="3"
- align="center"
- :label="$t('dataManage.projectObj.projname')"
- >
+ <el-table-column v-if="queryData.value == 'countSizesByPrj'" prop="m1" key="3" align="center"
+ :label="$t('dataManage.projectObj.projname')">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizesByPrj'"
- prop="sizes"
- key="4"
- align="center"
- :label="$t('dataManage.dataStaticObj.type4')"
- :formatter="formatterColumn"
- >
+ <el-table-column v-if="queryData.value == 'countSizesByPrj'" prop="sizes" key="4" align="center"
+ :label="$t('dataManage.dataStaticObj.type4')" :formatter="formatterColumn">
</el-table-column>
- <el-table-column
- v-if="queryData.value == 'countSizesByPrj'"
- prop="count"
- key="4"
- align="center"
- :label="$t('dataManage.dataStaticObj.type8')"
- >
+ <el-table-column v-if="queryData.value == 'countSizesByPrj'" prop="count" :formatter="formatterColumn3"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type8')">
+ </el-table-column>
+
+
+ <el-table-column v-if="queryData.value == 'countExplorationPoints'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countExplorationPoints'" prop="sizes" key="4" align="center"
+ :formatter="formatterColumn" :label="$t('dataManage.dataStaticObj.type4')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countExplorationPoints'" prop="count" :formatter="formatterColumn3"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
</el-table-column>
</el-table>
-
</div>
- <div
- id="contentEchart subpage_Div"
- class="contentTable"
- v-show="!setCountFlag"
- >
+ <div id="contentEchart subpage_Div" class="contentTable" v-show="!setCountFlag">
<div id="chart_11"></div>
</div>
</div>
</div>
- <el-dialog
- title="妯℃澘"
- :visible.sync="showDownLoadFlag"
- width="50%"
- :before-close="handleClose"
- >
+ <el-dialog title="妯℃澘" :visible.sync="showDownLoadFlag" width="50%" :before-close="handleClose">
<div style="height: 50vh">
- <el-table
- ref="singleTable"
- :data="modelData"
- height="calc(100% - 10px)"
- style="width: 100%"
- >
- <el-table-column
- type="index"
- :label="$t('common.index')"
- align="center"
- width="70"
- >
+ <el-table ref="singleTable" :data="modelData" height="calc(100% - 10px)" style="width: 100%">
+ <el-table-column type="index" :label="$t('common.index')" align="center" width="70">
</el-table-column>
- <el-table-column
- align="center"
- property="fname"
- :label="$t('common.fileNme')"
- >
+ <el-table-column align="center" property="fname" :label="$t('common.fileNme')">
</el-table-column>
- <el-table-column
- property="type"
- :label="$t('common.format')"
- align="center"
- :formatter="showFormat"
- >
+ <el-table-column property="type" :label="$t('common.format')" align="center" :formatter="showFormat">
</el-table-column>
- <el-table-column
- width="120"
- :label="$t('common.operate')"
- >
+ <el-table-column width="120" :label="$t('common.operate')">
<template slot-scope="scope">
- <el-button
- @click="setDownLoadRow(scope.row)"
- size="small"
- >
+ <el-button @click="setDownLoadRow(scope.row)" size="small">
{{ $t("common.download") }}
</el-button>
</template>
@@ -267,11 +127,7 @@
</el-table>
</div>
</el-dialog>
- <iframe
- id="Iframe1"
- src=""
- style="display: none; border: 0; padding: 0; height: 0; width: 0"
- ></iframe>
+ <iframe id="Iframe1" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe>
</div>
</template>
@@ -287,8 +143,10 @@
dataCount_selectCountSizes,
dataCount_downloadReport,
dataCount_countSizesByType,
- dataCount_countSizesByPrj
+ dataCount_countSizesByPrj,
+ dataCount_countExplorationPoints
} from "../../api/api.js";
+import { t } from 'element-ui/lib/locale';
export default {
name: "DataStatistics",
components: { MyBread },
@@ -322,7 +180,12 @@
value: "countServices",
children: [],
},
-
+ {
+ id: 6,
+ label: "閽诲瓟鏁版嵁缁熻",
+ value: "countExplorationPoints",
+ children: [],
+ },
],
tjlxData: {
region: 'sjccl',
@@ -346,6 +209,8 @@
option: null,
showDownLoadFlag: false,
setDownloadType: false,
+ dataVolume: null,
+ reportFormsData: [],
};
},
@@ -357,8 +222,17 @@
this.showCountEchart()
},
formatterColumn(row, column, cellValue, index) {
-
- return (row.sizes / 1024).toFixed(6) + "GB"
+ if (row.sizes >= 1024) {
+ return (row.sizes / 1024).toFixed(3) + "GB"
+ } else {
+ return (row.sizes).toFixed(3) + "MB"
+ }
+ },
+ formatterColumn2(row) {
+ return row.count + "娆�"
+ },
+ formatterColumn3(row) {
+ return row.count + "涓�"
},
setDownLoadRow(rows) {
var url =
@@ -394,10 +268,28 @@
closeDownLoadFlag() {
this.showDownLoadFlag = false;
},
+ getReportForms() {
+ this.reportFormsData = [];
+ var val = JSON.parse(JSON.stringify(this.tableData))[0];
+ var sizes = 0;
+ var count = 0;
+ var m1 = "鎬昏"
+ for (var i in this.tableData) {
+ sizes += this.tableData[i].sizes;
+ count += this.tableData[i].count;
+ }
+ val.count = count;
+ val.sizes = sizes;
+ val.m1 = m1;
+
+ this.reportFormsData = JSON.parse(JSON.stringify(this.tableData));
+ this.reportFormsData.push(val)
+ },
//缁熻鍒囨崲
setCountFlagChange(res) {
switch (res) {
case 1:
+ this.getReportForms();
this.setCountFlag = true;
break;
case 2:
@@ -448,7 +340,7 @@
let dataAxis = [];
let yMax = 0;
this.option = {}
-
+ this.dataVolume = 0;
let data = [];
window.sjName = this.queryData.value
window.sjType = this.tjlxData.region
@@ -460,20 +352,38 @@
data.push(this.tableData[i].count);
var m1 = this.tableData[i].m1;
dataAxis.push(m1);
+ this.dataVolume += this.tableData[i].count;
+
}
+ this.dataVolume += "娆�"
} else {
+
for (var i in this.tableData) {
if (this.tableData[i].count > yMax) {
yMax = this.tableData[i].count;
}
if (sjType == 'sjts') {
data.push(this.tableData[i].count);
+ this.dataVolume += this.tableData[i].count;
} else if (sjType == 'sjccl') {
- data.push((this.tableData[i].sizes / 1024).toFixed(6));
+
+ this.dataVolume = this.dataVolume + this.tableData[i].sizes;
+ data.push(this.tableData[i].sizes);
}
var m1 = this.tableData[i].m1;
dataAxis.push(m1);
+ }
+ if (sjType == 'sjts') {
+ this.dataVolume += '涓�';
+ } else if (sjType == 'sjccl') {
+
+ if (parseFloat(this.dataVolume) >= 1024) {
+ this.dataVolume = (this.dataVolume / 1024).toFixed(3) + 'GB';
+ } else {
+ this.dataVolume = this.dataVolume.toFixed(3) + 'MB';
+ }
+
}
}
@@ -509,7 +419,12 @@
if (sjType == 'sjts') {
p_val = p_name + '<br/>鏂囦欢涓暟:' + params[0].data + '涓�'
} else {
- p_val = p_name + '<br/>鏁版嵁瀛樺偍閲�:' + params[0].data + 'GB'
+ if (params[0].data >= 1024) {
+ p_val = p_name + '<br/>鏁版嵁瀛樺偍閲�:' + (params[0].data / 1024).toFixed(3) + 'GB'
+ } else {
+ p_val = p_name + '<br/>鏁版嵁瀛樺偍閲�:' + params[0].data.toFixed(3) + 'MB'
+ }
+
}
}
return p_val;
@@ -576,7 +491,6 @@
// Enable data zoom when user click bar.
const zoomSize = 6;
myChart.on("click", function (params) {
- console.log(dataAxis[Math.max(params.dataIndex - zoomSize / 2, 0)]);
myChart.dispatchAction({
type: "dataZoom",
startValue: dataAxis[Math.max(params.dataIndex - zoomSize / 2, 0)],
@@ -623,7 +537,6 @@
this.setDownloadType = true;
if (this.queryData.value == "countServices") {
data = await dataCount_selectCountServices();
-
} else if (this.queryData.value == "countSizes") {
data = await dataCount_selectCountSizes();
} else if (this.queryData.value == "countOperates") {
@@ -634,6 +547,8 @@
} else if (this.queryData.value == "countSizesByPrj") {
data = await dataCount_countSizesByPrj();
this.setDownloadType = false;
+ } else if (this.queryData.value == "countExplorationPoints") {
+ data = await dataCount_countExplorationPoints();
}
@@ -687,6 +602,7 @@
padding: 10px;
position: relative;
overflow: hidden;
+
.contentBox {
padding-top: 10px;
@@ -694,17 +610,20 @@
width: 100%;
display: flex;
justify-content: space-around;
+
.content_Left {
width: 15%;
height: calc(95% - 2px);
border-radius: 5px;
padding: 1%;
}
+
.content_Right {
width: 80%;
height: calc(95% - 2px);
border-radius: 5px;
padding: 1%;
+
.iquery {
//padding: 1%;
border-radius: 5px;
@@ -712,16 +631,19 @@
justify-content: flex-end;
padding: 0px !important;
}
+
.contentTable {
width: 98%;
height: 82%;
padding: 1%;
border-radius: 5px;
+
//margin-top: 1%;
.el-table,
.el-table /deep/ .el-table__expanded-cell {
background-color: transparent !important;
}
+
.el-table /deep/ th,
.el-table /deep/ tr {
background-color: transparent !important;
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index 6d92a34..b9e2abd 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -1,33 +1,18 @@
<template>
<div class="authorityManagement_box">
<My-bread :list="[
- `${$t('dataManage.dataManage')}`,
- `${$t('dataManage.templateManage')}`,
- ]"></My-bread>
+ `${$t('dataManage.dataManage')}`,
+ `${$t('dataManage.templateManage')}`,
+ ]"></My-bread>
<el-divider />
- <div
- class="searchComp subpage_Div"
- ref="container"
- >
- <el-form
- ref="ruleForm"
- :model="ruleForm"
- :inline="true"
- >
+ <div class="searchComp subpage_Div" ref="container">
+ <el-form ref="ruleForm" :model="ruleForm" :inline="true">
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item :label="$t('userManage.authorityM.name')">
- <el-input
- style="width:200px"
- size="small"
- v-model="ruleForm.name"
- :placeholder="$t('userManage.authorityM.nameHolder')"
- >
- <i
- slot="suffix"
- class="el-icon-search"
- @click="setRefreshTable"
- ></i>
+ <el-input style="width:200px" size="small" v-model="ruleForm.name"
+ :placeholder="$t('userManage.authorityM.nameHolder')">
+ <i slot="suffix" class="el-icon-search" @click="setRefreshTable"></i>
</el-input>
</el-form-item>
</div>
@@ -42,30 +27,16 @@
<!-- >{{ $t('common.iquery') }}</el-button>-->
<!-- </el-form-item>-->
<el-form-item>
- <el-button
- v-if="btnStatus.insert"
- @click="setTableInsert"
- icon="el-icon-edit"
- type="success"
- size="small"
- >{{ $t('common.append') }}</el-button>
+ <el-button v-if="btnStatus.insert" @click="setTableInsert" icon="el-icon-edit" type="success"
+ size="small">{{ $t('common.append') }}</el-button>
</el-form-item>
<el-form-item>
- <el-button
- v-if="btnStatus.delete"
- icon="el-icon-delete"
- @click="delTableData"
- type="danger"
- size="small"
- >{{ $t('common.delete') }}</el-button>
+ <el-button v-if="btnStatus.delete" icon="el-icon-delete" @click="delTableData" type="danger" size="small">{{
+ $t('common.delete') }}</el-button>
</el-form-item>
<el-form-item>
- <el-button
- icon="el-icon-refresh"
- @click="restRefreshTable"
- type="info"
- size="small"
- >{{ $t('common.empty') }}</el-button>
+ <el-button icon="el-icon-refresh" @click="restRefreshTable" type="info" size="small">{{ $t('common.empty')
+ }}</el-button>
</el-form-item>
</div>
</div>
@@ -73,49 +44,20 @@
</el-form>
</div>
<div class="dividing-line"></div>
- <div
- class="table_box"
- :style="styleVar"
- >
- <el-table
- :data="tableData"
- style="width: 100%"
- border
- @selection-change="handleSelectionChange"
- height="calc(100% - 45px)"
- >
- <el-table-column
- type="selection"
- width="55"
- />
- <el-table-column
- align="center"
- type="index"
- :label="$t('dataManage.styleObj.index')"
- width="70px"
- />
- <el-table-column
- align="center"
- prop="name"
- :label="$t('dataManage.styleObj.name')"
- />
- <el-table-column
- align="center"
- prop="type"
- :label="$t('common.fileType')"
- >
+ <div class="table_box" :style="styleVar">
+ <el-table :data="tableData" style="width: 100%" border @selection-change="handleSelectionChange"
+ height="calc(100% - 45px)">
+ <el-table-column type="selection" width="55" />
+ <el-table-column align="center" type="index" :label="$t('dataManage.styleObj.index')" width="70px" />
+ <el-table-column align="center" prop="name" :label="$t('dataManage.styleObj.name')" />
+ <el-table-column align="center" prop="type" :label="$t('common.fileType')">
<template slot-scope="scope">
<span v-if="scope.row.type == 1">World妯℃澘 </span>
<span v-else-if="scope.row.type == 2">Excel妯℃澘</span>
<span v-else-if="scope.row.type == 3">Zip妯℃澘</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- prop="code"
- :label="$t('common.templateType')"
- :formatter="codeData"
- />
+ <el-table-column align="center" prop="code" :label="$t('common.templateType')" :formatter="codeData" />
<!-- <el-table-column
align="center"
prop="fname"
@@ -126,118 +68,54 @@
prop="bak"
:label="$t('common.bak')"
/> -->
- <el-table-column
- align="center"
- prop="createName"
- :label="$t('dataManage.vmobj.createonuser')"
- />
- <el-table-column
- align="center"
- prop="createTime"
- :label="$t('dataManage.vmobj.createontime')"
- :formatter="formatData"
- />
- <el-table-column
- min-width="100"
- :label="$t('dataManage.dictionaryManageObj.operation')"
- >
+ <el-table-column align="center" prop="createName" :label="$t('dataManage.vmobj.createonuser')" />
+ <el-table-column align="center" prop="createTime" :label="$t('dataManage.vmobj.createontime')"
+ :formatter="formatData" />
+ <el-table-column min-width="100" :label="$t('dataManage.dictionaryManageObj.operation')">
<template slot-scope="scope">
- <el-button
- v-if="btnStatus.select"
- @click="showDetail(scope.$index, scope.row)"
- type="primary"
- plain
- size="small"
- >{{ $t('dataManage.dictionaryManageObj.lookOver') }}</el-button>
- <el-button
- v-if="btnStatus.update"
- @click="handleEdit(scope.$index, scope.row)"
- type="warning"
- plain
- size="small"
- >{{ $t('dataManage.dictionaryManageObj.revamp') }}</el-button>
- <el-button
- v-if="btnStatus.download"
- plain
- @click="handleDownload(scope.$index, scope.row)"
- type="info"
- size="small"
- >{{ $t('common.download') }}</el-button>
+ <el-button v-if="btnStatus.select" @click="showDetail(scope.$index, scope.row)" type="primary" plain
+ size="small">{{ $t('dataManage.dictionaryManageObj.lookOver') }}</el-button>
+ <el-button v-if="btnStatus.update" @click="handleEdit(scope.$index, scope.row)" type="warning" plain
+ size="small">{{ $t('dataManage.dictionaryManageObj.revamp') }}</el-button>
+ <el-button v-if="btnStatus.download" plain @click="handleDownload(scope.$index, scope.row)" type="info"
+ size="small">{{ $t('common.download') }}</el-button>
</template>
</el-table-column>
</el-table>
<div style="margin-top:10px">
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="listData.count"
- >
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex" :page-sizes="[10, 20, 50, 100]" :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="listData.count">
</el-pagination>
</div>
</div>
<!-- 鏂板 -->
- <el-dialog
- :title="
- behavior == '鏂板'
- ? `${$t('common.append')}`
- : `${$t('common.update')}`
- "
- :visible.sync="dialogVisible"
- :before-close="handleClose"
- >
+ <el-dialog :title="behavior == '鏂板'
+ ? `${$t('common.append')}`
+ : `${$t('common.update')}`
+ " :visible.sync="dialogVisible" :before-close="handleClose">
<div style="height: 500px; overflow: auto">
- <el-form
- ref="form"
- :model="editForm"
- label-width="100px"
- label-position="top"
- >
+ <el-form ref="form" :model="editForm" label-width="100px" label-position="top">
<el-form-item :label="$t('dataManage.styleObj.name')">
- <el-input
- style="width:85%"
- v-model=" editForm.name"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('dataManage.styleObj.name')"
- ></el-input>
+ <el-input style="width:85%" v-model="editForm.name"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') + $t('dataManage.styleObj.name')"></el-input>
</el-form-item>
<el-form-item :label="$t('common.templateType')">
<!-- <el-input
style="width:100%"
v-model=" editForm.code"
></el-input> -->
- <el-select
- :popper-append-to-body="false"
- style="width:85%"
- @change="selFileCodeChange"
+ <el-select :popper-append-to-body="false" style="width:85%" @change="selFileCodeChange"
v-model="editForm.code"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree')+$t('dataManage.common.templateType')"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree') + $t('dataManage.common.templateType')">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('common.fileType')">
- <el-select
- :popper-append-to-body="false"
- v-model="editForm.type"
- @change="selFileTypeChange"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree')+$t('common.fileType')"
- style="width:85%"
- >
- <el-option
- v-for="item in typeOption"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select :popper-append-to-body="false" v-model="editForm.type" @change="selFileTypeChange"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetree') + $t('common.fileType')" style="width:85%">
+ <el-option v-for="item in typeOption" :key="item.value" :label="item.label" :value="item.value">
</el-option>
<!-- <el-option
label="World妯℃澘"
@@ -257,94 +135,38 @@
<el-form-item :label="$t('common.filePath')">
<div class="BoxFlex">
<div class="BoxFlexinput">
- <el-input
- v-model="editForm.fname"
- disabled
- autocomplete="off"
- style="width:100%"
- ></el-input>
+ <el-input v-model="editForm.fname" disabled autocomplete="off" style="width:100%"></el-input>
</div>
<div class="BoxFlexbutton">
- <input
- name="file1"
- type="file"
- id="editFile"
- multiple="multiple"
- :accept="selectFileType"
- style="display: none"
- @change="geteditFile(1)"
- />
- <el-button
- style="margin-left: 6px;"
- type="primary"
- size="small"
- :underline="false"
- @click="geteditFile(0)"
- >閫夋嫨</el-button>
- <el-button
- type="primary"
- size="small"
- :underline="false"
- @click="geteditFile(2)"
- >涓婁紶</el-button>
+ <input name="file1" type="file" id="editFile" multiple="multiple" :accept="selectFileType"
+ style="display: none" @change="geteditFile(1)" />
+ <el-button style="margin-left: 6px;" type="primary" size="small" :underline="false"
+ @click="geteditFile(0)">閫夋嫨</el-button>
+ <el-button type="primary" size="small" :underline="false" @click="geteditFile(2)">涓婁紶</el-button>
</div>
</div>
</el-form-item>
<el-form-item :label="$t('common.bak')">
- <el-input
- style="width:85%"
- v-model="editForm.bak"
- :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo')+$t('common.bak')"
- ></el-input>
+ <el-input style="width:85%" v-model="editForm.bak"
+ :placeholder="$t('shuJuGuanLi.shuJuJianSuo.valuetwo') + $t('common.bak')"></el-input>
</el-form-item>
</el-form>
</div>
- <div
- v-if="behavior =='鏂板'"
- slot="footer"
- class="dialog-footer"
- >
- <el-button
- size="small"
- @click="closeInsertData"
- >鍙� 娑�</el-button>
- <el-button
- type="primary"
- size="small"
- @click="addInsertData"
- >纭� 瀹�</el-button>
+ <div v-if="behavior == '鏂板'" slot="footer" class="dialog-footer">
+ <el-button size="small" @click="closeInsertData">鍙� 娑�</el-button>
+ <el-button type="primary" size="small" @click="addInsertData">纭� 瀹�</el-button>
</div>
- <div
- v-if="behavior !='鏂板'"
- slot="footer"
- class="dialog-footer"
- >
- <el-button
- size="small"
- @click="closeEditData"
- >鍙� 娑�</el-button>
- <el-button
- type="primary"
- size="small"
- @click="addEditData"
- >纭� 瀹�</el-button>
+ <div v-if="behavior != '鏂板'" slot="footer" class="dialog-footer">
+ <el-button size="small" @click="closeEditData">鍙� 娑�</el-button>
+ <el-button type="primary" size="small" @click="addEditData">纭� 瀹�</el-button>
</div>
</el-dialog>
- <div
- class="infoBox_box"
- v-show="showinfoBox"
- >
+ <div class="infoBox_box" v-show="showinfoBox">
<div class="infoBox subpage_Div box_div">
- <div
- slot="header"
- class="clearfix"
- >
+ <div slot="header" class="clearfix">
<span>{{ $t('dataManage.styleObj.deInformation') }}</span>
- <div
- style="float: right; cursor: pointer"
- @click="closeDetial"
- >
+ <div style="float: right; cursor: pointer" @click="closeDetial">
<i class="el-icon-close"></i>
</div>
</div>
@@ -401,11 +223,7 @@
</div>
</div>
- <iframe
- id="downFrame"
- src=""
- style="display: none; border: 0; padding: 0; height: 0; width: 0"
- ></iframe>
+ <iframe id="downFrame" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe>
</div>
</template>
@@ -448,6 +266,9 @@
{
value: "dirFolder",
label: "鐩綍缁撴瀯鏂囦欢澶规ā鏉�",
+ }, {
+ value: "countExplorationPoints",
+ label: "閽诲瓟鏁版嵁缁熻",
},
],
itemdetail: {},
@@ -488,6 +309,7 @@
height: "calc(100% - 109px)",
},
typeOption: [],
+ rowGuid: null,
};
},
created() {
@@ -600,6 +422,8 @@
},
//淇敼鎻愪氦
async addEditData() {
+ this.editForm.guid = this.rowGuid;
+ debugger
const data = await report_update(this.editForm);
if (data.code != 200) {
return this.$message.error("淇敼澶辫触");
@@ -665,6 +489,7 @@
} else if (parseInt(row.type) == 2) {
this.selectFileType = ".xlsx";
}
+ this.rowGuid = row.guid;
this.dialogVisible = true;
},
//鍒犻櫎
@@ -772,7 +597,8 @@
formData.append("file", fs.files[0]);
var val_data = await report_upload(formData);
if (val_data.code == 200) {
- this.editForm.guid = val_data.result;
+ // this.editForm.guid = val_data.result;
+ this.rowGuid = val_data.result;
this.$message({
message: "涓婁紶鎴愬姛锛�",
type: "success",
@@ -909,10 +735,12 @@
.el-form-item {
margin: 5px;
}
+
.el-input {
width: 467px;
}
}
+
.leftTree {
position: absolute;
z-index: 10;
@@ -926,17 +754,21 @@
height: 550px;
overflow: auto;
}
+
.btnBox {
width: 160px;
margin: 10px auto 0;
}
}
+
.bottom {
width: 100%;
height: 85%;
+
.rightTable {
height: 100%;
width: 100%;
+
.table_box {
width: 100%;
height: 80%;
--
Gitblit v1.9.3