From 98a2b24c89e81a5aacdcbd6b739fef422adf17dd Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期五, 29 三月 2024 09:57:55 +0800
Subject: [PATCH] 代码更新
---
src/components/chart/VisitCount.vue | 75 -
src/views/maintenance/eventlogManage.vue | 2
src/views/userManage/templateManage.vue | 103 +-
src/views/maintenance/systemMonitoring copy.vue | 2
src/views/maintenance/systemMonitoring.vue | 201 ++--
src/utils/auth.js | 2
src/components/js/dataStatistics.js | 245 ++++++
src/views/datamanage/dataUpdata.vue | 1036 +++++++++++++-------------
src/utils/request.js | 2
src/views/maintenance/databaseMonitoring.vue | 1
src/api/api.js | 81 ++
src/views/maintenance/opexController.vue | 3
src/views/maintenance/parameterConfiguration.vue | 2
src/api/screen.js | 11
src/views/datamanage/dataStatistics.vue | 549 ++++++++++++-
15 files changed, 1,523 insertions(+), 792 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index b0d4eeb..eb78a51 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -942,8 +942,87 @@
export function dataCount_countExplorationPoints(params) {
return request.get('/dataCount/countExplorationPoints', { params: params });
}
+export function dataCount_countWaterDamageByPrj(params) {
+ return request.get('/dataCount/countWaterDamageByPrj', { params: params });
+}
+export function dataCount_countUnstableSlopeByPrj(params) {
+ return request.get('/dataCount/countUnstableSlopeByPrj', { params: params });
+}
+export function dataCount_countLandSlideByPrj(params) {
+ return request.get('/dataCount/countLandSlideByPrj', { params: params });
+}
-
+export function dataCount_countHighSteepSlopeByPrj(params) {
+ return request.get('/dataCount/countHighSteepSlopeByPrj', { params: params });
+}
+
+export function dataCount_countGroundCollapseByPrj(params) {
+ return request.get('/dataCount/countGroundCollapseByPrj', { params: params });
+}
+
+export function dataCount_countDebrisFlowByPrj(params) {
+ return request.get('/dataCount/countDebrisFlowByPrj', { params: params });
+}
+
+export function dataCount_countCollapseByPrj(params) {
+ return request.get('/dataCount/countCollapseByPrj', { params: params });
+}
+
+export function dataCount_countExplorationReportByPrj(params) {
+ return request.get('/dataCount/countExplorationReportByPrj', { params: params });
+}
+
+export function dataCount_countSurveyWorksiteByPrj(params) {
+ return request.get('/dataCount/countSurveyWorksiteByPrj', { params: params });
+}
+
+export function dataCount_countLasAreaByPrj(params) {
+ return request.get('/dataCount/countLasAreaByPrj', { params: params });
+}
+
+export function dataCount_countOsgbAreaByPrj(params) {
+ return request.get('/dataCount/countOsgbAreaByPrj', { params: params });
+}
+
+export function dataCount_countMptAreaByPrj(params) {
+ return request.get('/dataCount/countMptAreaByPrj', { params: params });
+}
+
+export function dataCount_countDemAreaByPrj(params) {
+ return request.get('/dataCount/countDemAreaByPrj', { params: params });
+}
+
+
+
+export function dataCount_countDomAreaByPrj(params) {
+ return request.get('/dataCount/countDomAreaByPrj', { params: params });
+}
+
+export function dataCount_countDlgAreaByPrj(params) {
+ return request.get('/dataCount/countDlgAreaByPrj', { params: params });
+}
+
+export function dataCount_countExplorationPointByPrj(params) {
+ return request.get('/dataCount/countExplorationPointByPrj', { params: params });
+}
+
+export function dataCount_countLineLength(params) {
+ return request.get('/dataCount/countLineLength', { params: params });
+}
+
+export function dataCount_countGeoModelAreaByPrj(params) {
+ return request.get('/dataCount/countGeoModelAreaByPrj', { params: params });
+}
+
+export function dataCount_countGeologicHazardByPrj(params) {
+ return request.get('/dataCount/countGeologicHazardByPrj', { params: params });
+}
+export function dataCount_countVariousDataByPrj(params) {
+ return request.get('/dataCount/countVariousDataByPrj', { params: params });
+}
+
+
+
//鏁版嵁缁熻=>涓嬭浇鎶ュ憡
export function dataCount_downloadReport(params) {
return request.get('/dataCount/downloadReport', { params: params });
diff --git a/src/api/screen.js b/src/api/screen.js
index ad360d9..6ad11ed 100644
--- a/src/api/screen.js
+++ b/src/api/screen.js
@@ -54,6 +54,17 @@
return request.get("/oneMap/countLargeCategories", { params: params })
}
+
+
+//鎸夌収绫诲埆璁块棶缁熻璁块棶娆℃暟
+export function countByMajor(params) {
+ return request.get("/oneMap/countByMajor", { params: params })
+}
+
+
+
+
+
//鍏ㄥ浗绔欏満搴ф暟銆侀榾瀹ゃ�佺閬撴暟绛�
export function countZhPipeStations(params) {
return request.get("/oneMap/countZhPipeStations", { params: params })
diff --git a/src/components/chart/VisitCount.vue b/src/components/chart/VisitCount.vue
index 3f1ad72..7fe40c5 100644
--- a/src/components/chart/VisitCount.vue
+++ b/src/components/chart/VisitCount.vue
@@ -4,7 +4,7 @@
<script>
import * as echarts from "echarts"
-import { GetTypeVisitsCount } from "@/api/screen.js"
+import { countByMajor } from "@/api/screen.js"
export default {
data() {
return {
@@ -17,54 +17,16 @@
methods: {
async initChart() {
let data = [
- {
- name: "user1",
- value: 10,
- },
- {
- name: "user2",
- value: 20,
- },
- {
- name: "user3",
- value: 23,
- },
- {
- name: "user4",
- value: 44,
- },
- {
- name: "user1",
- value: 10,
- },
- {
- name: "user2",
- value: 20,
- },
- {
- name: "user3",
- value: 53,
- },
- {
- name: "user4",
- value: 24,
- },
- {
- name: "user1",
- value: 10,
- },
- {
- name: "user2",
- value: 20,
- },
+
]
- const res = await GetTypeVisitsCount()
+ const res = await countByMajor()
let xAxis = []
let yAxis = []
if (res.code == 200) {
+ var obj = res.result;
data = res.result.map(item => {
- xAxis.push(item.name)
- yAxis.push(item.count)
+ xAxis.push(item.m2)
+ yAxis.push(item.sizes)
})
}
let option = {
@@ -76,13 +38,34 @@
bottom: "15%",
},
tooltip: {
- show: true
+ show: true,
+ formatter: function (data) {
+ var val = obj.filter(res=>{
+ if(data.value == res.sizes){
+ return res
+ }
+ })
+ if(val.length>0){
+ var num = val[0].m3
+ if(num=="骞虫柟鍗冪背"){
+ num= " km虏";
+ }else if(num=="骞虫柟绫�"){
+ num= " m虏";
+ }else if(num=="鍗冪背"){
+ num= " km";
+ }
+ return val[0].m2+":<br/>"+val[0].sizes+ num;
+ }else{
+ return data;
+ }
+ },
},
xAxis: {
data: xAxis,
axisLabel: {
show: true,
color: "#ffff",
+
},
axisTick: {
show: false,
@@ -180,7 +163,7 @@
</script>
<style lang="less" scoped>
-.visit-count{
+.visit-count {
width: 100%;
height: calc(100% - 30px);
}
diff --git a/src/components/js/dataStatistics.js b/src/components/js/dataStatistics.js
new file mode 100644
index 0000000..be0fadf
--- /dev/null
+++ b/src/components/js/dataStatistics.js
@@ -0,0 +1,245 @@
+const dataStatistics= {
+ statistics:[
+ {
+ value: "dataTable",
+ label: "涓婁紶鏁版嵁琛ㄦ牸妯℃澘",
+ isCount:false,
+ isMenu:true
+ },
+ {
+ value: "uploadDir",
+ label: "涓婁紶鐩綍缁撴瀯妯℃澘",
+ isCount:false,
+ isMenu:true
+ },
+
+
+
+
+
+
+
+
+
+
+
+ {
+ value: "dirFolder",
+ label: "鐩綍缁撴瀯鏂囦欢澶规ā鏉�",
+ isCount:false,
+ pid:0,
+ isMenu:true,
+ id:1,
+ }, {
+ value: "countSizes",
+ label: "鏁版嵁閲忕粺璁�",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:2,
+ },
+ {
+ value: "countServices",
+ label: "鏈嶅姟璋冪敤閲忕粺璁�",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:3,
+ },
+ {
+ value: "countOperates",
+ label: "鐢ㄦ埛娴侀噺缁熻",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:4,
+ },
+ {
+ value: "countExplorationPoints",
+ label: "閽诲瓟鏁版嵁缁熻",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:5,
+ }, {
+ value: "countSizesByType",
+ label: "鏁版嵁鏍煎紡缁熻",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:6,
+ },{
+ value: "countSizesByPrj",
+ label: "椤圭洰鏁版嵁缁熻",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:7,
+ },{
+ value: "countVariousDataByPrj",
+ label: "椤圭洰鏁版嵁鍒嗙被缁熻",
+ isCount:true,
+ pid:0,
+ isMenu:true,
+ id:11,
+ },
+{
+
+ label: "娴嬬粯(ESV)",
+ isCount:true,
+ pid:0,
+ isMenu:false,
+ id:8,
+},{
+ value: "countDlgAreaByPrj",
+ label: "鏁板瓧绾垮垝鍥剧粺璁�",
+ isCount:true,
+ pid:8,
+ isMenu:true,
+ id:11,
+},{
+ value: "countDemAreaByPrj",
+ label: "鏁板瓧楂樼▼妯″瀷缁熻",
+ isCount:true,
+ pid:8,
+ isMenu:true,
+ id:12,
+},{
+ value: "countDomAreaByPrj",
+ label: "鏁板瓧姝ｅ皠褰卞儚鍥剧粺璁�",
+ isCount:true,
+ pid:8,
+ isMenu:true,
+ id:13,
+},{
+ value: "countOsgbAreaByPrj",
+ label: "鍊炬枩鎽勫奖妯″瀷缁熻",
+ isCount:true,
+ pid:8,
+ isMenu:true,
+ id:14,
+},{
+ value: "countLasAreaByPrj",
+ label: "婵�鍏夌偣浜戞ā鍨嬬粺璁�",
+ isCount:true,
+ pid:8,
+ isMenu:true,
+ id:15,
+},{
+ value: "countLineLength",
+ label: "绠＄嚎闀垮害缁熻",
+ isCount:true,
+ pid:8,
+ isMenu:true,
+ id:16,
+},{
+ value: "countMptAreaByPrj",
+ label: "涓夌淮鍦板舰妯″瀷缁熻",
+ isCount:false,
+ pid:8,
+ isMenu:true,
+ id:17,
+},
+
+
+{
+ label: "鍕樺療(EGE)",
+ isCount:true,
+ pid:0,
+ isMenu:false,
+ id:9,
+},{
+ value: "countExplorationPointByPrj",
+ label: "鍕樻帰鐐圭粺璁�",
+ isCount:true,
+ pid:9,
+ isMenu:true,
+ id:18,
+},{
+ value: "countSurveyWorksiteByPrj",
+ label: "鍕樺療宸ョ偣缁熻",
+ isCount:true,
+ pid:9,
+ isMenu:true,
+ id:19,
+},{
+ value: "countExplorationReportByPrj",
+ label: "鍕樺療鎶ュ憡缁熻",
+ isCount:true,
+ pid:9,
+ isMenu:true,
+ id:20,
+},{
+ value: "countGeoModelAreaByPrj",
+ label: "涓夌淮鍦拌川妯″瀷缁熻",
+ isCount:true,
+ pid:9,
+ isMenu:true,
+ id:21,
+},{
+ label: "鍦扮伨(EGD)",
+ isCount:true,
+ pid:0,
+ isMenu:false,
+ id:10,
+},{
+ value: "countGeologicHazardByPrj",
+ label: "鍦扮伨鐐圭粺璁�",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:22,
+},{
+ value: "countCollapseByPrj",
+ label: "宕╁缁熻",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:23,
+},{
+ value: "countDebrisFlowByPrj",
+ label: "娉ョ煶娴佺粺璁�",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:24,
+},{
+ value: "countGroundCollapseByPrj",
+ label: "鍦伴潰濉岄櫡缁熻",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:25,
+},{
+ value: "countHighSteepSlopeByPrj",
+ label: "楂橀櫋杈瑰潯缁熻",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:26,
+},{
+ value: "countLandSlideByPrj",
+ label: "婊戝潯缁熻",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:27,
+} ,{
+ value: "countUnstableSlopeByPrj",
+ label: "涓嶇ǔ瀹氭枩鍧＄粺璁�",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:28,
+},{
+ value: "countWaterDamageByPrj",
+ label: "姘存瘉缁熻",
+ isCount:true,
+ pid:10,
+ isMenu:true,
+ id:29,
+ }
+ ]
+};
+
+export default dataStatistics;
\ No newline at end of file
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 8cfd2a3..1e5c4b2 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -26,7 +26,7 @@
const TokenKey = 'Admin-Token';
export function getToken() {
- console.log(window.sessionStorage.getItem(TokenKey));
+
return window.sessionStorage.getItem(TokenKey);
}
diff --git a/src/utils/request.js b/src/utils/request.js
index 006a095..24cc3f9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,7 +13,7 @@
// create an axios instance
const service = axios.create({
baseURL: BASE_URL, // api鐨刡ase_url
- timeout: 35000, // 璇锋眰瓒呮椂鏃堕棿
+ timeout: -1, // 璇锋眰瓒呮椂鏃堕棿
headers: {
"content-type": "application/json;charset=UTF-8",
},
diff --git a/src/views/datamanage/dataStatistics.vue b/src/views/datamanage/dataStatistics.vue
index d793e71..39edf52 100644
--- a/src/views/datamanage/dataStatistics.vue
+++ b/src/views/datamanage/dataStatistics.vue
@@ -8,7 +8,7 @@
<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">
+ :props="defaultProps" accordion>
</el-tree>
</div>
<div class="content_Right subpage_Div" style="border: 1px solid #dcdfe6;">
@@ -21,26 +21,34 @@
<el-option label="鏁版嵁瀛樺偍閲�" value="sjccl">
</el-option>
- <el-option label="鏂囦欢涓暟" value="sjts">
+ <el-option label="鏂囦欢涓暟" v-show="queryData.value != 'countExplorationPoints'" value="sjts">
+ </el-option>
+ <el-option label="鏁伴噺" v-show="queryData.value == 'countExplorationPoints'" value="sjts">
</el-option>
</el-select>
</el-form-item>
- <el-form-item v-show="!setCountFlag" label="鎬昏:">
+ <el-form-item v-show="!setCountFlag && setExcelType" label="鎬昏:">
{{ dataVolume }}
</el-form-item>
- <el-form-item>
+ <el-form-item v-show="setExcelType">
<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-form-item v-show="setExcelType">
<el-button icon="el-icon-pie-chart" size="small" type="primary" @click="setCountFlagChange(2)">{{
- $t("shuJuGuanLi.butten.Histogram") }}</el-button>
+ $t("shuJuGuanLi.butten.Histogram") }}</el-button>
</el-form-item>
- <el-form-item v-show="setDownloadType">
+ <el-form-item v-show="!setExcelType">
+ <el-select v-model="prjCunt" size="small" @change="setPrjCuntChange" placeholder="">
+ <el-option v-for="item in prjOption" :key="item.id" :label="item.name" :value="item.code">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
<el-button icon="el-icon-download" size="small" type="success" @click="setCountFlagChange(3)">{{
- $t("shuJuGuanLi.butten.Download") }}</el-button>
+ $t("shuJuGuanLi.butten.Download") }}</el-button>
</el-form-item>
</el-form>
@@ -52,8 +60,8 @@
<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'" :formatter="formatterColumn2" 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')">
@@ -67,8 +75,8 @@
<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" :formatter="formatterColumn3" 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')">
@@ -98,8 +106,134 @@
<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"
+ <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-column v-if="queryData.value == 'countWaterDamageByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countWaterDamageByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countUnstableSlopeByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countUnstableSlopeByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countLandSlideByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countLandSlideByPrj'" prop="count" :formatter="formatterColumn3"
key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countHighSteepSlopeByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countHighSteepSlopeByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countGroundCollapseByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countGroundCollapseByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countDebrisFlowByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countDebrisFlowByPrj'" prop="count" :formatter="formatterColumn3"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countCollapseByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countCollapseByPrj'" prop="count" :formatter="formatterColumn3"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countExplorationReportByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countExplorationReportByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countSurveyWorksiteByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countSurveyWorksiteByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countLasAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countLasAreaByPrj'" prop="area" :formatter="formatterColumn4"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countOsgbAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countOsgbAreaByPrj'" prop="area" :formatter="formatterColumn4"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countMptAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countMptAreaByPrj'" prop="area" :formatter="formatterColumn4"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countDemAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countDemAreaByPrj'" prop="area" :formatter="formatterColumn4"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countDomAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countDomAreaByPrj'" prop="area" :formatter="formatterColumn4"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countDlgAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countDlgAreaByPrj'" prop="area" :formatter="formatterColumn4"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countExplorationPointByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countExplorationPointByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countLineLength'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countLineLength'" prop="len" :formatter="formatterColumn5"
+ key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+
+ <el-table-column v-if="queryData.value == 'countGeoModelAreaByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countGeoModelAreaByPrj'" prop="area"
+ :formatter="formatterColumn4" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countGeologicHazardByPrj'" prop="m1" key="1" align="center"
+ :label="$t('dataManage.dataStaticObj.type1')">
+ </el-table-column>
+ <el-table-column v-if="queryData.value == 'countGeologicHazardByPrj'" prop="count"
+ :formatter="formatterColumn3" key="4" align="center" :label="$t('dataManage.dataStaticObj.type9')">
</el-table-column>
</el-table>
</div>
@@ -144,48 +278,38 @@
dataCount_downloadReport,
dataCount_countSizesByType,
dataCount_countSizesByPrj,
- dataCount_countExplorationPoints
+ dataCount_countExplorationPoints,
+ dataCount_countWaterDamageByPrj,
+ dataCount_countUnstableSlopeByPrj,
+ dataCount_countLandSlideByPrj,
+ dataCount_countHighSteepSlopeByPrj,
+ dataCount_countGroundCollapseByPrj,
+ dataCount_countDebrisFlowByPrj,
+ dataCount_countCollapseByPrj,
+ dataCount_countExplorationReportByPrj,
+ dataCount_countSurveyWorksiteByPrj,
+ dataCount_countLasAreaByPrj,
+ dataCount_countOsgbAreaByPrj,
+ dataCount_countMptAreaByPrj,
+ dataCount_countDemAreaByPrj,
+ dataCount_countDomAreaByPrj,
+ dataCount_countDlgAreaByPrj,
+ dataCount_countExplorationPointByPrj,
+ dataCount_countLineLength,
+ dataCount_countGeoModelAreaByPrj,
+ dataCount_countGeologicHazardByPrj,
+ project_selectDirAll,
+ dataCount_countVariousDataByPrj
+
} from "../../api/api.js";
-import { t } from 'element-ui/lib/locale';
+import dataStatistics from '@/components/js/dataStatistics.js'
export default {
name: "DataStatistics",
components: { MyBread },
data() {
return {
treeData: [
- {
- id: 5,
- label: "椤圭洰缁熻鏁版嵁",
- value: "countSizesByPrj",
- children: [],
- }, {
- id: 2,
- label: "鍗曚綅鏁版嵁缁熻",
- value: "countSizes",
- children: [],
- }, {
- id: 4,
- label: "鏁版嵁鏍煎紡缁熻",
- value: "countSizesByType",
- children: [],
- },
- {
- id: 3,
- label: "鐢ㄦ埛娴侀噺缁熻",
- value: "countOperates",
- children: [],
- }, {
- id: 1,
- label: "鏈嶅姟璋冪敤閲忕粺璁�",
- value: "countServices",
- children: [],
- },
- {
- id: 6,
- label: "閽诲瓟鏁版嵁缁熻",
- value: "countExplorationPoints",
- children: [],
- },
+
],
tjlxData: {
region: 'sjccl',
@@ -211,13 +335,54 @@
setDownloadType: false,
dataVolume: null,
reportFormsData: [],
-
+ setExcelType: true,
+ prjOption: [],
+ prjCunt: null,
+ prjData: [],
};
},
mounted() {
- this.setStartDataCount();
+ this.setTreeDataStart();
+
},
methods: {
+ setTreeDataStart() {
+ this.treeData = [];
+ var val = dataStatistics.statistics;
+ var std = [];
+ for (var i = 0; i < val.length; i++) {
+ if (val[i].isCount) {
+ std.push(val[i])
+ }
+
+ }
+ var obj = this.getTreeData(std);
+
+ this.treeData = obj
+
+ this.setStartDataCount();
+
+ setStartDataCount
+ },
+ getTreeData(source) {
+ let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
+
+ if (cloneData.length != 0) {
+ return cloneData.filter((father) => {
+ // 寰幆鎵�鏈夐」
+ let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
+ branchArr.length > 0 ? (father.children = branchArr) : ''; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+ // 灞炰簬鍚屼竴瀵硅薄闂锛屼緥濡傦細浠� a=b銆乧=1 锛岀劧鍚庡啀浠� b.c=c 锛� 閭ｄ箞 a.c=b.c=c=1 锛涘悓鐞嗭紝鍚庣画浠� c.d=2 ,閭ｄ箞 a.c.d 涔熸槸=2锛�
+ // 鐢辨寰幆澶氭鍚庯紝灏辫兘褰㈡垚鐩稿簲鐨勬爲褰㈡暟鎹粨鏋�
+ return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
+ });
+ } else {
+ this.$message({
+ message: '鏆傛棤鑿滃崟鏍忔暟鎹�',
+ type: 'warning'
+ });
+ }
+ },
setTjlxDataChange() {
this.showCountEchart()
},
@@ -234,13 +399,29 @@
formatterColumn3(row) {
return row.count + "涓�"
},
+ formatterColumn5(row) {
+ return row.len + "<span style='font-size:16px;'>km<span>"
+ },
+ formatterColumn4(row) {
+ if (row.area >= 1000000) {
+ return (row.area / 1000000).toFixed(3) + "<span style='font-size:16px;'>km虏<span>"
+ } else {
+ return (row.area).toFixed(3) + "<span style='font-size:16px; '>m虏<span>"
+ }
+ },
+
setDownLoadRow(rows) {
+ var obj = ''
+
+ if (this.queryData.value == "countVariousDataByPrj") {
+ obj = "&code=" + this.prjCunt
+ }
var url =
BASE_URL +
"/dataCount/downloadReport?token=" +
getToken() +
"&id=" +
- rows.id;
+ rows.id + obj;
$("#Iframe1").attr("src", url).click();
},
@@ -276,19 +457,32 @@
var m1 = "鎬昏"
for (var i in this.tableData) {
sizes += this.tableData[i].sizes;
- count += this.tableData[i].count;
+ if (this.queryData.value == 'countDlgAreaByPrj' || this.queryData.value == 'countGeoModelAreaByPrj') {
+ count += this.tableData[i].area;
+ } else if (this.queryData.value == 'countLineLength') {
+ count += this.tableData[i].len;
+ } else {
+ count += this.tableData[i].count;
+ }
}
- val.count = count;
+ if (this.queryData.value == 'countDlgAreaByPrj' || this.queryData.value == 'countGeoModelAreaByPrj') {
+ val.area = count;
+ } else if (this.queryData.value == 'countLineLength') {
+ val.len = count;
+ } else {
+ 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;
@@ -319,6 +513,30 @@
this.modelData = data.result;
this.listData.count = data.count;
},
+ getEchartFormate(val) {
+ var obj = this.prjData.filter(res => {
+ if (res.m1 == val) {
+ return res;
+ }
+ })[0];
+ var message = "";
+ if (obj) {
+ if (obj.m2 == 'area') {
+ if (obj.area > 1000000) {
+ message = (obj.area / 1000000).toFixed(3) + "<span style='font-size:16px; '>km虏<span>";
+ } else {
+ message = obj.area + "<span style='font-size:16px; '>m虏<span>";
+ }
+
+ } else if (obj.m2 == 'count') {
+ message = obj.count + '涓�';
+ } else if (obj.m2 == 'len') {
+ message = obj.len + "<span style='font-size:16px;'>km<span>";
+ }
+ }
+ return message;
+
+ },
//Echart鍥捐〃鏄剧ず
showCountEchart() {
var dom = document.getElementById("chart_11");
@@ -344,7 +562,44 @@
let data = [];
window.sjName = this.queryData.value
window.sjType = this.tjlxData.region
- if (sjName == 'countServices' || sjName == 'countOperates') {
+
+ if (sjName == 'countDemAreaByPrj'
+ || sjName == 'countMptAreaByPrj'
+ || sjName == 'countOsgbAreaByPrj'
+ || sjName == 'countLasAreaByPrj'
+ || sjName == 'countDomAreaByPrj'
+ || sjName == 'countDlgAreaByPrj'
+ || sjName == 'countGeoModelAreaByPrj'
+
+ ) {
+ for (var i in this.tableData) {
+ if (this.tableData[i].count > yMax) {
+ yMax = this.tableData[i].area;
+ }
+ data.push(this.tableData[i].area);
+ var m1 = this.tableData[i].m1;
+ dataAxis.push(m1);
+ this.dataVolume += this.tableData[i].area;
+ }
+ if (parseFloat(this.dataVolume) >= 1000000) {
+ this.dataVolume = parseFloat(this.dataVolume / 1000000).toFixed(3) + "km虏";
+ } else {
+ this.dataVolume = this.dataVolume.toFixed(3) + "m虏"
+ }
+
+ } else if (sjName == 'countWaterDamageByPrj'
+ || sjName == 'countUnstableSlopeByPrj'
+ || sjName == 'countLandSlideByPrj'
+ || sjName == 'countHighSteepSlopeByPrj'
+ || sjName == 'countGroundCollapseByPrj'
+ || sjName == 'countDebrisFlowByPrj'
+ || sjName == 'countCollapseByPrj'
+ || sjName == 'countExplorationReportByPrj'
+ || sjName == 'countSurveyWorksiteByPrj'
+ || sjName == 'countExplorationPointByPrj'
+ || sjName == 'countGeologicHazardByPrj'
+ ) {
+
for (var i in this.tableData) {
if (this.tableData[i].count > yMax) {
yMax = this.tableData[i].count;
@@ -353,9 +608,43 @@
var m1 = this.tableData[i].m1;
dataAxis.push(m1);
this.dataVolume += this.tableData[i].count;
-
+ }
+ this.dataVolume += "涓�"
+ } else if (sjName == 'countLineLength') {
+ for (var i in this.tableData) {
+ if (this.tableData[i].count > yMax) {
+ yMax = this.tableData[i].len;
+ }
+ data.push(this.tableData[i].len);
+ var m1 = this.tableData[i].m1;
+ dataAxis.push(m1);
+ this.dataVolume += this.tableData[i].len;
+ }
+ this.dataVolume = this.dataVolume.toFixed(3) +"km";
+ } else if (sjName == 'countServices' || sjName == 'countOperates') {
+ for (var i in this.tableData) {
+ if (this.tableData[i].count > yMax) {
+ yMax = this.tableData[i].count;
+ }
+ data.push(this.tableData[i].count);
+ var m1 = this.tableData[i].m1;
+ dataAxis.push(m1);
+ this.dataVolume += this.tableData[i].count;
}
this.dataVolume += "娆�"
+ } else if (sjName == 'countVariousDataByPrj') {
+ for (var i in this.tableData) {
+ var val = this.tableData[i].m2;
+ var obj = this.tableData[i][val];
+ if (val == 'area') {
+ if (obj > 1000000) {
+ obj = (obj / 1000000).toFixed(3)
+ }
+ }
+ data.push(obj);
+ var m1 = this.tableData[i].m1;
+ dataAxis.push(m1);
+ }
} else {
for (var i in this.tableData) {
@@ -393,6 +682,7 @@
for (let i = 0; i < data.length; i++) {
dataShadow.push(yMax);
}
+ var that = this;
this.option = {
grid: {
left: "5%",
@@ -412,12 +702,48 @@
formatter: function (params) {
var p_name = params[0].axisValue;
var p_val;
- if (sjName == 'countServices' || sjName == 'countOperates') {
+ if (that.queryData.value == 'countServices' || that.queryData.value == 'countOperates') {
p_val = p_name + '<br/>璁块棶娆℃暟 锛�' + params[0].data + '娆�'
+ } else if (that.queryData.value == 'countDemAreaByPrj'
+ || that.queryData.value == 'countMptAreaByPrj'
+ || that.queryData.value == 'countOsgbAreaByPrj'
+ || that.queryData.value == 'countLasAreaByPrj'
+ || that.queryData.value == 'countDomAreaByPrj'
+ || that.queryData.value == 'countDlgAreaByPrj'
+ || that.queryData.value == 'countGeoModelAreaByPrj'
+ ) {
+ if (params[0].data >= 1000000) {
+ p_val = p_name + '<br/>' + (params[0].data / 1000000).toFixed(3) + "<span style='font-size:20px; '>km虏<span>"
+ } else {
+ p_val = p_name + '<br/>' + params[0].data.toFixed(3) + "<span style='font-size:20px; '>m虏<span>"
+ }
+ } else if (sjName == 'countLineLength') {
+ p_val = p_name + '<br/>璺濈:' + params[0].data.toFixed(3) + "<span style='font-size:16px;'>km<span>";
+ } else if (sjName == 'countWaterDamageByPrj'
+ || sjName == 'countUnstableSlopeByPrj'
+ || sjName == 'countLandSlideByPrj'
+ || sjName == 'countHighSteepSlopeByPrj'
+ || sjName == 'countGroundCollapseByPrj'
+ || sjName == 'countDebrisFlowByPrj'
+ || sjName == 'countCollapseByPrj'
+ || sjName == 'countExplorationReportByPrj'
+ || sjName == 'countDlgAreaByPrj'
+ || sjName == 'countExplorationPointByPrj'
+ || sjName == 'countGeologicHazardByPrj'
+ || sjName == 'countSurveyWorksiteByPrj'
+ ) {
+ p_val = p_name + '<br/>' + params[0].data + '涓�'
+ } else if (sjName == "countVariousDataByPrj") {
+ p_val = p_name + '<br/>' + that.getEchartFormate(p_name)
} else {
if (sjType == 'sjts') {
- p_val = p_name + '<br/>鏂囦欢涓暟:' + params[0].data + '涓�'
+ if (that.queryData.value != "countExplorationPoints") {
+ p_val = p_name + '<br/>鏂囦欢涓暟:' + params[0].data + '涓�'
+ } else if (that.queryData.value == "countExplorationPoints") {
+ p_val = p_name + '<br/>涓暟:' + params[0].data + '涓�'
+ }
+
} else {
if (params[0].data >= 1024) {
p_val = p_name + '<br/>鏁版嵁瀛樺偍閲�:' + (params[0].data / 1024).toFixed(3) + 'GB'
@@ -520,6 +846,8 @@
},
//鏍戠偣鍑讳簨浠�
handleNodeClick(data, node, prop) {
+ if (data.isMenu == false) return
+ this.prjCunt = "";
this.setCountFlag = false;
this.queryData = data;
this.listData.code = data.value;
@@ -530,42 +858,116 @@
handleIsopenSelect() {
this.$forceUpdate()
},
+ async setPrjCuntChange() {
+ const data = await dataCount_countVariousDataByPrj({ code: this.prjCunt })
+ if (!data || data.code != 200) {
+ return;
+ }
+ this.tableData = data.result;
+ this.prjData = data.result;
+ this.showCountEchart();
+ },
//鏌ヨ缁熻淇℃伅
async setQueryCountData() {
this.tjlxData.region = 'sjccl';
var data, val;
this.setDownloadType = true;
+ this.tjlxData.flag = true;
+ this.setExcelType = true;
if (this.queryData.value == "countServices") {
+ this.tjlxData.flag = false;
data = await dataCount_selectCountServices();
} else if (this.queryData.value == "countSizes") {
data = await dataCount_selectCountSizes();
} else if (this.queryData.value == "countOperates") {
+ this.tjlxData.flag = false;
data = await dataCount_selectCountOperates();
} else if (this.queryData.value == "countSizesByType") {
data = await dataCount_countSizesByType();
- this.setDownloadType = false;
} else if (this.queryData.value == "countSizesByPrj") {
data = await dataCount_countSizesByPrj();
- this.setDownloadType = false;
} else if (this.queryData.value == "countExplorationPoints") {
data = await dataCount_countExplorationPoints();
}
-
-
-
-
-
-
-
- if (this.queryData.value == 'countServices' || this.queryData.value == 'countOperates') {
+ else if (this.queryData.value == "countWaterDamageByPrj") {
this.tjlxData.flag = false;
-
- } else {
- this.tjlxData.flag = true;
+ data = await dataCount_countWaterDamageByPrj();
+ } else if (this.queryData.value == "countUnstableSlopeByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countUnstableSlopeByPrj();
+ } else if (this.queryData.value == "countLandSlideByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countLandSlideByPrj();
+ } else if (this.queryData.value == "countHighSteepSlopeByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countHighSteepSlopeByPrj();
+ } else if (this.queryData.value == "countGroundCollapseByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countGroundCollapseByPrj();
+ } else if (this.queryData.value == "countDebrisFlowByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countDebrisFlowByPrj();
+ } else if (this.queryData.value == "countCollapseByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countCollapseByPrj();
+ } else if (this.queryData.value == "countExplorationReportByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countExplorationReportByPrj();
+ } else if (this.queryData.value == "countSurveyWorksiteByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countSurveyWorksiteByPrj();
+ } else if (this.queryData.value == "countLasAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countLasAreaByPrj();
+ } else if (this.queryData.value == "countOsgbAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countOsgbAreaByPrj();
+ } else if (this.queryData.value == "countMptAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countMptAreaByPrj();
+ } else if (this.queryData.value == "countDemAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countDemAreaByPrj();
+ } else if (this.queryData.value == "countDomAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countDomAreaByPrj();
+ } else if (this.queryData.value == "countDlgAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countDlgAreaByPrj();
+ } else if (this.queryData.value == "countExplorationPointByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countExplorationPointByPrj();
+ } else if (this.queryData.value == "countLineLength") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countLineLength();
+ } else if (this.queryData.value == "countGeoModelAreaByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countGeoModelAreaByPrj();
+ } else if (this.queryData.value == "countGeologicHazardByPrj") {
+ this.tjlxData.flag = false;
+ data = await dataCount_countGeologicHazardByPrj();
+ } else if (this.queryData.value == "countVariousDataByPrj") {
+ this.setDownloadType = false;
+ this.tjlxData.flag = false;
+ this.setCountFlag = false;
+ this.setExcelType = false;
+ data = await project_selectDirAll();
+ if (!data || data.code != 200) {
+ return;
+ } else {
+ this.prjOption = [];
+ var val_std = [{
+ name: '鍏ㄩ儴',
+ code: "ALL",
+ }]
+ this.prjOption = val_std.concat(data.result);
+ this.prjCunt = this.prjOption[0].code
+ this.setPrjCuntChange();
+ return
+ }
}
-
- if (data.code != 200) {
+ if (!data || data.code != 200) {
return;
}
@@ -647,6 +1049,7 @@
.el-table /deep/ th,
.el-table /deep/ tr {
background-color: transparent !important;
+
}
}
}
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 9023154..10356cf 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -1972,559 +1972,559 @@
var fs2 = null;
if (this.formInline.uploadType == "v1") {
//鍗曟枃浠堕」鐩笂浼�
- fs2 = document.getElementById("metaDataFile");
- if (this.pathBak != null && this.pathBak.indexOf("checkMain") > -1) {
- if (fs2.files.length == 0) {
- return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑鍏冩暟鎹枃浠�");
- }
- }
- } else if (this.formInline.uploadType == "v2") {
- //鏁翠綋椤圭洰涓婁紶
- fs2 = document.getElementById("wbsDataFile");
- if (fs2.files.length == 0) {
- return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑WBS鏁版嵁鏂囦欢");
- }
- } else if (this.formInline.uploadType == "v3") {
+ // fs2 = document.getElementById("metaDataFile");
+ // if (this.pathBak != null && this.pathBak.indexOf("checkMain") > -1) {
+ // if (fs2.files.length == 0) {
+ // return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑鍏冩暟鎹枃浠�");
+ // }
+ // }
+ } else if(this.formInline.uploadType == "v2") {
+ //鏁翠綋椤圭洰涓婁紶
+ fs2 = document.getElementById("wbsDataFile");
+ if (fs2.files.length == 0) {
+ return this.$message.error("璇烽�夋嫨闇�瑕佷笂浼犵殑WBS鏁版嵁鏂囦欢");
+ }
+} else if (this.formInline.uploadType == "v3") {
+}
+for (var i = 0, c = fs1.files.length; i < c; i++) {
+ formData.append(fs1.files[i].name, fs1.files[i]);
+ this.fileType.push({ name: fs1.files[i].name, type: "selectData" });
+}
+if (fs2 != null) {
+ for (var i = 0, c = fs2.files.length; i < c; i++) {
+ formData.append(fs2.files[i].name, fs2.files[i]);
+ if (this.formInline.uploadType == "v1") {
+ this.fileType.push({ name: fs2.files[i].name, type: "metaData" });
+ } else if (this.formInline.uploadType == "v2") {
+ this.fileType.push({ name: fs2.files[i].name, type: "wbsData" });
+ }
+ }
+}
+const that = this;
+that.jindudialogVisible = true;
+let listval = [];
+formData.forEach((key, val) => {
+ listval.push({
+ name: val,
+ });
+});
+that.$set(this, "jindutiaoname", listval);
+that.$set(this, "jindutiao", 0);
+// this.loading = true;
+$.ajax(
+ BASE_URL +
+ "/dataUpload/uploadFiles?token=" +
+ token +
+ "&path=" +
+ this.formInline.path,
+ {
+ type: "post",
+ data: formData,
+ async: true,
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: (rs) => {
+ this.loading = false;
+ if (rs.code != 200) {
+ return this.$message.error("鏁版嵁涓婁紶澶辫触");
}
- for (var i = 0, c = fs1.files.length; i < c; i++) {
- formData.append(fs1.files[i].name, fs1.files[i]);
- this.fileType.push({ name: fs1.files[i].name, type: "selectData" });
- }
- if (fs2 != null) {
- for (var i = 0, c = fs2.files.length; i < c; i++) {
- formData.append(fs2.files[i].name, fs2.files[i]);
- if (this.formInline.uploadType == "v1") {
- this.fileType.push({ name: fs2.files[i].name, type: "metaData" });
- } else if (this.formInline.uploadType == "v2") {
- this.fileType.push({ name: fs2.files[i].name, type: "wbsData" });
- }
- }
- }
- const that = this;
- that.jindudialogVisible = true;
- let listval = [];
- formData.forEach((key, val) => {
- listval.push({
- name: val,
- });
+ this.getFileLength();
+ this.$set(this, "jindutiao", 100);
+ this.$message({
+ message: "涓婁紶鎴愬姛",
+ type: "success",
});
- that.$set(this, "jindutiaoname", listval);
- that.$set(this, "jindutiao", 0);
- // this.loading = true;
- $.ajax(
- BASE_URL +
- "/dataUpload/uploadFiles?token=" +
- token +
- "&path=" +
- this.formInline.path,
- {
- type: "post",
- data: formData,
- async: true,
- cache: false,
- processData: false,
- contentType: false,
- success: (rs) => {
- this.loading = false;
- if (rs.code != 200) {
- return this.$message.error("鏁版嵁涓婁紶澶辫触");
- }
- this.getFileLength();
- this.$set(this, "jindutiao", 100);
- this.$message({
- message: "涓婁紶鎴愬姛",
- type: "success",
- });
- this.clearFileSelect();
- },
- error: (rs) => {
- this.loading = false;
- this.$message.error("鏁版嵁涓婁紶澶辫触");
- },
- xhr: function () {
- var myXhr = $.ajaxSettings.xhr();
-
- if (myXhr.upload) {
- //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
- myXhr.upload.addEventListener(
- "progress",
- that.progressHandlingFunction,
- false
- ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
- }
- return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
- },
- }
- );
+ this.clearFileSelect();
},
- progressHandlingFunction(event) {
- var loaded = event.loaded; //宸蹭笂浼�
- var loaded = Math.floor(100 * (event.loaded / event.total) - 1); //璁＄畻宸茬粡涓婁紶鐨勭櫨鍒嗘瘮
- $("#prog").html(loaded + "%"); //搴旂敤鍒版樉绀篣I锛屽彲鏍规嵁鑷繁闇�瑕佷慨鏀�
- this.jindutiao = loaded;
- this.$set(this, "jindutiao", loaded);
+ error: (rs) => {
+ this.loading = false;
+ this.$message.error("鏁版嵁涓婁紶澶辫触");
},
- format(percentage) {
+ xhr: function () {
+ var myXhr = $.ajaxSettings.xhr();
- // return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`;
- var label;
- if (this.sc.label1 == "涓婁紶") {
- label = "涓婁紶瀹屾瘯"
- } else {
- label = `${percentage}%`
+ if (myXhr.upload) {
+ //妫�鏌pload灞炴�ф槸鍚﹀瓨鍦�
+ myXhr.upload.addEventListener(
+ "progress",
+ that.progressHandlingFunction,
+ false
+ ); //缁戝畾progress浜嬩欢鐨勫洖璋冨嚱鏁�
}
- return percentage === 100 ? label : `${percentage}%`;
+ return myXhr; //xhr瀵硅薄杩斿洖缁檍Query浣跨敤
},
+ }
+);
+ },
+progressHandlingFunction(event) {
+ var loaded = event.loaded; //宸蹭笂浼�
+ var loaded = Math.floor(100 * (event.loaded / event.total) - 1); //璁＄畻宸茬粡涓婁紶鐨勭櫨鍒嗘瘮
+ $("#prog").html(loaded + "%"); //搴旂敤鍒版樉绀篣I锛屽彲鏍规嵁鑷繁闇�瑕佷慨鏀�
+ this.jindutiao = loaded;
+ this.$set(this, "jindutiao", loaded);
+},
+format(percentage) {
+
+ // return percentage === 100 ? "涓婁紶瀹屾瘯" : `${percentage}%`;
+ var label;
+ if (this.sc.label1 == "涓婁紶") {
+ label = "涓婁紶瀹屾瘯"
+ } else {
+ label = `${percentage}%`
+ }
+ return percentage === 100 ? label : `${percentage}%`;
+},
//鑾峰彇鏂囦欢涓婁紶璺緞
async getFilePath() {
- const res = await dataUploadSelectPath();
- if (res.code != 200) {
- this.$message.error("鏂囦欢涓婁紶璺緞鑾峰彇澶辫触");
- return;
- }
- this.formInline.path = res.result;
- },
- //椤圭洰鍚嶇О鍒囨崲
- entryNameChange(res) {
- var val = this.entryOption.filter((rs) => {
- if (rs.name == res) {
- return rs;
- }
- });
- this.pathBak = val[0].checks;
- this.formInline.dirid = val[0].id;
- this.getselectVerByDirid();
- },
+ const res = await dataUploadSelectPath();
+ if (res.code != 200) {
+ this.$message.error("鏂囦欢涓婁紶璺緞鑾峰彇澶辫触");
+ return;
+ }
+ this.formInline.path = res.result;
+},
+//椤圭洰鍚嶇О鍒囨崲
+entryNameChange(res) {
+ var val = this.entryOption.filter((rs) => {
+ if (rs.name == res) {
+ return rs;
+ }
+ });
+ this.pathBak = val[0].checks;
+ this.formInline.dirid = val[0].id;
+ this.getselectVerByDirid();
+},
//鑾峰彇椤圭洰鍚嶇О
async setProjectName() {
- const data = await dataUpload_selectProject();
- if (data.code != 200) {
- this.$message.error("椤圭洰鍒楄〃鑾峰彇澶辫触");
- return;
- }
- this.entryOption = data.result;
- this.formInline.entryId = this.entryOption[0].name;
- this.formInline.dirid = this.entryOption[0].id;
+ const data = await dataUpload_selectProject();
+ if (data.code != 200) {
+ this.$message.error("椤圭洰鍒楄〃鑾峰彇澶辫触");
+ return;
+ }
+ this.entryOption = data.result;
+ this.formInline.entryId = this.entryOption[0].name;
+ this.formInline.dirid = this.entryOption[0].id;
- this.getselectVerByDirid();
- },
+ this.getselectVerByDirid();
+},
//鑾峰彇鎵�鏈夊潗鏍囩郴
async setCoordinateSystem() {
- const data = await dataUpload_selectCoords();
- if (data.code != 200) {
- this.$message.error("鍧愭爣绯诲垪琛ㄨ幏鍙栧け璐�");
- return;
- }
- this.coordinateOption = data.result;
- this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
- },
- //WBS鏁版嵁閫夋嫨
- setWBSFile() {
- $("#wbsDataFile").click();
- },
- //閲嶇疆WPS閫夋嫨
- restWBSFile() {
- this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
- document.getElementById("wbsDataFile").value = "";
- },
- //WBS鏁版嵁Change浜嬩欢
- handleWBSFileChange(event) {
- var std = [];
- var len = event.currentTarget.files.length;
- for (var i = 0; i < len; i++) {
- var f = event.currentTarget.files[i];
- std.push(f.name);
- }
- this.formInline.wbsData = std.toString();
- },
- //鏁版嵁璐ㄦ寮圭獥鍏抽棴--椤圭洰鏁翠綋
- handleTestQuayCloseDown() {
- this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.closeTestQuayCloseDialog();
- })
- .catch((_) => {
- });
- },
- closeTestQuayCloseDialog() {
- this.testQuayVisible = false;
- },
- //鏁版嵁璐ㄦ寮圭獥鍏抽棴--鍗曟枃浠�
- handleQuayTestCloseDown() {
- this.$confirm("纭鍏抽棴锛�")
- .then((_) => {
- this.closeQuayTestCloseDialog();
- })
- .catch((_) => {
- });
- },
- closeQuayTestCloseDialog() {
- this.quayTestVisible = false;
- },
- //鏁版嵁璐ㄦ鐐瑰嚮浜嬩欢
- handleQuayTestClick() {
- if (this.pathBak == null) {
- return this.$message("鏃犺川妫�鏂规");
- }
- if (this.multipleSelection.length == 0) {
- return this.$message("璇烽�夋嫨闇�瑕佽川妫�鐨勬枃浠�");
- }
- if (this.formInline.uploadType == "v1") {
+ const data = await dataUpload_selectCoords();
+ if (data.code != 200) {
+ this.$message.error("鍧愭爣绯诲垪琛ㄨ幏鍙栧け璐�");
+ return;
+ }
+ this.coordinateOption = data.result;
+ this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
+},
+//WBS鏁版嵁閫夋嫨
+setWBSFile() {
+ $("#wbsDataFile").click();
+},
+//閲嶇疆WPS閫夋嫨
+restWBSFile() {
+ this.formInline.wbsData = "璇烽�夋嫨WBS鏁版嵁";
+ document.getElementById("wbsDataFile").value = "";
+},
+//WBS鏁版嵁Change浜嬩欢
+handleWBSFileChange(event) {
+ var std = [];
+ var len = event.currentTarget.files.length;
+ for (var i = 0; i < len; i++) {
+ var f = event.currentTarget.files[i];
+ std.push(f.name);
+ }
+ this.formInline.wbsData = std.toString();
+},
+//鏁版嵁璐ㄦ寮圭獥鍏抽棴--椤圭洰鏁翠綋
+handleTestQuayCloseDown() {
+ this.$confirm("纭鍏抽棴锛�")
+ .then((_) => {
+ this.closeTestQuayCloseDialog();
+ })
+ .catch((_) => {
+ });
+},
+closeTestQuayCloseDialog() {
+ this.testQuayVisible = false;
+},
+//鏁版嵁璐ㄦ寮圭獥鍏抽棴--鍗曟枃浠�
+handleQuayTestCloseDown() {
+ this.$confirm("纭鍏抽棴锛�")
+ .then((_) => {
+ this.closeQuayTestCloseDialog();
+ })
+ .catch((_) => {
+ });
+},
+closeQuayTestCloseDialog() {
+ this.quayTestVisible = false;
+},
+//鏁版嵁璐ㄦ鐐瑰嚮浜嬩欢
+handleQuayTestClick() {
+ if (this.pathBak == null) {
+ return this.$message("鏃犺川妫�鏂规");
+ }
+ if (this.multipleSelection.length == 0) {
+ return this.$message("璇烽�夋嫨闇�瑕佽川妫�鐨勬枃浠�");
+ }
+ if (this.formInline.uploadType == "v1") {
- var value = this.getCheckedKeys
- var fileType = value.data.fullName;
- this.quayTestForms.names = fileType;
- this.quayTestForms.sjzy = this.formInline.specialtyId;
- this.quayTestVisible = true;
- } else if (this.formInline.uploadType == "v2") {
- var fileZip = [];
- var fileExcel = [];
- for (var i in this.multipleSelection) {
- if (this.multipleSelection[i].name.indexOf(".zip") != -1) {
- fileZip.push(this.multipleSelection[i].name);
- } else if (this.multipleSelection[i].name.indexOf(".xls") != -1) {
- fileExcel.push(this.multipleSelection[i].name);
- } else if (this.multipleSelection[i].name.indexOf(".xlsx") != -1) {
- fileExcel.push(this.multipleSelection[i].name);
- }
- }
-
- if (fileZip.length != 1) {
- return this.$message("璇烽�夋嫨涓�涓暣浣撻」鐩枃浠�");
- }
- if (fileExcel.length != 1) {
- return this.$message("璇烽�夋嫨涓�涓猈BS鏂囦欢");
- }
-
- this.formCheckAll.names = JSON.parse(this.pathBak).toString();
- var val = this.entryOption.filter((res) => {
- if (res.id == this.formInline.dirid) {
- return res;
- }
- });
-
- this.formCheckAll.xmmc = val[0].name;
- this.formCheckAll.sjzy = this.formInline.specialtyId;
- if (this.formCheckAll.sjzy.indexOf("鍦扮伨") != -1) {
- this.formCheckAll.isDiZai = "YES";
- this.formCheckAll.diZaiType = this.disOptions[0].value;
- } else {
- this.formCheckAll.isDiZai = "NO";
- this.formCheckAll.diZaiType = "NO";
- }
- this.testQuayVisible = true;
+ var value = this.getCheckedKeys
+ var fileType = value.data.fullName;
+ this.quayTestForms.names = fileType;
+ this.quayTestForms.sjzy = this.formInline.specialtyId;
+ this.quayTestVisible = true;
+ } else if (this.formInline.uploadType == "v2") {
+ var fileZip = [];
+ var fileExcel = [];
+ for (var i in this.multipleSelection) {
+ if (this.multipleSelection[i].name.indexOf(".zip") != -1) {
+ fileZip.push(this.multipleSelection[i].name);
+ } else if (this.multipleSelection[i].name.indexOf(".xls") != -1) {
+ fileExcel.push(this.multipleSelection[i].name);
+ } else if (this.multipleSelection[i].name.indexOf(".xlsx") != -1) {
+ fileExcel.push(this.multipleSelection[i].name);
}
- },
+ }
+
+ if (fileZip.length != 1) {
+ return this.$message("璇烽�夋嫨涓�涓暣浣撻」鐩枃浠�");
+ }
+ if (fileExcel.length != 1) {
+ return this.$message("璇烽�夋嫨涓�涓猈BS鏂囦欢");
+ }
+
+ this.formCheckAll.names = JSON.parse(this.pathBak).toString();
+ var val = this.entryOption.filter((res) => {
+ if (res.id == this.formInline.dirid) {
+ return res;
+ }
+ });
+
+ this.formCheckAll.xmmc = val[0].name;
+ this.formCheckAll.sjzy = this.formInline.specialtyId;
+ if (this.formCheckAll.sjzy.indexOf("鍦扮伨") != -1) {
+ this.formCheckAll.isDiZai = "YES";
+ this.formCheckAll.diZaiType = this.disOptions[0].value;
+ } else {
+ this.formCheckAll.isDiZai = "NO";
+ this.formCheckAll.diZaiType = "NO";
+ }
+ this.testQuayVisible = true;
+ }
+},
//涓婁紶鏁版嵁鍒楄〃娓呭崟鍒犻櫎
async setWarehouseDel() {
- this.loading = true;
- var std = [];
- for (var i in this.multipleDelete) {
- std.push(this.multipleDelete[i].id);
- }
+ this.loading = true;
+ var std = [];
+ for (var i in this.multipleDelete) {
+ std.push(this.multipleDelete[i].id);
+ }
- const res = await dataUpload_deleteMetas({ ids: std.toString() });
- this.loading = false;
- if (res.code != 200) {
- this.$message.error("鍒犻櫎澶辫触");
- } else {
- this.$message({
- message: "鍒犻櫎鎴愬姛",
- type: "success",
- });
- this.setStartWareTable();
- }
- },
- //涓婁紶鏁版嵁鍒楄〃娓呭崟鏌ヨ
- setWarehouseSearch() {
- this.listData = {
- pageIndex: 1,
- pageSize: 10,
- name: this.formWarehousing.name,
- };
- this.getAllWareTable();
- },
- //涓婁紶鏁版嵁鍒楄〃閲嶇疆
- setWarehouseReset() {
- this.formWarehousing.name = "";
- this.listData = {
- pageIndex: 1,
- pageSize: 10,
- name: null,
- };
- this.getAllWareTable();
- },
- //鏍煎紡鍖栨椂闂�
- changetimeFile(res) {
- var time = new Date(res.createTime);
- var y = time.getFullYear();
- var m = time.getMonth() + 1;
- var d = time.getDate();
- var h = time.getHours();
- var mm = time.getMinutes();
- var s = time.getSeconds();
- return (
- y +
- "-" +
- this.add0(m) +
- "-" +
- this.add0(d) +
- " " +
- h +
- ":" +
- mm +
- ":" +
- s
- );
- },
- //鏍煎紡鍖栨椂闂�
- add0(m) {
- return m < 10 ? "0" + m : m;
- },
- //澶у皬鍊兼敼鍙�
- changeSizeFile(row, column, cellValue, index) {
- if (cellValue >= 1024) {
- return parseFloat(cellValue / 1204).toFixed(3) + "GB";
- } else {
- return cellValue + "MB";
- }
- },
- //涓婁紶鏁版嵁鍒楄〃娓呭崟閫夋嫨
- handleDelteChange(val) {
- this.multipleDelete = val;
- },
- //涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖�
- setStartWareTable() {
- // this.listData = {
- // pageIndex: 1,
- // pageSize: 10,
- // name: null,
- // };
- this.listData.pageIndex = 1;
- this.listData.name = null;
- this.getAllWareTable();
- },
+ const res = await dataUpload_deleteMetas({ ids: std.toString() });
+ this.loading = false;
+ if (res.code != 200) {
+ this.$message.error("鍒犻櫎澶辫触");
+ } else {
+ this.$message({
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
+ });
+ this.setStartWareTable();
+ }
+},
+//涓婁紶鏁版嵁鍒楄〃娓呭崟鏌ヨ
+setWarehouseSearch() {
+ this.listData = {
+ pageIndex: 1,
+ pageSize: 10,
+ name: this.formWarehousing.name,
+ };
+ this.getAllWareTable();
+},
+//涓婁紶鏁版嵁鍒楄〃閲嶇疆
+setWarehouseReset() {
+ this.formWarehousing.name = "";
+ this.listData = {
+ pageIndex: 1,
+ pageSize: 10,
+ name: null,
+ };
+ this.getAllWareTable();
+},
+//鏍煎紡鍖栨椂闂�
+changetimeFile(res) {
+ var time = new Date(res.createTime);
+ var y = time.getFullYear();
+ var m = time.getMonth() + 1;
+ var d = time.getDate();
+ var h = time.getHours();
+ var mm = time.getMinutes();
+ var s = time.getSeconds();
+ return (
+ y +
+ "-" +
+ this.add0(m) +
+ "-" +
+ this.add0(d) +
+ " " +
+ h +
+ ":" +
+ mm +
+ ":" +
+ s
+ );
+},
+//鏍煎紡鍖栨椂闂�
+add0(m) {
+ return m < 10 ? "0" + m : m;
+},
+//澶у皬鍊兼敼鍙�
+changeSizeFile(row, column, cellValue, index) {
+ if (cellValue >= 1024) {
+ return parseFloat(cellValue / 1204).toFixed(3) + "GB";
+ } else {
+ return cellValue + "MB";
+ }
+},
+//涓婁紶鏁版嵁鍒楄〃娓呭崟閫夋嫨
+handleDelteChange(val) {
+ this.multipleDelete = val;
+},
+//涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖�
+setStartWareTable() {
+ // this.listData = {
+ // pageIndex: 1,
+ // pageSize: 10,
+ // name: null,
+ // };
+ this.listData.pageIndex = 1;
+ this.listData.name = null;
+ this.getAllWareTable();
+},
//鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟
async getAllWareTable() {
- const res = await dataUpload_selectByPageForUpload(this.listData);
- if (res.code != 200) {
- this.$message.error("鍒楄〃鏁版嵁鑾峰彇澶辫触");
- return;
- }
- this.count = res.count;
- this.waretableData = res.result;
- },
- //鏁版嵁涓婁紶鍒楄〃娓呭崟page Count 鍒囨崲
- handleSizeChange(val) {
- this.listData.pageIndex = 1;
- this.listData.pageSize = val;
- this.getAllWareTable();
- },
+ const res = await dataUpload_selectByPageForUpload(this.listData);
+ if (res.code != 200) {
+ this.$message.error("鍒楄〃鏁版嵁鑾峰彇澶辫触");
+ return;
+ }
+ this.count = res.count;
+ this.waretableData = res.result;
+},
+//鏁版嵁涓婁紶鍒楄〃娓呭崟page Count 鍒囨崲
+handleSizeChange(val) {
+ this.listData.pageIndex = 1;
+ this.listData.pageSize = val;
+ this.getAllWareTable();
+},
- //鏁版嵁涓婁紶鍒楄〃娓呭崟page鍒囨崲
- handleCurrentChange(val) {
- this.listData.pageIndex = val;
- this.getAllWareTable();
- },
- //涓婁紶鏁版嵁琛ㄦ牸閫夋嫨
- handleSelectionChange(res) {
- this.multipleSelection = res;
- },
+//鏁版嵁涓婁紶鍒楄〃娓呭崟page鍒囨崲
+handleCurrentChange(val) {
+ this.listData.pageIndex = val;
+ this.getAllWareTable();
+},
+//涓婁紶鏁版嵁琛ㄦ牸閫夋嫨
+handleSelectionChange(res) {
+ this.multipleSelection = res;
+},
- //閫夋嫨鏁版嵁鏂囦欢鍒囨崲
- handleSelectFileChange(event) {
- var std = [];
- var len = event.currentTarget.files.length;
- for (var i = 0; i < len; i++) {
- var f = event.currentTarget.files[i];
- std.push(f.name);
- }
- this.formInline.specialtyData = std.toString();
- },
- //閫夋嫨鍏冩暟鎹�
- setMetaFile() {
- $("#metaDataFile").click();
- },
- //閲嶇疆鍏冩暟鎹�
- restMetaFile() {
- this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
- document.getElementById("metaDataFile").value = "";
- },
- //閫夋嫨鍏冩暟鎹枃浠跺垏鎹�
- handleMetaFileChange(event) {
- var std = [];
- var len = event.currentTarget.files.length;
- for (var i = 0; i < len; i++) {
- var f = event.currentTarget.files[i];
- std.push(f.name);
- }
- this.formInline.metaData = std.toString();
- this.metaFileData = std;
- },
+//閫夋嫨鏁版嵁鏂囦欢鍒囨崲
+handleSelectFileChange(event) {
+ var std = [];
+ var len = event.currentTarget.files.length;
+ for (var i = 0; i < len; i++) {
+ var f = event.currentTarget.files[i];
+ std.push(f.name);
+ }
+ this.formInline.specialtyData = std.toString();
+},
+//閫夋嫨鍏冩暟鎹�
+setMetaFile() {
+ $("#metaDataFile").click();
+},
+//閲嶇疆鍏冩暟鎹�
+restMetaFile() {
+ this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
+ document.getElementById("metaDataFile").value = "";
+},
+//閫夋嫨鍏冩暟鎹枃浠跺垏鎹�
+handleMetaFileChange(event) {
+ var std = [];
+ var len = event.currentTarget.files.length;
+ for (var i = 0; i < len; i++) {
+ var f = event.currentTarget.files[i];
+ std.push(f.name);
+ }
+ this.formInline.metaData = std.toString();
+ this.metaFileData = std;
+},
- //From琛ㄥ崟鍒濆鍖�
- setFromStart() {
- this.formInline.verid = null;
- this.formInline.specialtyId = "娴嬮噺涓撲笟";
- this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
- this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
- this.formInline.entryId = null;
- this.formInline.selectFileType = "*.*";
- this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
- this.formInline.medium = "";
- this.formInline.tab = "";
- },
- //閫夋嫨鏁版嵁
- setSelectFile() {
- $("#selectDataFile").click();
- },
- //閲嶇疆鏁版嵁
- restSelectFile() {
- this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
- document.getElementById("selectDataFile").value = "";
- },
- //鍏ュ簱绫诲瀷鍒囨崲
- uploadTypeChange(res) {
- this.setFromStart();
- if (res == "v2") {
- this.uploadFlag = false;
- this.formInline.selectFileType = ".zip";
- this.formInline.entryId = this.entryOption[0].name;
- this.formInline.dirid = this.entryOption[0].id;
- this.getselectVerByDirid();
- this.pathBak = this.entryOption[0].checks;
- } else if (res == "v3") {
- this.formInline.selectFileType = ".kml";
- this.getSelectdirTab();
- this.getselectVerByDirid();
- this.formInline.specialtyId = "绾胯矾涓撲笟";
- this.uploadFlag = true;
- this.formInline.tab = this.lineOptions[0].value;
- this.formInline.medium = this.mediumOptions[0].value
- } else {
- this.getSelectdirTab();
- this.getselectVerByDirid();
- this.uploadFlag = true;
- }
- this.formInline.uploadType = res;
- },
+//From琛ㄥ崟鍒濆鍖�
+setFromStart() {
+ this.formInline.verid = null;
+ this.formInline.specialtyId = "娴嬮噺涓撲笟";
+ this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
+ this.formInline.metaData = "璇烽�夋嫨鍏冩暟鎹�";
+ this.formInline.entryId = null;
+ this.formInline.selectFileType = "*.*";
+ this.formInline.coordinateId = this.coordinateOption[0].epsgcode;
+ this.formInline.medium = "";
+ this.formInline.tab = "";
+},
+//閫夋嫨鏁版嵁
+setSelectFile() {
+ $("#selectDataFile").click();
+},
+//閲嶇疆鏁版嵁
+restSelectFile() {
+ this.formInline.specialtyData = "璇烽�夋嫨鏁版嵁";
+ document.getElementById("selectDataFile").value = "";
+},
+//鍏ュ簱绫诲瀷鍒囨崲
+uploadTypeChange(res) {
+ this.setFromStart();
+ if (res == "v2") {
+ this.uploadFlag = false;
+ this.formInline.selectFileType = ".zip";
+ this.formInline.entryId = this.entryOption[0].name;
+ this.formInline.dirid = this.entryOption[0].id;
+ this.getselectVerByDirid();
+ this.pathBak = this.entryOption[0].checks;
+ } else if (res == "v3") {
+ this.formInline.selectFileType = ".kml";
+ this.getSelectdirTab();
+ this.getselectVerByDirid();
+ this.formInline.specialtyId = "绾胯矾涓撲笟";
+ this.uploadFlag = true;
+ this.formInline.tab = this.lineOptions[0].value;
+ this.formInline.medium = this.mediumOptions[0].value
+ } else {
+ this.getSelectdirTab();
+ this.getselectVerByDirid();
+ this.uploadFlag = true;
+ }
+ this.formInline.uploadType = res;
+},
//鐗堟湰鍙疯幏鍙�
async getselectVerByDirid() {
- this.verOption = [];
+ this.verOption = [];
- const res = await dataUploadSelectVerByDirid({
- dirid: this.formInline.dirid,
- });
+ const res = await dataUploadSelectVerByDirid({
+ dirid: this.formInline.dirid,
+ });
- if (res.code != 200) {
- this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触");
- return;
- }
- this.verOption = res.result;
- this.formInline.verid = res.result[0].id;
- },
+ if (res.code != 200) {
+ this.$message.error("鐗堟湰鍒楄〃鑾峰彇澶辫触");
+ return;
+ }
+ this.verOption = res.result;
+ this.formInline.verid = res.result[0].id;
+},
//鐩綍鍒楄〃鑾峰彇
async getSelectdirTab() {
- const res = await selectdirTab();
- if (res.code != 200) {
- this.$message.error("鐩綍鍒楄〃鑾峰彇澶辫触");
- return;
- }
+ const res = await selectdirTab();
+ if (res.code != 200) {
+ this.$message.error("鐩綍鍒楄〃鑾峰彇澶辫触");
+ return;
+ }
- this.catalogOption = this.treeData(res.result);
- this.formInline.dirName = this.catalogOption[0].name;
- this.formInline.dirid = this.catalogOption[0].id;
- // this.getStartDirChecked(this.catalogOption);
- this.getselectVerByDirid();
- },
+ this.catalogOption = this.treeData(res.result);
+ this.formInline.dirName = this.catalogOption[0].name;
+ this.formInline.dirid = this.catalogOption[0].id;
+ // this.getStartDirChecked(this.catalogOption);
+ this.getselectVerByDirid();
+},
- getStartDirChecked(res) {
- if (res.length != 0) {
- if (res[0].children == null || res[0].children == undefined) {
- this.formInline.dirid = res[0].id;
- } else {
- this.getStartDirChecked(res[0].children);
- }
- }
- },
- //鍗曟枃浠惰川妫�寮圭獥鍒濆鍖�
- startQuayTestForms() {
- (this.quayTestForms = {
- tolerance: "0.001",
- gcdOffset: "20",
- rangeOffset: "200",
- kzdOffset: "100",
- xgMax: "0.005",
- coordinateSystem: "CGCS2000/degree",
- imgResolution: "0.2",
- demTolerance: "5",
- demChangeRate: "200",
- lazDensity: "1",
- imgResolution: "0.2",
- }),
- (this.quayTestShow = {
- checkOsgb: false,
- checkXls: false,
- checkLaz: false,
- checkDem: false,
- checkAttrs: false,
- checkTopology: false,
- checkDecorate: false,
- checkOrigin: false,
- checkDom: false,
- checkMath: false,
- checkMeta: false,
- checkMain: false,
- });
- },
- //鐩綍鍒囨崲
- catalogChange(data, node, nodeData) {
- this.startQuayTestForms();
- // this.$refs['selectcascader'].dropDownVisible = false
- // var value = this.$refs['selectcascader'].getCheckedNodes();
+getStartDirChecked(res) {
+ if (res.length != 0) {
+ if (res[0].children == null || res[0].children == undefined) {
+ this.formInline.dirid = res[0].id;
+ } else {
+ this.getStartDirChecked(res[0].children);
+ }
+ }
+},
+//鍗曟枃浠惰川妫�寮圭獥鍒濆鍖�
+startQuayTestForms() {
+ (this.quayTestForms = {
+ tolerance: "0.001",
+ gcdOffset: "20",
+ rangeOffset: "200",
+ kzdOffset: "100",
+ xgMax: "0.005",
+ coordinateSystem: "CGCS2000/degree",
+ imgResolution: "0.2",
+ demTolerance: "5",
+ demChangeRate: "200",
+ lazDensity: "1",
+ imgResolution: "0.2",
+ }),
+ (this.quayTestShow = {
+ checkOsgb: false,
+ checkXls: false,
+ checkLaz: false,
+ checkDem: false,
+ checkAttrs: false,
+ checkTopology: false,
+ checkDecorate: false,
+ checkOrigin: false,
+ checkDom: false,
+ checkMath: false,
+ checkMeta: false,
+ checkMain: false,
+ });
+},
+//鐩綍鍒囨崲
+catalogChange(data, node, nodeData) {
+ this.startQuayTestForms();
+ // this.$refs['selectcascader'].dropDownVisible = false
+ // var value = this.$refs['selectcascader'].getCheckedNodes();
- var bak = node.data.checks;
- this.getCheckedKeys = node
- this.pathBak = bak;
- if (bak != null) {
- for (var key in this.quayTestShow) {
- if (bak.indexOf(key) != -1) {
- this.quayTestShow[key] = true;
- }
- }
+ var bak = node.data.checks;
+ this.getCheckedKeys = node
+ this.pathBak = bak;
+ if (bak != null) {
+ for (var key in this.quayTestShow) {
+ if (bak.indexOf(key) != -1) {
+ this.quayTestShow[key] = true;
}
- var fileType = node.data.exts;
- if (fileType == null) {
- fileType = "*.*";
- }
- this.formInline.selectFileType = fileType;
- this.formInline.dirid = node.data.id;
- this.formInline.dirName = node.data.name;
- this.getselectVerByDirid();
- setTimeout(() => {
- this.$refs.multiSelect.blur()
- }, 100)
- },
- //Tabsq鍒囨崲
- handleTabClick(tab, event) {
- if (tab.name == "second") {
- this.setStartWareTable();
- } else {
- this.noteVisible = true
- }
- this.calHeight();
- },
- //鏍戝垪琛ㄧ敓鎴�
- treeData(source) {
- let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
- return cloneData.filter((father) => {
- // 寰幆鎵�鏈夐」
- let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
- branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
- return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
- });
- },
+ }
+ }
+ var fileType = node.data.exts;
+ if (fileType == null) {
+ fileType = "*.*";
+ }
+ this.formInline.selectFileType = fileType;
+ this.formInline.dirid = node.data.id;
+ this.formInline.dirName = node.data.name;
+ this.getselectVerByDirid();
+ setTimeout(() => {
+ this.$refs.multiSelect.blur()
+ }, 100)
+},
+//Tabsq鍒囨崲
+handleTabClick(tab, event) {
+ if (tab.name == "second") {
+ this.setStartWareTable();
+ } else {
+ this.noteVisible = true
+ }
+ this.calHeight();
+},
+//鏍戝垪琛ㄧ敓鎴�
+treeData(source) {
+ let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
+ return cloneData.filter((father) => {
+ // 寰幆鎵�鏈夐」
+ let branchArr = cloneData.filter((child) => father.id == child.pid); // 瀵规瘮ID锛屽垎鍒笂涓嬬骇鑿滃崟锛屽苟杩斿洖鏁版嵁
+ branchArr.length > 0 ? (father.children = branchArr) : ""; // 缁欑埗绾ф坊鍔犱竴涓猚hildren灞炴�э紝骞惰祴鍊�
+ return father.pid == 0; // 杩斿洖涓�绾ц彍鍗�
+ });
+},
},
};
</script>
diff --git a/src/views/maintenance/databaseMonitoring.vue b/src/views/maintenance/databaseMonitoring.vue
index cd8e022..7601fb8 100644
--- a/src/views/maintenance/databaseMonitoring.vue
+++ b/src/views/maintenance/databaseMonitoring.vue
@@ -34,7 +34,6 @@
if (url.indexOf('{webHost}') != -1) {
url = url.replace('{webHost}', webHost)
}
-
if (url.indexOf('token=') != -1) {
this.sql_Url = url + getToken();
} else {
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index b5dab3d..44fae20 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -297,7 +297,7 @@
async getList() {
const data = await resOpSelectByPageAndCount(this.listData);
- console.log(data);
+
if (data.code != 200) {
return this.$message.error("鍒楄〃璋冪敤澶辫触");
}
diff --git a/src/views/maintenance/opexController.vue b/src/views/maintenance/opexController.vue
index 0fcd167..45601bc 100644
--- a/src/views/maintenance/opexController.vue
+++ b/src/views/maintenance/opexController.vue
@@ -288,7 +288,8 @@
this.$store.state.currentPerms = data.perms;
var index = data.url;
if (index != null) {
- if (index.indexOf('http') != -1) {
+ if (index.indexOf('{webHost}') != -1) {
+
this.$store.commit('getIframe', data.url);
index = 'dataIfream';
}
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index b262369..39341c1 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -253,7 +253,7 @@
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触");
}
- console.log(data);
+
this.tableData = data.result;
this.count = data.count;
},
diff --git a/src/views/maintenance/systemMonitoring copy.vue b/src/views/maintenance/systemMonitoring copy.vue
index 62adfe2..dc78499 100644
--- a/src/views/maintenance/systemMonitoring copy.vue
+++ b/src/views/maintenance/systemMonitoring copy.vue
@@ -836,7 +836,7 @@
Window.ws.onmessage = (msg) => {
// console.log('鏉ヨ嚜鏈嶅姟鍣ㄧ鐨勬暟鎹細' + msg.data); //鐩戝惉鎺ュ彈鏉ヨ嚜鏈嶅姟绔殑淇℃伅
var data = JSON.parse(msg.data);
- console.log(data);
+
if (data.userInfo != undefined) {
that.SetTableData1(data);
} else if (data.resInfo != undefined) {
diff --git a/src/views/maintenance/systemMonitoring.vue b/src/views/maintenance/systemMonitoring.vue
index 649ea4a..abdc145 100644
--- a/src/views/maintenance/systemMonitoring.vue
+++ b/src/views/maintenance/systemMonitoring.vue
@@ -1,72 +1,40 @@
<template>
<div class="systemMonitoring_box">
- <My-bread
- :list="[
- `${$t('operatManage.operatManage')}`,
- `${$t('operatManage.systemMonitoring')}`,
- ]"
- ></My-bread>
+ <My-bread :list="[
+ `${$t('operatManage.operatManage')}`,
+ `${$t('operatManage.systemMonitoring')}`,
+ ]"></My-bread>
<el-divider />
<div class="content_Box">
<div class="cloumn_Box1">
<div class="flex_Box1 subpage_Div">
<el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane
- :label="$t('operatManage.systemMonitoringObj.abnormalResources')"
- name="first"
- >
+ <el-tab-pane :label="$t('operatManage.systemMonitoringObj.abnormalResources')" name="first">
<div class="table_b">
<el-table :data="resInfo" style="width: 100%; height: 100%">
- <el-table-column
- prop="id"
- :label="$t('operatManage.systemMonitoringObj.resourceID')"
- >
+ <el-table-column prop="id" :label="$t('operatManage.systemMonitoringObj.resourceID')">
</el-table-column>
- <el-table-column
- prop="name"
- :label="$t('operatManage.systemMonitoringObj.resourceName')"
- >
+ <el-table-column prop="name" :label="$t('operatManage.systemMonitoringObj.resourceName')">
</el-table-column>
- <el-table-column
- prop="bak"
- :label="
- $t('operatManage.systemMonitoringObj.resourceState')
- "
- >
+ <el-table-column prop="bak" :label="$t('operatManage.systemMonitoringObj.resourceState')
+ ">
</el-table-column>
- <el-table-column
- prop="createTime"
- :label="$t('operatManage.systemMonitoringObj.abnormaltime')"
- show-overflow-tooltip
- >
+ <el-table-column prop="createTime" :label="$t('operatManage.systemMonitoringObj.abnormaltime')"
+ show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
</el-tab-pane>
- <el-tab-pane
- :label="
- $t('operatManage.systemMonitoringObj.serviceResourceStatus')
- "
- name="second"
- >
+ <el-tab-pane :label="$t('operatManage.systemMonitoringObj.serviceResourceStatus')
+ " name="second">
<div id="resUseChart" style="width: 101vh; height: 30vh"></div>
</el-tab-pane>
- <el-tab-pane
- :label="$t('operatManage.systemMonitoringObj.userloginStatus')"
- name="third"
- >
+ <el-tab-pane :label="$t('operatManage.systemMonitoringObj.userloginStatus')" name="third">
<div id="userLoginChart" style="width: 101vh; height: 30vh"></div>
</el-tab-pane>
- <el-tab-pane
- :label="
- $t('operatManage.systemMonitoringObj.resourceOperationStatus')
- "
- name="fourth"
- >
- <div
- id="operateCountChart"
- style="width: 101vh; height: 30vh"
- ></div>
+ <el-tab-pane :label="$t('operatManage.systemMonitoringObj.resourceOperationStatus')
+ " name="fourth">
+ <div id="operateCountChart" style="width: 101vh; height: 30vh"></div>
</el-tab-pane>
</el-tabs>
</div>
@@ -78,27 +46,13 @@
</div>
<div class="table_b">
<el-table :data="tableData" style="width: 100%">
- <el-table-column
- align="center"
- type="index"
- :label="$t('operatManage.ELM.index')"
- width="100px"
- />
- <el-table-column
- prop="uid"
- :label="$t('operatManage.systemMonitoringObj.userID')"
- >
+ <el-table-column align="center" type="index" :label="$t('operatManage.ELM.index')" width="100px" />
+ <el-table-column prop="uid" :label="$t('operatManage.systemMonitoringObj.userID')">
</el-table-column>
- <el-table-column
- prop="uname"
- :label="$t('operatManage.systemMonitoringObj.username')"
- >
+ <el-table-column prop="uname" :label="$t('operatManage.systemMonitoringObj.username')">
</el-table-column>
- <el-table-column
- prop="loginTime"
- :label="$t('operatManage.systemMonitoringObj.onlineTime')"
- fixed="right"
- >
+ <el-table-column prop="loginTime" :label="$t('operatManage.systemMonitoringObj.onlineTime')"
+ fixed="right">
</el-table-column>
</el-table>
</div>
@@ -118,17 +72,15 @@
<div class="height_title">
<label>
{{
- $t("operatManage.systemMonitoringObj.haveBeenUsed")
- }}</label
- >
+ $t("operatManage.systemMonitoringObj.haveBeenUsed")
+ }}</label>
<p>{{ memInfo.use }}</p>
</div>
<div class="height_title">
<label>
{{
- $t("operatManage.systemMonitoringObj.usageRate")
- }}</label
- >
+ $t("operatManage.systemMonitoringObj.usageRate")
+ }}</label>
<p>{{ memInfo.usage }}</p>
</div>
</div>
@@ -136,17 +88,15 @@
<div class="height_title">
<label>
{{
- $t("operatManage.systemMonitoringObj.totalMemory")
- }}</label
- >
+ $t("operatManage.systemMonitoringObj.totalMemory")
+ }}</label>
<p>{{ memInfo.totalMem }}</p>
</div>
<div class="height_title">
<label>
{{
- $t("operatManage.systemMonitoringObj.remainingMemory")
- }}</label
- >
+ $t("operatManage.systemMonitoringObj.remainingMemory")
+ }}</label>
<p>{{ memInfo.remainMem }}</p>
</div>
</div>
@@ -163,10 +113,7 @@
{{ $t("operatManage.systemMonitoringObj.cpuMonitoring") }}
</div>
</div>
- <div
- id="Sys_cpu_chart"
- style="width: 100%; height: 86%; margin-top: 8%"
- ></div>
+ <div id="Sys_cpu_chart" style="width: 100%; height: 86%; margin-top: 8%"></div>
</div>
<div class="flex_Box subpage_Div">
<div style="width: 100%; height: 34px">
@@ -181,8 +128,8 @@
<div class="ycTltle">{{ resInfoCount }}</div>
<div class="heteroTitle">
{{
- $t("operatManage.systemMonitoringObj.numberOfExceptions")
- }}
+ $t("operatManage.systemMonitoringObj.numberOfExceptions")
+ }}
</div>
</div>
</div>
@@ -633,12 +580,15 @@
},
],
};
+ var dome = document.getElementById("shuiwen")
+ if (dome) {
+ let myChart1 = this.$echarts.init(dome);
+ myChart1.setOption(options);
+ window.addEventListener("resize", function () {
+ myChart1.resize();
+ });
+ }
- let myChart1 = this.$echarts.init(document.getElementById("shuiwen"));
- myChart1.setOption(options);
- window.addEventListener("resize", function () {
- myChart1.resize();
- });
},
lineChart3() {
var data = [
@@ -803,6 +753,24 @@
);
myChart4.setOption(option);
},
+ isJSON(str) {
+ if (typeof str == 'string') {
+ try {
+ var obj = JSON.parse(str);
+ if (typeof obj == 'object' && obj) {
+ return true;
+ } else {
+ return false;
+ }
+
+ } catch (e) {
+
+ return false;
+ }
+ }
+
+ }
+
},
created() {
if (Window.ws != null) {
@@ -814,19 +782,22 @@
}
Window.ws = new WebSocket(socketUrl);
- Window.ws.option = () => {};
+ Window.ws.option = () => { };
var that = this;
Window.ws.onmessage = (msg) => {
// console.log('鏉ヨ嚜鏈嶅姟鍣ㄧ鐨勬暟鎹細' + msg.data); //鐩戝惉鎺ュ彈鏉ヨ嚜鏈嶅姟绔殑淇℃伅
- var data = JSON.parse(msg.data);
- console.log(data);
- if (data.userInfo != undefined) {
- that.SetTableData1(data);
- } else if (data.resInfo != undefined) {
- that.SetTableData2(data);
- } else if (data.operateCount != undefined) {
- that.SetTableData3(data);
+ var obj = this.isJSON(msg.data);
+ if (obj) {
+ var data = JSON.parse(msg.data);
+ if (data.userInfo != undefined) {
+ that.SetTableData1(data);
+ } else if (data.resInfo != undefined) {
+ that.SetTableData2(data);
+ } else if (data.operateCount != undefined) {
+ that.SetTableData3(data);
+ }
}
+
};
},
@@ -853,10 +824,12 @@
.table_b .el-table /deep/ .el-table__expanded-cell {
background-color: transparent !important;
}
+
.table_b .el-table /deep/ th,
.table_b .el-table /deep/ tr {
background-color: transparent !important;
}
+
.content_Box {
width: 100%;
height: 90%;
@@ -864,12 +837,14 @@
display: flex;
flex-direction: column;
justify-content: space-around;
+
.cloumn_Box {
width: 100%;
height: 38%;
display: flex;
justify-content: space-between;
+
.flex_Box {
width: 30.5%;
height: 88%;
@@ -881,37 +856,37 @@
width: 46px;
height: 20px;
float: left;
- background: url("../../assets/img/systemMonitoring/鍥惧眰 38.png")
- no-repeat;
+ background: url("../../assets/img/systemMonitoring/鍥惧眰 38.png") no-repeat;
background-size: 100% 100%;
}
+
.image2 {
width: 34px;
height: 34px;
float: left;
- background: url("../../assets/img/systemMonitoring/鍥惧眰 37.png")
- no-repeat;
+ background: url("../../assets/img/systemMonitoring/鍥惧眰 37.png") no-repeat;
background-size: 100% 100%;
}
+
.image3 {
width: 32px;
height: 32px;
float: left;
- background: url("../../assets/img/systemMonitoring/鍥惧眰 40.png")
- no-repeat;
+ background: url("../../assets/img/systemMonitoring/鍥惧眰 40.png") no-repeat;
background-size: 100% 100%;
}
}
+
.ycsBox {
width: 495px;
height: 182px;
- background: url("../../assets/img/systemMonitoring/鍥惧眰 39.png")
- no-repeat;
+ background: url("../../assets/img/systemMonitoring/鍥惧眰 39.png") no-repeat;
background-size: 100% 100%;
border: 1px;
display: flex;
align-items: center;
}
+
.ycContent {
width: 100%;
padding: 1%;
@@ -921,11 +896,13 @@
justify-content: center;
}
}
+
.imageTitle {
float: left;
margin-left: 10px;
}
+
.ycTltle {
width: 100%;
margin-top: 8%;
@@ -935,6 +912,7 @@
color: #009cff;
text-align: center;
}
+
.heteroTitle {
width: 100%;
text-align: center;
@@ -948,6 +926,7 @@
// text-align: center;
}
+
.top_Box1 {
width: 96%;
height: 91%;
@@ -955,17 +934,20 @@
margin-left: 4%;
display: flex;
justify-content: space-between;
+
.top_box_left {
width: 59%;
height: 100%;
display: flex;
justify-content: space-between;
+
.left_title {
width: 48%;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-around;
+
.height_title {
width: 100%;
height: 48%;
@@ -977,6 +959,7 @@
}
}
}
+
.top_box_right {
width: 39%;
height: 100%;
@@ -989,6 +972,7 @@
display: flex;
justify-content: space-between;
+
.flex_Box1 {
width: 64%;
height: 92%;
@@ -996,6 +980,7 @@
border-radius: 5px;
}
+
.flex_Box {
width: 30.5%;
height: 92%;
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index b9e2abd..a9971b7 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -31,12 +31,13 @@
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>
</el-form-item>
</div>
</div>
@@ -72,6 +73,7 @@
<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>
@@ -91,8 +93,8 @@
</div>
<!-- 鏂板 -->
<el-dialog :title="behavior == '鏂板'
- ? `${$t('common.append')}`
- : `${$t('common.update')}`
+ ? `${$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">
@@ -236,41 +238,14 @@
report_deletes,
report_update,
} from "../../api/api.js";
+import dataStatistics from '../../components/js/dataStatistics.js'
import { getToken } from "@/utils/auth";
export default {
name: "templateManage",
components: { MyBread },
data() {
return {
- options: [
- {
- value: "countSizes",
- label: "鏁版嵁閲忕粺璁�",
- },
- {
- value: "countServices",
- label: "鏈嶅姟璋冪敤閲忕粺璁�",
- },
- {
- value: "countOperates",
- label: "鐢ㄦ埛娴侀噺缁熻",
- },
- {
- value: "dataTable",
- label: "涓婁紶鏁版嵁琛ㄦ牸妯℃澘",
- },
- {
- value: "uploadDir",
- label: "涓婁紶鐩綍缁撴瀯妯℃澘",
- },
- {
- value: "dirFolder",
- label: "鐩綍缁撴瀯鏂囦欢澶规ā鏉�",
- }, {
- value: "countExplorationPoints",
- label: "閽诲瓟鏁版嵁缁熻",
- },
- ],
+ options: [],
itemdetail: {},
showinfoBox: false,
behavior: "鏂板",
@@ -321,6 +296,12 @@
window.removeEventListener("resize", this.onResize);
},
mounted() {
+
+ var obj = dataStatistics.statistics.filter(res => {
+ if (res.isMenu != false)
+ return res;
+ })
+ this.options = obj
window.addEventListener("resize", this.onResize);
this.calHeight();
},
@@ -388,7 +369,10 @@
return res
}
})
- this.itemdetail.code = val[0].label;
+ if (val.length > 0 && val[0].label) {
+ this.itemdetail.code = val[0].label;
+ }
+
// if (row.code.indexOf("countSizes") != -1) {
// this.itemdetail.code = "鏁版嵁閲忕粺璁�";
// } else if (row.code.indexOf("countServices") != -1) {
@@ -452,7 +436,7 @@
break;
}
}
-
+ console.log(name)
if (name.indexOf('缁熻') > -1) {
this.typeOption = [{
label: "World妯℃澘",
@@ -484,12 +468,38 @@
handleEdit(index, row) {
this.behavior = "淇敼";
this.editForm = row;
+
+ if (row.name.indexOf('缁熻') > -1) {
+ this.typeOption = [{
+ label: "World妯℃澘",
+ value: "1"
+ }, {
+ label: "Excel妯℃澘",
+ value: "2"
+ }]
+
+ } else {
+ this.typeOption = [{
+ label: "World妯℃澘",
+ value: "1"
+ }, {
+ label: "Excel妯℃澘",
+ value: "2"
+ }, {
+ label: "Zip妯℃澘",
+ value: "3"
+ }]
+ }
if (parseInt(row.type) == 1) {
this.selectFileType = ".docx";
} else if (parseInt(row.type) == 2) {
this.selectFileType = ".xlsx";
}
this.rowGuid = row.guid;
+
+
+
+
this.dialogVisible = true;
},
//鍒犻櫎
@@ -552,6 +562,7 @@
},
//鏂板涓�鏉℃暟鎹�
async addInsertData() {
+ this.editForm.guid = this.rowGuid;
const data = await report_insert(this.editForm);
if (data.code != 200) {
return this.$message.error("鏂板澶辫触");
@@ -578,10 +589,24 @@
},
//鏂囦欢涓婁紶
async geteditFile(res) {
+
+ if (parseInt(this.editForm.type) == 1) {
+ this.selectFileType = ".docx";
+ } else if (parseInt(this.editForm.type) == 2) {
+ this.selectFileType = ".xlsx";
+ }
+ this.$nextTick(() => {
+ this.setEditFile(res)
+ })
+
+ },
+ async setEditFile(res) {
if (res == 0) {
if (this.editForm.type == "") {
return this.$message("璇烽�夋嫨涓婁紶鏂囦欢绫诲瀷");
}
+
+
$("#editFile").click();
} else if (res == 1) {
@@ -597,7 +622,7 @@
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: "涓婁紶鎴愬姛锛�",
@@ -641,7 +666,7 @@
},
editFormStart() {
- this.editForm.code = "countSizes";
+ this.editForm.code = "dataTable";
var name;
for (var i in this.options) {
if (this.options[i].value == this.editForm.code) {
@@ -713,6 +738,7 @@
},
};
</script>
+
<style lang="less" scoped>
//@import url(); 寮曞叆鍏叡css绫�
.authorityManagement_box {
@@ -779,4 +805,3 @@
}
}
</style>
-
--
Gitblit v1.9.3