From 40860ef4a79da4d4f8ffce369011c1a2450fa3c1 Mon Sep 17 00:00:00 2001
From: surprise <15810472099@163.com>
Date: 星期三, 29 十一月 2023 16:51:26 +0800
Subject: [PATCH] 表格添加字段排序功能
---
src/views/datamanage/metadataManage.vue | 900 +++++++++++-----------------------------
src/views/datamanage/uploadmanage.vue | 13
src/views/maintenance/tokentool.vue | 21
src/views/maintenance/userManagement.vue | 20
src/views/userManage/authorityManage.vue | 9
src/views/datamanage/styleManage.vue | 9
src/api/api.js | 4
src/views/AuthorizationManagement/menuRoleAuthorization.vue | 3
src/views/datamanage/dictionaryManage.vue | 44 +
src/views/maintenance/blackwhiteList.vue | 32
src/views/maintenance/downlog.vue | 8
src/views/userManage/resourceManage.vue | 3
src/views/userManage/roleManage.vue | 7
src/views/maintenance/logLog.vue | 12
src/views/maintenance/eventlogManage.vue | 8
src/views/AuthorizationManagement/userRoleAuthorization.vue | 3
src/views/AuthorizationManagement/roleResAuthorization.vue | 3
src/views/userManage/templateManage.vue | 5
src/views/AuthorizationManagement/roleMenuAuthorization.vue | 6
src/views/datamanage/resourceManagement.vue | 123 ++++-
src/views/datamanage/dataUpdata.vue | 17
src/views/datamanage/SpatialData.vue | 1
src/views/maintenance/parameterConfiguration.vue | 16
src/views/datamanage/versionManage.vue | 9
src/views/maintenance/colorTableManage.vue | 12
src/views/maintenance/operationLog.vue | 20
src/views/datamanage/domainManage.vue | 8
27 files changed, 566 insertions(+), 750 deletions(-)
diff --git a/src/api/api.js b/src/api/api.js
index 9250460..5fabd1b 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -94,6 +94,10 @@
//璇锋眰鍦板潃
return request.get('/meta/selectDepsByCodes?' + params);
}
+//淇℃伅绠＄悊=>鏍规嵁GUID鏌ヨGDB
+export function meta_selectGdbByGuid(params) {
+ return request.get('/meta/selectGdbByGuid', { params: params });
+}
//缁勭粐鏈烘瀯鏍规嵁id鏌ヨ
export function selectDep(params) {
diff --git a/src/views/AuthorizationManagement/menuRoleAuthorization.vue b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
index 7a1e129..53a9161 100644
--- a/src/views/AuthorizationManagement/menuRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/menuRoleAuthorization.vue
@@ -106,10 +106,11 @@
align="center"
type="index"
:label="$t('dataManage.styleObj.index')"
- width="55"
+ width="70"
/>
<el-table-column
prop="authName"
+ sortable
:label="$t('operatManage.UserRoleAuthorizationObj.name')"
>
</el-table-column>
diff --git a/src/views/AuthorizationManagement/roleMenuAuthorization.vue b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
index 1a96645..1919abd 100644
--- a/src/views/AuthorizationManagement/roleMenuAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleMenuAuthorization.vue
@@ -52,7 +52,7 @@
>
<el-table-column
align="center"
- width="55"
+ width="70"
>
<template slot-scope="scope">
<el-radio
@@ -66,9 +66,11 @@
align="center"
type="index"
:label="$t('dataManage.styleObj.index')"
+ width="70"
/>
<el-table-column
prop="name"
+ sortable
:label="$t('operatManage.UserRoleAuthorizationObj.name')"
>
</el-table-column>
@@ -162,10 +164,12 @@
<el-table-column
align="center"
type="index"
+ width="70"
:label="$t('dataManage.styleObj.index')"
/>
<el-table-column
prop="name"
+ sortable
:label="$t('operatManage.UserRoleAuthorizationObj.name')"
>
</el-table-column>
diff --git a/src/views/AuthorizationManagement/roleResAuthorization.vue b/src/views/AuthorizationManagement/roleResAuthorization.vue
index 2321670..577f342 100644
--- a/src/views/AuthorizationManagement/roleResAuthorization.vue
+++ b/src/views/AuthorizationManagement/roleResAuthorization.vue
@@ -59,10 +59,13 @@
<el-table-column
align="center"
type="index"
+ width="70"
+
:label="$t('dataManage.styleObj.index')"
/>
<el-table-column
prop="name"
+ sortable
:label="$t('operatManage.UserRoleAuthorizationObj.name')"
>
</el-table-column>
diff --git a/src/views/AuthorizationManagement/userRoleAuthorization.vue b/src/views/AuthorizationManagement/userRoleAuthorization.vue
index 0a7cd8d..b784931 100644
--- a/src/views/AuthorizationManagement/userRoleAuthorization.vue
+++ b/src/views/AuthorizationManagement/userRoleAuthorization.vue
@@ -75,6 +75,7 @@
/>
<el-table-column
prop="name"
+ sortable
:label="$t('operatManage.UserRoleAuthorizationObj.name')"
>
</el-table-column>
@@ -146,9 +147,11 @@
align="center"
type="index"
:label="$t('dataManage.styleObj.index')"
+ width="70"
/>
<el-table-column
prop="uname"
+ sortable
:label="$t('operatManage.UserRoleAuthorizationObj.name')"
>
</el-table-column>
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 5a23046..3808436 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -135,6 +135,7 @@
<!-- :label="item.alias"-->
<el-table-column
min-width="135"
+ sortable
v-for="(item, index) in attributeData"
:key="index"
:label="$i18n.locale == 'zh' ? item.alias : item.field"
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 9d9f354..95126c0 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -391,13 +391,16 @@
<el-table-column
align="center"
type="index"
+
:label="$t('common.index')"
width="70px"
+
></el-table-column>
<el-table-column
align="center"
:label="$t('common.name')"
- width="120"
+
+ width="100"
>
<template slot-scope="scope">
<span v-if="scope.row.ismeta > 0">
@@ -426,32 +429,38 @@
prop="dirName"
:label="$t('dataManage.dataUpObj.catalogue')"
width="300"
+ sortable
/>
<el-table-column
align="center"
prop="depName"
:label="$t('dataManage.dataUpObj.company')"
width="200"
+ sortable
/>
<el-table-column
align="center"
prop="verName"
+ sortable
:label="$t('dataManage.dataUpObj.versionNo')"
/>
<el-table-column
align="center"
prop="type"
:label="$t('common.type')"
+ sortable
/>
<el-table-column
align="center"
prop="sizes"
:label="$t('common.size')"
+ sortable
:formatter="changeSizeFile"
/>
<el-table-column
align="center"
:label="$t('dataManage.dataUpObj.tableName')"
+
>
<template slot-scope="scope">
<a
@@ -464,11 +473,13 @@
align="center"
prop="rows"
:label="$t('common.lineNuber')"
+ sortable
/>
<el-table-column
align="center"
:label="$t('common.dataStatus')"
:formatter="stateFormat"
+
>
</el-table-column>
@@ -481,14 +492,16 @@
<el-table-column
align="center"
prop="uname"
+ sortable
:label="$t('dataManage.vmobj.createonuser')"
/>
<el-table-column
align="center"
prop="createTime"
:label="$t('dataManage.vmobj.createontime')"
+ sortable
:formatter="changetimeFile"
- width="100"
+ width="160"
/>
</el-table>
<div
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index acf6914..5430606 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -105,10 +105,11 @@
>
<el-table
:data="tableData"
- style="width: 100%"
+
border
@selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
+ height="calc(100% - 87px)"
+ style="width: 100%"
>
<el-table-column
type="selection"
@@ -124,33 +125,39 @@
:label="$t('dataManage.dictionaryManageObj.number')"
/> -->
<el-table-column
- min-width="100"
+ min-width="130"
prop="field"
+ sortable
:label="$t('dataManage.dictionaryManageObj.fieldName')"
/>
<el-table-column
- min-width="120"
+ min-width="170"
prop="alias"
+ sortable
:label="$t('dataManage.dictionaryManageObj.fieldAliasName')"
/>
<el-table-column
- min-width="100"
+ min-width="130"
prop="type"
+ sortable
:label="$t('dataManage.dictionaryManageObj.fieldType')"
/>
<el-table-column
- min-width="80"
+ min-width="120"
prop="len"
+ sortable
:label="$t('dataManage.dictionaryManageObj.fieldLength')"
/>
<el-table-column
- min-width="80"
+ min-width="120"
prop="precision"
+ sortable
:label="$t('dataManage.dictionaryManageObj.FieldPrecision')"
/>
<el-table-column
- min-width="100"
+ min-width="120"
prop="tab"
+ sortable
:label="
$t('dataManage.dictionaryManageObj.tableName')
"
@@ -158,30 +165,33 @@
<el-table-column
min-width="100"
prop="bak"
+ sortable
:label="$t('dataManage.dictionaryManageObj.remark')"
/>
<el-table-column
- min-width="100"
+ min-width="130"
prop="createTime"
+ sortable
:label="$t('dataManage.dictionaryManageObj.creationTime')"
:formatter="formatData"
/>
- <el-table-column
+ <!-- <el-table-column
min-width="100"
prop="createName"
:label="$t('dataManage.dictionaryManageObj.createPersonnel')"
- />
+ /> -->
<el-table-column
- min-width="100"
+ min-width="130"
prop="updateTime"
+ sortable
:label="$t('dataManage.dictionaryManageObj.updateTime')"
:formatter="formatData"
/>
- <el-table-column
+ <!-- <el-table-column
min-width="100"
prop="updateName"
:label="$t('dataManage.dictionaryManageObj.updatePersonnel')"
- />
+ /> -->
<el-table-column
min-width="180"
@@ -884,7 +894,7 @@
width: 98%;
padding: 0.5%;
.dictionary_leftTree {
- width: calc(23% - 0px);
+ width: calc(20% - 0px);
height: 100%;
padding: 10px;
border-radius: 5px;
@@ -930,7 +940,7 @@
display: flex;
justify-content: space-around;
.leftTree {
- width: calc(23% - 0px);
+ width: calc(20% - 0px);
height: 100%;
padding: 10px;
border-radius: 5px;
@@ -938,7 +948,7 @@
overflow-y: auto;
}
.right {
- width: 75%;
+ width: 78%;
height: 100%;
border-radius: 5px;
padding: 0 10px;
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index 611f62a..82fdf0a 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -100,26 +100,31 @@
align="center"
type="index"
:label="$t('dataManage.domainManage.index')"
+
width="70px"
/>
<el-table-column
align="center"
prop="domName"
+ sortable
:label="$t('dataManage.domainManage.domName')"
/>
<el-table-column
align="center"
prop="domDesc"
+ sortable
:label="$t('dataManage.domainManage.domDesc')"
/>
<el-table-column
align="center"
prop="domCode"
+ sortable
:label="$t('dataManage.domainManage.domCode')"
/>
<el-table-column
align="center"
prop="codeDesc"
+ sortable
:label="$t('dataManage.domainManage.codeDesc')"
/>
<!-- <el-table-column
@@ -130,16 +135,19 @@
<el-table-column
align="center"
prop="level"
+ sortable
:label="$t('dataManage.domainManage.level')"
/>
<el-table-column
align="center"
prop="orderid"
+ sortable
:label="$t('dataManage.domainManage.orderid')"
/>
<el-table-column
align="center"
prop="bak"
+ sortable
:label="$t('dataManage.domainManage.bak')"
/>
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 76dacfb..49457b5 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -1,39 +1,19 @@
<template>
<div class="authorityManagement_box">
<My-bread :list="[
- `${$t('dataManage.dataManage')}`,
- `${$t('dataManage.metadataManage')}`,
- ]"></My-bread>
+ `${$t('dataManage.dataManage')}`,
+ `${$t('dataManage.metadataManage')}`,
+ ]"></My-bread>
<el-divider />
- <div
- class="inquire subpage_Div"
- ref="container"
- >
- <el-form
- ref="queryForm"
- :model="queryForm"
- :inline="true"
- >
+ <div class="inquire subpage_Div" ref="container">
+ <el-form ref="queryForm" :model="queryForm" :inline="true">
<div class="flex_box">
<div style="margin-right: auto">
<el-form-item size="small">
- <el-select
- :popper-append-to-body="false"
- v-model="queryForm.depName"
- ref="treeSelect"
- >
- <el-option
- :value="queryForm.depid"
- :label="queryForm.depName"
- style="height: auto"
- >
- <el-tree
- ref="tree"
- :data="companyOption1"
- node-key="id"
- :props="cascader"
- @node-click="handleChange1"
- />
+ <el-select :popper-append-to-body="false" v-model="queryForm.depName" ref="treeSelect">
+ <el-option :value="queryForm.depid" :label="queryForm.depName" style="height: auto">
+ <el-tree ref="tree" :data="companyOption1" node-key="id" :props="cascader"
+ @node-click="handleChange1" />
</el-option>
</el-select>
<!-- <el-cascader
@@ -51,23 +31,9 @@
></el-cascader> -->
</el-form-item>
<el-form-item size="small">
- <el-select
- :popper-append-to-body="false"
- v-model="queryForm.dirName"
- ref="treeSelect1"
- >
- <el-option
- :value="queryForm.dirid"
- :label="queryForm.dirName"
- style="height: auto"
- >
- <el-tree
- ref="tree"
- :data="companyOption"
- node-key="id"
- :props="cascader"
- @node-click="handleChange"
- />
+ <el-select :popper-append-to-body="false" v-model="queryForm.dirName" ref="treeSelect1">
+ <el-option :value="queryForm.dirid" :label="queryForm.dirName" style="height: auto">
+ <el-tree ref="tree" :data="companyOption" node-key="id" :props="cascader" @node-click="handleChange" />
</el-option>
</el-select>
<!-- <el-cascader
@@ -85,36 +51,16 @@
></el-cascader> -->
</el-form-item>
<el-form-item size="small">
- <el-select
- :popper-append-to-body="false"
- v-model="queryForm.verid"
- placeholder="璇烽�夋嫨"
- @change="verHandleChange($event)"
- >
- <el-option
- v-for="item in verOptions"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-select :popper-append-to-body="false" v-model="queryForm.verid" placeholder="璇烽�夋嫨"
+ @change="verHandleChange($event)">
+ <el-option v-for="item in verOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
- <el-form-item
- prop="name"
- size="small"
- >
+ <el-form-item prop="name" size="small">
<!-- suffix-icon="el-icon-edit" :placeholder="$t('common.pleaseInput')"-->
- <el-input
- v-model="queryForm.name"
- :placeholder="$t('shuJuGuanLi.lable2')"
- style="width: 200px"
- ><i
- slot="suffix"
- class="el-icon-search"
- @click="queryInfo()"
- style="padding-right: 8px"
- ></i></el-input>
+ <el-input v-model="queryForm.name" :placeholder="$t('shuJuGuanLi.lable2')" style="width: 200px"><i
+ slot="suffix" class="el-icon-search" @click="queryInfo()" style="padding-right: 8px"></i></el-input>
</el-form-item>
</div>
<div>
@@ -129,31 +75,19 @@
>
</el-form-item>-->
<el-form-item v-if="btnStatus.delete">
- <el-button
- type="danger"
- size="small"
- @click="deleteMetaInfo"
- icon="el-icon-delete"
- >{{ $t("common.delete") }}
+ <el-button type="danger" size="small" @click="deleteMetaInfo" icon="el-icon-delete">{{ $t("common.delete")
+ }}
</el-button>
</el-form-item>
<el-form-item v-if="btnStatus.download">
- <el-button
- @click="downFormData"
- icon="el-icon-download"
- type="success"
- size="small"
- >{{ $t("common.download") }}
+ <el-button @click="downFormData" icon="el-icon-download" type="success" size="small">{{
+ $t("common.download") }}
</el-button>
</el-form-item>
<el-form-item>
- <el-button
- @click="resetInfo('queryForm')"
- icon="el-icon-refresh"
- type="info"
- size="small"
- >{{ $t("common.reset") }}
+ <el-button @click="resetInfo('queryForm')" icon="el-icon-refresh" type="info" size="small">{{
+ $t("common.reset") }}
</el-button>
</el-form-item>
</div>
@@ -204,78 +138,48 @@
</el-form>
</div>
<div class="dividing-line"></div>
- <div
- class="table_box subpage_Div"
- :style="styleVar"
- >
- <el-table
- :data="tableData"
- style="width: 100%"
- border
- @selection-change="handleSelectionChange"
- height="calc(100% - 57px)"
- >
- <el-table-column
- type="selection"
- width="55"
- />
- <el-table-column
- :label="$t('dataManage.dictionaryManageObj.number')"
- type="index"
- width="50"
- >
+ <div class="table_box subpage_Div" :style="styleVar">
+ <el-table :data="tableData" style="width: 100%" border @selection-change="handleSelectionChange"
+ height="calc(100% - 57px)">
+ <el-table-column type="selection" width="55" />
+ <el-table-column :label="$t('dataManage.dictionaryManageObj.number')" type="index" width="75">
</el-table-column>
<el-table-column :label="$t('dataManage.vmobj.name')">
<template slot-scope="scope">
<span v-if="scope.row.ismeta > 0">
- <el-link
- style="color: #409eff"
- title="婧愭暟鎹煡璇�"
- @click="setQueryMetaData(scope.row)"
- target="_blank"
- >{{ scope.row.name }}</el-link>
+ <el-link style="color: #409eff" title="婧愭暟鎹煡璇�" @click="setQueryMetaData(scope.row)" target="_blank">{{
+ scope.row.name }}</el-link>
</span>
<span v-else-if="scope.row.metaid > 0">
- <el-link
- style="color: #409eff"
- title="鍏冩暟鎹煡璇�"
- @click="setMetaDataQuery(scope.row)"
- target="_blank"
- >{{ scope.row.name }}</el-link></span>
+ <el-link style="color: #409eff" title="鍏冩暟鎹煡璇�" @click="setMetaDataQuery(scope.row)" target="_blank">{{
+ scope.row.name }}</el-link></span>
<span v-else>{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="type"
- :label="$t('dataManage.vmobj.format')"
- />
- <el-table-column
- prop="sizes"
- :label="$t('dataManage.vmobj.size')"
- :formatter="stateFormatSizes"
- />
- <el-table-column
- prop="depName"
- :label="$t('dataManage.vmobj.depName')"
- />
- <el-table-column
- prop="dirName"
- :label="$t('dataManage.vmobj.dirName')"
- width="200"
- />
- <el-table-column
- prop="verName"
- :label="$t('dataManage.vmobj.versionNumber')"
- />
+ <el-table-column prop="type" :label="$t('dataManage.vmobj.format')" sortable>
+ <template slot-scope="scope">
+ <span v-if="scope.row.type == 'gdb'">
+ <el-link @click="setSelectGdbByGuid(scope.row)" style="color: #409eff">
+ {{ scope.row.type }}
+ </el-link>
+ </span>
+ <span v-else>
+
+ {{ scope.row.type }}
+ </span>
+ </template>
+
+ </el-table-column>
+ <el-table-column prop="sizes" :label="$t('dataManage.vmobj.size')" :formatter="stateFormatSizes" sortable />
+ <el-table-column prop="depName" :label="$t('dataManage.vmobj.depName')" sortable />
+ <el-table-column prop="dirName" :label="$t('dataManage.vmobj.dirName')" width="200" sortable />
+ <el-table-column prop="verName" :label="$t('dataManage.vmobj.versionNumber')" sortable />
<el-table-column :label="$t('dataManage.dataUpObj.tableName')">
<template slot-scope="scope">
<!-- <span ></span> -->
<el-link></el-link>
- <el-link
- :underline="false"
- @click="detail(scope.row)"
- >{{
+ <el-link :underline="false" style="color: #409eff" @click="detail(scope.row)">{{
scope.row.tab
}}</el-link>
</template>
@@ -286,96 +190,43 @@
:label="$t('dataManage.vmobj.tab')"
:formatter="formatData"
/> -->
- <el-table-column
- prop="rows"
- :label="$t('dataManage.vmobj.row')"
- />
+ <el-table-column sortable prop="rows" :label="$t('dataManage.vmobj.row')" />
- <el-table-column
- :label="$t('common.dataStatus')"
- :formatter="stateFormat"
- >
+ <el-table-column :label="$t('common.dataStatus')" :formatter="stateFormat">
</el-table-column>
- <el-table-column
- prop="uname"
- :label="$t('dataManage.vmobj.createonuser')"
- />
- <el-table-column
- prop="createTime"
- :label="$t('dataManage.vmobj.createontime')"
- :formatter="formatData"
- />
- <el-table-column
- min-width="210"
- :label="$t('common.operate')"
- >
+ <el-table-column sortable prop="uname" :label="$t('dataManage.vmobj.createonuser')" />
+ <el-table-column sortable prop="createTime" :label="$t('dataManage.vmobj.createontime')" :formatter="formatData" />
+ <el-table-column min-width="210" :label="$t('common.operate')">
<template slot-scope="scope">
- <el-button
- @click="showDetail(scope.row)"
- type="primary"
- plain
- size="small"
- >{{ $t("common.details") }}
+ <el-button @click="showDetail(scope.row)" type="primary" plain size="small">{{ $t("common.details") }}
</el-button>
- <el-button
- type="warning"
- plain
- size="small"
- v-if="btnStatus.update"
- @click="editInfo(scope.row)"
- style="margin-left: 10px"
- >{{ $t("common.edit") }}
+ <el-button type="warning" plain size="small" v-if="btnStatus.update" @click="editInfo(scope.row)"
+ style="margin-left: 10px">{{ $t("common.edit") }}
</el-button>
- <el-button
- plain
- size="small"
- v-if="showPreview(scope.row)"
- @click="handlePreview(scope.row)"
- style="margin-left: 10px"
- >{{ $t("common.preview") }}
+ <el-button plain size="small" v-if="showPreview(scope.row)" @click="handlePreview(scope.row)"
+ style="margin-left: 10px">{{ $t("common.preview") }}
</el-button>
</template>
</el-table-column>
</el-table>
- <div
- class="pagination_box"
- style="margin-top: 15px"
- >
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 50, 100, 200]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
- >
+ <div class="pagination_box" style="margin-top: 15px">
+ <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="count">
</el-pagination>
</div>
</div>
- <div
- class="infoBox_box"
- v-show="showinfoBox"
- >
+ <div class="infoBox_box" v-show="showinfoBox" style="z-index:99999">
<div class="infoBox box_div">
- <div
- slot="header"
- class="clearfix"
- >
+ <div slot="header" class="clearfix">
<span>{{ $t("common.details") }}</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>
<el-divider></el-divider>
- <div
- class="contentBox"
- style="padding: 1%"
- >
+ <div class="contentBox" style="padding: 1%">
<p>{{ $t("dataManage.vmobj.name") }}锛歿{ itemdetail.name }}</p>
<el-divider></el-divider>
<p>{{ $t("dataManage.vmobj.format") }}锛歿{ itemdetail.type }}</p>
@@ -417,69 +268,24 @@
</div>
</div>
- <el-dialog
- width="80vh"
- top="5vh"
- :title="
- behavior == '鏂板鐢ㄦ埛'
+ <el-dialog width="80vh" top="5vh" :title="behavior == '鏂板鐢ㄦ埛'
? `${$t('common.append')}`
: `${$t('common.update')}`
- "
- :visible.sync="dialogFormVisible"
- :before-close="handleClose"
- >
- <el-form
- :model="editForm"
- ref="editForm"
- >
- <el-form-item
- :label="$t('dataManage.vmobj.name')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="editForm.name"
- autocomplete="off"
- ></el-input>
+ " :visible.sync="dialogFormVisible" :before-close="handleClose">
+ <el-form :model="editForm" ref="editForm">
+ <el-form-item :label="$t('dataManage.vmobj.name')" :label-width="formLabelWidth">
+ <el-input v-model="editForm.name" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.format')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="editForm.type"
- autocomplete="off"
- ></el-input>
+ <el-form-item :label="$t('dataManage.vmobj.format')" :label-width="formLabelWidth">
+ <el-input v-model="editForm.type" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.size')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="editForm.sizes"
- autocomplete="off"
- ></el-input>
+ <el-form-item :label="$t('dataManage.vmobj.size')" :label-width="formLabelWidth">
+ <el-input v-model="editForm.sizes" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.depName')"
- :label-width="formLabelWidth"
- >
- <el-select
- style="width: 100%"
- :popper-append-to-body="false"
- v-model="editForm.depName"
- >
- <el-option
- :value="editForm.depid"
- :label="editForm.depName"
- style="height: auto"
- >
- <el-tree
- ref="tree"
- :data="companyOption1"
- node-key="id"
- :props="cascader"
- @node-click="handleChange2"
- />
+ <el-form-item :label="$t('dataManage.vmobj.depName')" :label-width="formLabelWidth">
+ <el-select style="width: 100%" :popper-append-to-body="false" v-model="editForm.depName">
+ <el-option :value="editForm.depid" :label="editForm.depName" style="height: auto">
+ <el-tree ref="tree" :data="companyOption1" node-key="id" :props="cascader" @node-click="handleChange2" />
</el-option>
</el-select>
<!-- <el-cascader
@@ -489,27 +295,10 @@
style="width:350px"
></el-cascader> -->
</el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.dirName')"
- :label-width="formLabelWidth"
- >
- <el-select
- style="width: 100%"
- :popper-append-to-body="false"
- v-model="editForm.dirName"
- >
- <el-option
- :value="editForm.dirid"
- :label="editForm.dirName"
- style="height: auto"
- >
- <el-tree
- ref="tree"
- :data="dirComPanyOption"
- node-key="id"
- :props="cascader"
- @node-click="handleChange3"
- />
+ <el-form-item :label="$t('dataManage.vmobj.dirName')" :label-width="formLabelWidth">
+ <el-select style="width: 100%" :popper-append-to-body="false" v-model="editForm.dirName">
+ <el-option :value="editForm.dirid" :label="editForm.dirName" style="height: auto">
+ <el-tree ref="tree" :data="dirComPanyOption" node-key="id" :props="cascader" @node-click="handleChange3" />
</el-option>
</el-select>
<!-- <el-cascader
@@ -519,14 +308,8 @@
style="width:350px"
></el-cascader> -->
</el-form-item>
- <el-form-item
- :label="$t('dataManage.vmobj.describe')"
- :label-width="formLabelWidth"
- >
- <el-input
- v-model="editForm.describe"
- autocomplete="off"
- ></el-input>
+ <el-form-item :label="$t('dataManage.vmobj.describe')" :label-width="formLabelWidth">
+ <el-input v-model="editForm.describe" autocomplete="off"></el-input>
</el-form-item>
<!-- <el-form-item
:label="$t('dataManage.vmobj.gather')"
@@ -535,382 +318,131 @@
<el-input v-model="editForm.gather" autocomplete="off"></el-input>
</el-form-item> -->
</el-form>
- <div
- v-if="behavior == '淇敼淇℃伅'"
- slot="footer"
- class="dialog-footer"
- >
- <el-button
- size="small"
- @click="cancelEdit()"
- >{{ $t("common.reset") }}
+ <div v-if="behavior == '淇敼淇℃伅'" slot="footer" class="dialog-footer">
+ <el-button size="small" @click="cancelEdit()">{{ $t("common.reset") }}
</el-button>
- <el-button
- size="small"
- type="primary"
- @click="sendEdit('editForm')"
- v-loading.fullscreen.lock="fullscreenLoading"
- >{{ $t("common.submit") }}
+ <el-button size="small" type="primary" @click="sendEdit('editForm')"
+ v-loading.fullscreen.lock="fullscreenLoading">{{ $t("common.submit") }}
</el-button>
</div>
- <div
- v-else
- slot="footer"
- class="dialog-footer"
- >
- <el-button
- size="small"
- @click="cancelAdd('editForm')"
- >{{ $t("common.reset") }}
+ <div v-else slot="footer" class="dialog-footer">
+ <el-button size="small" @click="cancelAdd('editForm')">{{ $t("common.reset") }}
</el-button>
- <el-button
- size="small"
- type="primary"
- @click="sendAdd('editForm')"
- v-loading.fullscreen.lock="fullscreenLoading"
- >{{ $t("common.submit") }}
+ <el-button size="small" type="primary" @click="sendAdd('editForm')"
+ v-loading.fullscreen.lock="fullscreenLoading">{{ $t("common.submit") }}
</el-button>
</div>
</el-dialog>
- <el-dialog
- :title="$t('common.details')"
- :visible.sync="dialogVisible"
- width="70%"
- >
+ <el-dialog :title="$t('common.details')" :visible.sync="dialogVisible" width="70%">
<div style="height: 600px">
- <el-table
- ref="filterTable"
- :data="dbTableData"
- height="90%"
- border
- style="width: 100%"
- >
- <el-table-column
- width="60"
- align="center"
- type="index"
- :label="$t('common.index')"
- />
- <el-table-column
- v-for="(item, index) in attributeData"
- :key="index"
- :label="item.alias"
- :prop="item.field"
- show-overflow-tooltip
- align="center"
- ></el-table-column>
+ <el-table ref="filterTable" :data="dbTableData" height="90%" border style="width: 100%">
+ <el-table-column width="60" align="center" type="index" :label="$t('common.index')" />
+ <el-table-column v-for="(item, index) in attributeData" :key="index" :label="item.alias" :prop="item.field"
+ show-overflow-tooltip align="center"></el-table-column>
</el-table>
- <div
- style="margin-top: 10px"
- class="pagination_box"
- >
- <el-pagination
- @size-change="handleLoaderSizeChange"
- @current-change="handleLoaderCurrentChange"
- :current-page="listLoader.pageIndex"
- :page-sizes="[10, 50, 100, 200]"
- :page-size="listLoader.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count1"
- >
+ <div style="margin-top: 10px" class="pagination_box">
+ <el-pagination @size-change="handleLoaderSizeChange" @current-change="handleLoaderCurrentChange"
+ :current-page="listLoader.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listLoader.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="count1">
</el-pagination>
</div>
</div>
</el-dialog>
- <div
- class="downloadBox box_div subpage_Div"
- v-if="showCodeBox"
- >
+ <div class="downloadBox box_div subpage_Div" v-if="showCodeBox">
<h4 style="padding: 20px">{{ $t("common.passworld") }}</h4>
- <el-form
- :model="codeForm"
- :rules="rules"
- ref="codeForm"
- label-width="100px"
- class="codeForm"
- >
- <el-form-item
- :label="$t('common.passworld')"
- prop="password"
- >
- <el-input
- type="password"
- v-model="codeForm.password"
- show-password
- ></el-input>
+ <el-form :model="codeForm" :rules="rules" ref="codeForm" label-width="100px" class="codeForm">
+ <el-form-item :label="$t('common.passworld')" prop="password">
+ <el-input type="password" v-model="codeForm.password" show-password></el-input>
</el-form-item>
- <el-form-item
- :label="$t('common.SPassword')"
- prop="repassword"
- >
- <el-input
- type="password"
- v-model="codeForm.repassword"
- show-password
- ></el-input>
+ <el-form-item :label="$t('common.SPassword')" prop="repassword">
+ <el-input type="password" v-model="codeForm.repassword" show-password></el-input>
</el-form-item>
<el-form-item>
- <el-button
- class="primary"
- size="small"
- @click="download('codeForm')"
- >{{ $t("common.confirm") }}
+ <el-button class="primary" size="small" @click="download('codeForm')">{{ $t("common.confirm") }}
</el-button>
- <el-button
- type="info"
- size="small"
- @click="closeDown('codeForm')"
- >{{ $t("common.cancel") }}
+ <el-button type="info" size="small" @click="closeDown('codeForm')">{{ $t("common.cancel") }}
</el-button>
</el-form-item>
</el-form>
</div>
- <el-dialog
- :title="fromQueryMeta.title"
- :visible.sync="queryMetaFlag"
- width="70%"
- >
+ <el-dialog :title="fromQueryMeta.title" :visible.sync="queryMetaFlag" width="70%">
<div style="height: 65vh; width: 100%">
- <el-form
- :inline="true"
- :model="fromQueryMeta"
- class="demo-form-inline"
- >
+ <el-form :inline="true" :model="fromQueryMeta" class="demo-form-inline">
<el-form-item>
- <el-input
- size="small"
- v-model="fromQueryMeta.name"
- ></el-input>
+ <el-input size="small" v-model="fromQueryMeta.name"></el-input>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- size="small"
- @click="setSearchMetaData()"
- >鏌ヨ
+ <el-button type="primary" size="small" @click="setSearchMetaData()">鏌ヨ
</el-button>
- <el-button
- type="info"
- size="small"
- @click="setRestMetaData()"
- >閲嶇疆
+ <el-button type="info" size="small" @click="setRestMetaData()">閲嶇疆
</el-button>
</el-form-item>
</el-form>
- <el-table
- ref="filterTable"
- :data="metaDataTable"
- style="width: 100%"
- height="calc(100% - 100px)"
- >
- <el-table-column
- align="center"
- type="index"
- :label="$t('common.index')"
- width="70px"
- ></el-table-column>
- <el-table-column
- align="center"
- prop="name"
- :label="$t('common.name')"
- width="120"
- >
+ <el-table ref="filterTable" :data="metaDataTable" style="width: 100%" height="calc(100% - 100px)">
+ <el-table-column align="center" type="index" :label="$t('common.index')" width="70px"></el-table-column>
+ <el-table-column align="center" prop="name" :label="$t('common.name')" width="120">
</el-table-column>
- <el-table-column
- align="center"
- prop="dirName"
- :label="$t('dataManage.dataUpObj.catalogue')"
- width="300"
- />
- <el-table-column
- align="center"
- prop="depName"
- :label="$t('dataManage.dataUpObj.company')"
- width="200"
- />
- <el-table-column
- align="center"
- prop="verName"
- :label="$t('dataManage.dataUpObj.versionNo')"
- />
- <el-table-column
- align="center"
- prop="type"
- :label="$t('common.type')"
- />
- <el-table-column
- align="center"
- prop="sizes"
- :label="$t('common.size')"
- :formatter="changeSizeFile"
- />
- <el-table-column
- align="center"
- :label="$t('dataManage.dataUpObj.tableName')"
- >
+ <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" />
+ <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" />
+ <el-table-column align="center" prop="verName" :label="$t('dataManage.dataUpObj.versionNo')" />
+ <el-table-column align="center" prop="type" :label="$t('common.type')" />
+ <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" />
+ <el-table-column align="center" :label="$t('dataManage.dataUpObj.tableName')">
<template slot-scope="scope">
- <a
- class="scopeRowColor"
- @click="detail(scope.row)"
- >{{
+ <a class="scopeRowColor" @click="detail(scope.row)">{{
scope.row.tab
}}</a>
</template>
</el-table-column>
- <el-table-column
- align="center"
- prop="rows"
- :label="$t('common.lineNuber')"
- />
- <el-table-column
- align="center"
- prop="desc"
- :label="$t('dataManage.dataUpObj.describe')"
- />
+ <el-table-column align="center" prop="rows" :label="$t('common.lineNuber')" />
+ <el-table-column align="center" prop="desc" :label="$t('dataManage.dataUpObj.describe')" />
</el-table>
- <div
- class="pagination_box"
- style="margin-top: 15px"
- >
- <el-pagination
- @size-change="handleMetaSizeChange"
- @current-change="handMetaCurrentChange"
- :current-page="listMetaData.pageIndex"
- :page-sizes="[10, 50, 100, 200]"
- :page-size="listMetaData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="listMetaData.count"
- >
+ <div class="pagination_box" style="margin-top: 15px">
+ <el-pagination @size-change="handleMetaSizeChange" @current-change="handMetaCurrentChange"
+ :current-page="listMetaData.pageIndex" :page-sizes="[10, 50, 100, 200]" :page-size="listMetaData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="listMetaData.count">
</el-pagination>
</div>
</div>
</el-dialog>
- <el-dialog
- :title="fromQueryMeta.title"
- :visible.sync="queryMetaFlag1"
- width="70%"
- >
+ <el-dialog :title="fromQueryMeta.title" :visible.sync="queryMetaFlag1" width="70%">
<div style="height: 65vh; width: 100%">
- <el-table
- ref="filterTable"
- :data="metaDataTable1"
- style="width: 100%"
- height="100%"
- >
- <el-table-column
- align="center"
- type="index"
- :label="$t('common.index')"
- width="70px"
- ></el-table-column>
- <el-table-column
- align="center"
- prop="name"
- :label="$t('common.name')"
- width="120"
- >
+ <el-table ref="filterTable" :data="metaDataTable1" style="width: 100%" height="100%">
+ <el-table-column align="center" type="index" :label="$t('common.index')" width="70px"></el-table-column>
+ <el-table-column align="center" prop="name" :label="$t('common.name')" width="120">
</el-table-column>
- <el-table-column
- align="center"
- prop="dirName"
- :label="$t('dataManage.dataUpObj.catalogue')"
- width="300"
- />
- <el-table-column
- align="center"
- prop="depName"
- :label="$t('dataManage.dataUpObj.company')"
- width="200"
- />
- <el-table-column
- align="center"
- prop="verName"
- :label="$t('dataManage.dataUpObj.versionNo')"
- />
- <el-table-column
- align="center"
- prop="type"
- :label="$t('common.type')"
- />
- <el-table-column
- align="center"
- prop="sizes"
- :label="$t('common.size')"
- :formatter="changeSizeFile"
- />
- <el-table-column
- align="center"
- :label="$t('dataManage.dataUpObj.tableName')"
- >
+ <el-table-column align="center" prop="dirName" :label="$t('dataManage.dataUpObj.catalogue')" width="300" />
+ <el-table-column align="center" prop="depName" :label="$t('dataManage.dataUpObj.company')" width="200" />
+ <el-table-column align="center" prop="verName" :label="$t('dataManage.dataUpObj.versionNo')" />
+ <el-table-column align="center" prop="type" :label="$t('common.type')" />
+ <el-table-column align="center" prop="sizes" :label="$t('common.size')" :formatter="changeSizeFile" />
+ <el-table-column align="center" :label="$t('dataManage.dataUpObj.tableName')">
<template slot-scope="scope">
- <a
- class="scopeRowColor"
- @click="detail(scope.row)"
- >{{
+ <a class="scopeRowColor" @click="detail(scope.row)">{{
scope.row.tab
}}</a>
</template>
</el-table-column>
- <el-table-column
- align="center"
- prop="rows"
- :label="$t('common.lineNuber')"
- />
- <el-table-column
- align="center"
- prop="desc"
- :label="$t('dataManage.dataUpObj.describe')"
- />
+ <el-table-column align="center" prop="rows" :label="$t('common.lineNuber')" />
+ <el-table-column align="center" prop="desc" :label="$t('dataManage.dataUpObj.describe')" />
</el-table>
</div>
</el-dialog>
- <el-dialog
- custom-class="preview-dialog"
- title="棰勮"
- :append-to-body="false"
- :visible.sync="dialog.dialogVisible"
- width="70%"
- :close-on-click-modal="false"
- >
- <div
- v-if="dialog.isPdf"
- class="pdfClass"
- >
- <iframe
- :src="dialog.src"
- type="application/x-google-chrome-pdf"
- width="100%"
- height="100%"
- >
+ <el-dialog custom-class="preview-dialog" title="棰勮" :append-to-body="false" :visible.sync="dialog.dialogVisible"
+ width="70%" :close-on-click-modal="false">
+ <div v-if="dialog.isPdf" class="pdfClass">
+ <iframe :src="dialog.src" type="application/x-google-chrome-pdf" width="100%" height="100%">
</iframe>
</div>
- <div
- v-if="dialog.isJpg"
- class="pdfClass"
- >
- <el-image
- style="width: 100%; height: 100%"
- :src="dialog.src"
- :preview-src-list="[dialog.src]"
- >
+ <div v-if="dialog.isJpg" class="pdfClass">
+ <el-image style="width: 100%; height: 100%" :src="dialog.src" :preview-src-list="[dialog.src]">
</el-image>
</div>
</el-dialog>
- <el-dialog
- title="鏁版嵁鐢宠"
- :visible.sync="dialogInsertFile"
- width="30%"
- top="10vh"
- :modal="false"
- :close-on-click-modal="false"
- :show-close="false"
- >
- <el-form
- ref="form"
- :model="fileFrom"
- label-width="100px"
- >
+ <el-dialog title="鏁版嵁鐢宠" :visible.sync="dialogInsertFile" width="30%" top="10vh" :modal="false"
+ :close-on-click-modal="false" :show-close="false">
+ <el-form ref="form" :model="fileFrom" label-width="100px">
<el-form-item label="瀹℃牳鍗曚綅">
<div>
<ul>
@@ -922,34 +454,76 @@
</el-form-item>
<el-form-item label="鎻忚堪">
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="fileFrom.descr"
- maxlength="50"
- show-word-limit
- >
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="fileFrom.descr" maxlength="50" show-word-limit>
</el-input>
</el-form-item>
<el-form-item>
- <el-button
- class="primary"
- size="small"
- @click="getFileInsertApply()"
- >{{ $t("common.confirm") }}</el-button>
- <el-button
- type="info"
- size="small"
- @click="handleInsertFileClose()"
- >{{ $t("common.cancel") }}</el-button>
+ <el-button class="primary" size="small" @click="getFileInsertApply()">{{ $t("common.confirm") }}</el-button>
+ <el-button type="info" size="small" @click="handleInsertFileClose()">{{ $t("common.cancel") }}</el-button>
</el-form-item>
</el-form>
</el-dialog>
- <iframe
- id="downFrame"
- src=""
- style="display: none; border: 0; padding: 0; height: 0; width: 0"
- ></iframe>
+ <el-dialog title="" :visible.sync="gdbDialog" width="80%" top="8vh" :modal="false" :close-on-click-modal="false">
+ <div class="gdbTableBox">
+ <el-table :data="gdbData" style="width: 100%" max-height="38.54167vw">
+ <el-table-column type="selection" width="55" />
+ <el-table-column :label="$t('dataManage.dictionaryManageObj.number')" type="index" width="50">
+ </el-table-column>
+ <el-table-column :label="$t('dataManage.vmobj.name')">
+ <template slot-scope="scope">
+ <span v-if="scope.row.ismeta > 0">
+ <el-link style="color: #409eff" title="婧愭暟鎹煡璇�" @click="setQueryMetaData(scope.row)" target="_blank">{{
+ scope.row.name }}</el-link>
+ </span>
+ <span v-else-if="scope.row.metaid > 0">
+ <el-link style="color: #409eff" title="鍏冩暟鎹煡璇�" @click="setMetaDataQuery(scope.row)" target="_blank">{{
+ scope.row.name }}</el-link></span>
+ <span v-else>{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="type" :label="$t('dataManage.vmobj.format')">
+
+ </el-table-column>
+
+ <el-table-column prop="sizes" :label="$t('dataManage.vmobj.size')" :formatter="stateFormatSizes" />
+ <el-table-column prop="depName" :label="$t('dataManage.vmobj.depName')" />
+ <el-table-column prop="dirName" :label="$t('dataManage.vmobj.dirName')" width="200" />
+ <el-table-column prop="verName" :label="$t('dataManage.vmobj.versionNumber')" />
+ <el-table-column :label="$t('dataManage.dataUpObj.tableName')">
+ <template slot-scope="scope">
+
+ <el-link></el-link>
+ <el-link :underline="false" @click="detail(scope.row)">{{
+ scope.row.tab
+ }}</el-link>
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="rows" :label="$t('dataManage.vmobj.row')" />
+
+ <el-table-column :label="$t('common.dataStatus')" :formatter="stateFormat">
+
+ </el-table-column>
+ <el-table-column prop="uname" :label="$t('dataManage.vmobj.createonuser')" />
+ <el-table-column prop="createTime" :label="$t('dataManage.vmobj.createontime')" :formatter="formatData" />
+ <el-table-column min-width="210" :label="$t('common.operate')">
+ <template slot-scope="scope">
+ <el-button @click="showDetail(scope.row)" type="primary" plain size="small">{{ $t("common.details") }}
+ </el-button>
+ <el-button type="warning" plain size="small" v-if="btnStatus.update" @click="editInfo(scope.row)"
+ style="margin-left: 10px">{{ $t("common.edit") }}
+ </el-button>
+ <el-button plain size="small" v-if="showPreview(scope.row)" @click="handlePreview(scope.row)"
+ style="margin-left: 10px">{{ $t("common.preview") }}
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ </el-dialog>
+ <iframe id="downFrame" src="" style="display: none; border: 0; padding: 0; height: 0; width: 0"></iframe>
</div>
</template>
@@ -975,6 +549,7 @@
meta_selectMetaOverflowDep,
meta_selectDepsByCodes,
apply_insertApply,
+ meta_selectGdbByGuid
} from "../../api/api";
import MyBread from "../../components/MyBread.vue";
@@ -1115,6 +690,10 @@
pwd: null,
depcodes: null,
},
+ gdbData: [],
+ gdbDialog: false,
+ gdbGuid: null,
+ loadDialogVisible: false
};
},
created() {
@@ -1144,6 +723,31 @@
},
},
methods: {
+
+ //gdb 鐐瑰嚮浜嬩欢
+ setSelectGdbByGuid(row) {
+ this.gdbGuid = row.guid
+ this.getSelectGdbByGuid();
+ },
+ async getSelectGdbByGuid() {
+ if (!this.gdbGuid) return
+ const data = await meta_selectGdbByGuid({ guid: this.gdbGuid })
+ if (data.code != 200) {
+ return this.$message.error("鏍规嵁GUID鏌ヨGDB鏁版嵁澶辫触");
+ }
+ if (data.count <= 0) {
+ return this.$message("鏌ユ棤鏇村鏁版嵁");
+ }
+ this.gdbData = data.result;
+ this.gdbDialog = true;
+
+ },
+
+
+
+
+
+
stateFormat(row, column) {
var val = ['shp', 'gdb', 'xls', 'xlsx']
if (val.indexOf(row.type) > -1 && row.rows > 0) {
@@ -1895,6 +1499,7 @@
border-radius: 10px;
}
+
.preview-dialog {
.pdfClass {
height: 70vh;
@@ -1902,6 +1507,7 @@
position: relative;
}
}
+
.el-divider--horizontal {
margin: 15px 0;
}
diff --git a/src/views/datamanage/resourceManagement.vue b/src/views/datamanage/resourceManagement.vue
index 77bf1dc..9b38b0f 100644
--- a/src/views/datamanage/resourceManagement.vue
+++ b/src/views/datamanage/resourceManagement.vue
@@ -63,40 +63,42 @@
@selection-change="handleSelectionChange" @cell-dblclick="copyText">
<el-table-column type="selection" width="55" />
<el-table-column align="center" type="index" :label="$t('dataManage.styleObj.index')" width="100" />
- <el-table-column align="center" prop="cnName" :label="$t('dataManage.layerObj.resourceName')" width="150" />
+ <el-table-column sortable align="center" prop="cnName" :label="$t('dataManage.layerObj.resourceName')" />
<!-- <el-table-column
align="center"
prop="enName"
:label="$t('dataManage.layerObj.englishName')"
width="170"
/> -->
- <el-table-column align="center" prop="status" :label="$t('dataManage.layerObj.status')"
- :formatter="setResStatus" width="150" />
- <el-table-column align="center" prop="category" :label="$t('dataManage.layerObj.firm')"
- :formatter="setResCategory" width="150" />
- <el-table-column align="center" prop="type" :label="$t('dataManage.layerObj.serviceType')"
- :formatter="setResType" width="150" />
- <el-table-column align="center" prop="data" :label="$t('dataManage.layerObj.dataType')" :formatter="setResData"
- width="150" />
- <el-table-column align="center" prop="tab" :label="$t('dataManage.layerObj.tableName')" width="150" />
- <el-table-column align="center" prop="url" :label="$t('dataManage.layerObj.serviceAddress')" width="300" />
- <el-table-column align="center" prop="args" :label="$t('dataManage.layerObj.serviceParameters')" width="220" />
- <el-table-column align="center" prop="test" :label="$t('dataManage.layerObj.testAddress')" width="300" />
- <el-table-column align="center" prop="proxy" :label="$t('dataManage.layerObj.proxyAddress')" width="300"
+ <!-- <el-table-column align="center" prop="status" :label="$t('dataManage.layerObj.status')"
+ :formatter="setResStatus" width="150" /> -->
+ <!-- <el-table-column align="center" prop="category" :label="$t('dataManage.layerObj.firm')"
+ :formatter="setResCategory" width="150" /> -->
+ <el-table-column sortable align="center" prop="type" :label="$t('dataManage.layerObj.serviceType')"
+ :formatter="setResType" />
+ <el-table-column sortable align="center" prop="data" :label="$t('dataManage.layerObj.dataType')"
+ :formatter="setResData" />
+ <!-- <el-table-column align="center" prop="tab" :label="$t('dataManage.layerObj.tableName')" width="150" /> -->
+ <el-table-column sortable align="center" prop="url" :label="$t('dataManage.layerObj.serviceAddress')" />
+ <!-- <el-table-column align="center" prop="args" :label="$t('dataManage.layerObj.serviceParameters')" width="220" /> -->
+ <!-- <el-table-column align="center" prop="test" :label="$t('dataManage.layerObj.testAddress')" width="300" /> -->
+ <el-table-column sortable align="center" prop="proxy" :label="$t('dataManage.layerObj.proxyAddress')"
:formatter="formatProxy" />
- <el-table-column align="center" prop="descr" :label="$t('dataManage.layerObj.descr')" width="200" />
- <el-table-column align="center" prop="createName" :label="$t('dataManage.vmobj.createonuser')" width="200" />
- <el-table-column align="center" prop="createTime" :label="$t('dataManage.vmobj.createontime')" width="200"
+ <!-- <el-table-column align="center" prop="descr" :label="$t('dataManage.layerObj.descr')" width="200" /> -->
+ <!-- <el-table-column align="center" prop="createName" :label="$t('dataManage.vmobj.createonuser')" width="200" /> -->
+ <el-table-column sortable align="center" prop="createTime" :label="$t('dataManage.vmobj.createontime')"
:formatter="formatData" />
- <el-table-column align="center" prop="updateName" :label="$t('dataManage.vmobj.updateonuser')" width="200" />
- <el-table-column align="center" prop="updateTime" :label="$t('dataManage.vmobj.updateontime')" width="200"
+ <!-- <el-table-column align="center" prop="updateName" :label="$t('dataManage.vmobj.updateonuser')" width="200" /> -->
+ <el-table-column sortable align="center" prop="updateTime" :label="$t('dataManage.vmobj.updateontime')"
:formatter="formatData" />
- <el-table-column align="center" prop="bak" :label="$t('common.bak')" width="200" />
- <el-table-column :label="$t('common.operate')" width="200">
+ <!-- <el-table-column align="center" prop="bak" :label="$t('common.bak')" width="200" /> -->
+ <el-table-column :label="$t('common.operate')" width="300">
<template slot-scope="scope">
- <el-button @click="setScopeEdit(scope.row)" size="small" type="warning" plain>{{ $t('common.update')
+ <el-button @click="setScopeSee(scope.row)" size="mini" type="primary" plain>{{ $t('common.see')
}}</el-button>
- <el-button size="small" v-show="scope.row.status != 0" plain @click="setScopePreview(scope.row)">{{
+ <el-button @click="setScopeEdit(scope.row)" size="mini" type="warning" plain>{{ $t('common.update')
+ }}</el-button>
+ <el-button size="mini" v-show="scope.row.status != 0" plain @click="setScopePreview(scope.row)">{{
$t('common.preview') }}</el-button>
</template>
@@ -254,7 +256,60 @@
</span>
</div>
</el-dialog>
+ <el-dialog title=" " :visible.sync="seeDialog" width="30%" :before-close="handleSeeClose">
+ <div style="width: 100%;max-height: 63vh;overflow-y: auto;color:white">
+ <el-form :model="seeData" class="demo-form-inline" label-width="120px">
+ <el-form-item :label="$t('dataManage.layerObj.resourceName')">
+ {{ seeData.cnName }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.englishName')">
+ {{ seeData.enName }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.status')">
+ {{ seeData.status }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.firm')">
+ {{ seeData.category }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.serviceType')">
+ {{ seeData.type }}
+ </el-form-item>
+
+ <el-form-item :label="$t('dataManage.layerObj.dataType')">
+ {{ seeData.data }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.tableName')">
+ {{ seeData.tab }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.serviceParameters')">
+ {{ seeData.args }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.testAddress')">
+ {{ seeData.test }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.proxyAddress')">
+ {{ seeData.proxy }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.layerObj.descr')">
+ {{ seeData.descr }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.vmobj.createonuser')">
+ {{ seeData.createName }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.vmobj.createontime')">
+ {{ seeData.createTime }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.vmobj.updateonuser')">
+ {{ seeData.updateName }}
+ </el-form-item>
+ <el-form-item :label="$t('dataManage.vmobj.updateontime')">
+ {{ seeData.updateTime }}
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </el-dialog>
<!-- 鍦板潃棰勮 -->
<el-dialog :title="$t('common.preview')" :class="isFullscreen ? '' : 'dialogClass_his'"
custom-class="handleDialogClass" width="73.4%" :fullscreen="isFullscreen" v-if="prevDialog"
@@ -327,6 +382,8 @@
data: null
},
editDialog: false,
+ seeDialog: false,
+ seeData: {},
insertDialog: false,
dataType: [],
dataTypes: [],
@@ -569,8 +626,26 @@
}
this.dataTypes = std;
},
+ handleSeeClose() {
+ this.seeDialog = false
+ this.seeData = {};
+ },
+
+ setScopeSee(row) {
+ this.seeDialog = true;
+ this.seeData = JSON.parse(JSON.stringify(row));
+ this.seeData.status = this.setResStatus(this.seeData)
+ this.seeData.category = this.setResCategory(this.seeData)
+ this.seeData.data = this.setResData(this.seeData)
+ this.seeData.type = this.setResType(this.seeData)
+ this.seeData.proxy = this.formatProxy(this.seeData)
+ this.seeData.createTime = this.seeData.createTime ? this.format(this.seeData.createTime) : null;
+
+ this.seeData.updateTime = this.seeData.updateTime ? this.format(this.seeData.updateTime) : null;
+ },
+
setScopeEdit(row) {
-
+
this.copyData = JSON.parse(JSON.stringify(row));
this.editData = JSON.parse(JSON.stringify(row));
this.editData.status = this.editData.status.toString()
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 9738a2e..8c04238 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -99,47 +99,56 @@
<el-table-column
align="center"
prop="id"
+ sortable
v-if="false"
/>
<el-table-column
align="center"
prop="name"
+ sortable
:label="$t('dataManage.styleObj.name')"
/>
<el-table-column
align="center"
prop="type"
+ sortable
:label="$t('dataManage.styleObj.type')"
/>
<el-table-column
align="center"
prop="dirName"
+ sortable
:label="$t('dataManage.styleObj.dirid')"
/>
<el-table-column
align="center"
prop="depName"
+ sortable
:label="$t('dataManage.styleObj.depid')"
/>
<el-table-column
align="center"
prop="ver"
+ sortable
:label="$t('dataManage.styleObj.ver')"
/>
<el-table-column
align="center"
prop="status"
+ sortable
:label="$t('dataManage.styleObj.status')"
:formatter="formatStatus"
/>
<el-table-column
align="center"
prop="precision"
+ sortable
:label="$t('dataManage.styleObj.precision')"
/>
<el-table-column
align="center"
prop="descr"
+ sortable
:label="$t('dataManage.styleObj.descr')"
/>
<!-- <el-table-column
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index 3e4d287..405b7fc 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -173,7 +173,7 @@
<el-table-column
:label="$t('dataManage.dictionaryManageObj.number')"
type="index"
- width="50"
+ width="70"
align="center"
key="2"
>
@@ -182,12 +182,14 @@
prop="name"
:label="$t('dataManage.vmobj.name')"
align="center"
+ sortable
key="3"
/>
<el-table-column
prop="type"
:label="$t('dataManage.vmobj.format')"
align="center"
+ sortable
key="4"
/>
<el-table-column
@@ -195,6 +197,7 @@
prop="sizes"
:label="$t('dataManage.vmobj.size')"
:formatter="stateFormatSizes"
+ sortable
align="center"
key="5"
/>
@@ -204,18 +207,21 @@
:label="$t('dataManage.vmobj.dirName')"
width="200"
align="center"
+ sortable
key="7"
/>
<el-table-column
prop="verName"
:label="$t('dataManage.vmobj.versionNumber')"
align="center"
+ sortable
key="8"
/>
<el-table-column
prop="url"
:label="$t('common.publishAddress')"
align="center"
+ sortable
key="9"
/>
<el-table-column
@@ -223,6 +229,7 @@
prop="uname"
:label="$t('common.rublisher')"
align="center"
+ sortable
key="10"
/>
<el-table-column
@@ -230,18 +237,21 @@
prop="createName"
:label="$t('common.rublisher')"
align="center"
+ sortable
key="11"
/>
<el-table-column
prop="createTime"
:label="$t('common.releaseTime')"
align="center"
+ sortable
key="12"
/>
<el-table-column
v-if="active == 'first'"
prop="createTime"
:label="$t('common.publishStatus')"
+ sortable
align="center"
key="13"
>
@@ -259,6 +269,7 @@
<el-button
v-if="active == 'second'"
size="small"
+
type="info"
plain
@click="setPreviewDetails(scope.row)"
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index 6c3b264..20b6503 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -97,10 +97,12 @@
style="width: 100%"
border
height="calc(100% - 57px)"
+
>
<el-table-column
align="center"
type="index"
+
:label="$t('dataManage.vmobj.index')"
width="70px"
/>
@@ -108,37 +110,44 @@
<el-table-column
align="center"
prop="name"
+ sortable
:label="$t('common.versionName')"
/>
<el-table-column
align="center"
prop="depName"
+ sortable
:label="$t('dataManage.vmobj.catalogue')"
/>
<el-table-column
align="center"
prop="descr"
+ sortable
:label="$t('dataManage.vmobj.describe')"
/>
<el-table-column
align="center"
prop="createName"
+ sortable
:label="$t('dataManage.vmobj.createonuser')"
/>
<el-table-column
align="center"
prop="createTime"
+ sortable
:label="$t('dataManage.vmobj.createontime')"
:formatter="formatTime"
/>
<el-table-column
align="center"
prop="UpdateUser"
+ sortable
:label="$t('dataManage.vmobj.updateonuser')"
/>
<el-table-column
align="center"
prop="updateTime"
+ sortable
:label="$t('dataManage.vmobj.updateontime')"
:formatter="formatTime"
/>
diff --git a/src/views/maintenance/blackwhiteList.vue b/src/views/maintenance/blackwhiteList.vue
index ad59b43..fe6c461 100644
--- a/src/views/maintenance/blackwhiteList.vue
+++ b/src/views/maintenance/blackwhiteList.vue
@@ -115,33 +115,33 @@
width="70px"
/>
<el-table-column
- prop="ip"
+ prop="ip" sortable
:label="$t('operatManage.BWL.blackListIP')"
/>
<el-table-column
- prop="visit"
+ prop="visit" sortable
:label="$t('operatManage.BWL.PageView')"
/>
<el-table-column
- prop="descr"
+ prop="descr" sortable
:label="$t('operatManage.BWL.description')"
/>
<el-table-column
- prop="createName"
+ prop="createName" sortable
:label="$t('operatManage.BWL.creator')"
/>
<el-table-column
:formatter="formatData"
- prop="createTime"
+ prop="createTime" sortable
:label="$t('operatManage.BWL.creationTime')"
/>
<el-table-column
- prop="updateName"
+ prop="updateName" sortable
:label="$t('operatManage.BWL.update')"
/>
<el-table-column
:formatter="formatData"
- prop="updateTime"
+ prop="updateTime" sortable
:label="$t('operatManage.BWL.UpdateTime')"
/>
<el-table-column
@@ -279,37 +279,37 @@
width="70px"
/>
<el-table-column
- prop="ip"
+ prop="ip" sortable
:label="$t('operatManage.BWL.whiteListIP')"
/>
<el-table-column
- prop="visit"
+ prop="visit" sortable
:label="$t('operatManage.BWL.PageView')"
/>
<el-table-column
- prop="descr"
+ prop="descr" sortable
:label="$t('operatManage.BWL.description')"
/>
- <el-table-column
- prop="createName"
+ <el-table-column
+ prop="createName" sortable
:label="$t('operatManage.BWL.creator')"
/>
<el-table-column
:formatter="formatData"
- prop="createTime"
+ prop="createTime" sortable
:label="$t('operatManage.BWL.creationTime')"
/>
<el-table-column
- prop="updateName"
+ prop="updateName" sortable
:label="$t('operatManage.BWL.update')"
/>
<el-table-column
:formatter="formatData"
- prop="updateTime"
+ prop="updateTime" sortable
:label="$t('operatManage.BWL.UpdateTime')"
/>
<el-table-column
- v-if="menuStatus.update"
+ v-if="menuStatus.update"
:label="$t('operatManage.tokentoolObj.operation')"
width="120"
align="center"
diff --git a/src/views/maintenance/colorTableManage.vue b/src/views/maintenance/colorTableManage.vue
index 55ddbef..6e7ee78 100644
--- a/src/views/maintenance/colorTableManage.vue
+++ b/src/views/maintenance/colorTableManage.vue
@@ -89,38 +89,45 @@
<el-table-column
align="center"
prop="name"
+ sortable
:label="$t('dataManage.styleObj.name')"
/>
<el-table-column
align="center"
prop="type"
+ sortable
:label="$t('common.type')"
:formatter="formatType"
/>
<el-table-column
align="center"
prop="bak"
+ sortable
:label="$t('common.bak')"
/>
<el-table-column
align="center"
- prop="createUser"
+ prop="createName"
+ sortable
:label="$t('operatManage.BWL.creator')"
/>
<el-table-column
align="center"
prop="createTime"
+ sortable
:label="$t('operatManage.BWL.creationTime')"
:formatter="formatData"
/>
<el-table-column
align="center"
- prop="updateUser"
+ prop="updateName"
+ sortable
:label="$t('operatManage.BWL.update')"
/>
<el-table-column
align="center"
prop="updateTime"
+ sortable
:label="$t('operatManage.BWL.UpdateTime')"
:formatter="formatData"
/>
@@ -1018,6 +1025,7 @@
async setSearchTable() {
const data = await colortab_selectByPageAndCount(this.listData)
if (data.code != 200) return;
+
this.tableData = data.result;
this.listData.count = data.count;
},
diff --git a/src/views/maintenance/downlog.vue b/src/views/maintenance/downlog.vue
index 9dfea30..20a8dd0 100644
--- a/src/views/maintenance/downlog.vue
+++ b/src/views/maintenance/downlog.vue
@@ -123,7 +123,7 @@
:data="tableData"
style="width: 100%"
border
- height="calc(100% - 45px)"
+ height="calc(100% - 65px)"
>
<el-table-column
align="center"
@@ -134,34 +134,40 @@
<el-table-column
align="center"
prop="name"
+ sortable
:label="$t('operatManage.ELM.fileName')"
/>
<el-table-column
align="center"
prop="uname"
+ sortable
:label="$t('operatManage.ELM.username')"
/>
<el-table-column
align="center"
prop="type"
+ sortable
:label="$t('operatManage.ELM.type')"
:formatter="formatType"
/>
<el-table-column
align="center"
prop="sizes"
+ sortable
:label="$t('operatManage.ELM.size')"
:formatter="formatSize"
/>
<el-table-column
align="center"
prop="ip"
+ sortable
:label="$t('operatManage.ELM.ipadress')"
/>
<el-table-column
align="center"
prop="createTime"
+ sortable
:label="$t('operatManage.ELM.careatetime')"
:formatter="formatData"
/>
diff --git a/src/views/maintenance/eventlogManage.vue b/src/views/maintenance/eventlogManage.vue
index b5dab3d..17baa79 100644
--- a/src/views/maintenance/eventlogManage.vue
+++ b/src/views/maintenance/eventlogManage.vue
@@ -120,40 +120,46 @@
:data="tableData"
style="width: 100%"
border
- height="calc(100% - 45px)"
+ height="calc(100% - 65px)"
>
<el-table-column
align="center"
type="index"
:label="$t('operatManage.ELM.index')"
height="calc(100% - 57px)"
+ width="70"
/>
<el-table-column
align="center"
prop="uname"
+ sortable
:label="$t('operatManage.ELM.username')"
/>
<el-table-column
align="center"
prop="ip"
+ sortable
:label="$t('operatManage.ELM.ip')"
/>
<el-table-column
align="center"
prop="resid"
+ sortable
:label="$t('operatManage.ELM.resourceName')"
/>
<el-table-column
:formatter="formatData"
align="center"
prop="optime"
+ sortable
:label="$t('operatManage.ELM.date')"
/>
<el-table-column
:formatter="formatType"
align="center"
prop="type"
+ sortable
:label="$t('operatManage.ELM.operationType')"
/>
</el-table>
diff --git a/src/views/maintenance/logLog.vue b/src/views/maintenance/logLog.vue
index c2e20e9..b38d044 100644
--- a/src/views/maintenance/logLog.vue
+++ b/src/views/maintenance/logLog.vue
@@ -92,33 +92,37 @@
<div class="dividing-line"></div>
<!-- 琛ㄦ牸鏄剧ず -->
<div class="table_box subpage_Div" :style="styleVar">
- <el-table :data="tableData" style="width: 100%" height="calc(100% - 45px)" border>
+ <el-table :data="tableData" style="width: 100%" height="calc(100% - 65px)" border>
<el-table-column
width="150"
type="index"
:label="$t('loglog.serialnumber')"
/>
- <el-table-column prop="uname" :label="$t('loglog.username')" />
+ <el-table-column sortable prop="uname" :label="$t('loglog.username')" />
<el-table-column
prop="appid"
+ sortable
:label="$t('loglog.applicationProgram')"
:formatter="formatAppid"
/>
- <el-table-column prop="ip" :label="$t('loglog.ipadress')" />
- <el-table-column prop="descr" :label="$t('loglog.describe')" />
+ <el-table-column sortable prop="ip" :label="$t('loglog.ipadress')" />
+ <el-table-column sortable prop="descr" :label="$t('loglog.describe')" />
<el-table-column
prop="optime"
:formatter="formatData"
+ sortable
:label="$t('loglog.operationtime')"
/>
<el-table-column
prop="type"
:formatter="formatType"
+ sortable
:label="$t('loglog.operationtype')"
/>
<el-table-column
prop="status"
:formatter="formatStatus"
+ sortable
:label="$t('loglog.operationStatus')"
/>
</el-table>
diff --git a/src/views/maintenance/operationLog.vue b/src/views/maintenance/operationLog.vue
index 2f0923b..e059d6b 100644
--- a/src/views/maintenance/operationLog.vue
+++ b/src/views/maintenance/operationLog.vue
@@ -121,7 +121,7 @@
:data="tableData"
style="width: 100%"
border
- height="calc(100% - 45px)"
+ height="calc(100% - 65px)"
>
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column
@@ -132,44 +132,44 @@
</el-table-column>
<!-- <el-table-column prop="Accessnumber" label="璁块棶缂栧彿" /> -->
<el-table-column
- prop="modular1"
+ prop="modular1" sortable
:label="$t('operatManage.operationLogObj.operationModule1')"
/>
<el-table-column
- prop="modular2"
+ prop="modular2" sortable
:label="$t('operatManage.operationLogObj.operationModule2')"
/>
<el-table-column
- prop="url"
+ prop="url" sortable
:label="$t('operatManage.operationLogObj.url')"
/>
<!-- <el-table-column prop="loginaddress" label="鐧诲綍鍦扮偣" /> -->
<el-table-column
- prop="clazz"
+ prop="clazz" sortable
:label="$t('operatManage.operationLogObj.className')"
/>
<el-table-column
:formatter="formatType"
- prop="type"
+ prop="type" sortable
:label="$t('operatManage.operationLogObj.operationType')"
/>
<el-table-column
- prop="uname"
+ prop="uname" sortable
:label="$t('operatManage.operationLogObj.username')"
/>
<el-table-column
- prop="ip"
+ prop="ip" sortable
:label="$t('operatManage.operationLogObj.IP')"
/>
<el-table-column
- prop="optime"
+ prop="optime" sortable
:formatter="formatData"
:label="$t('operatManage.operationLogObj.operatingTime')"
/>
<el-table-column
- prop="bak"
+ prop="bak" sortable
:label="$t('operatManage.operationLogObj.bak')"
/>
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index b262369..adea496 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -14,7 +14,7 @@
:data="tableData"
style="width: 100%"
border
- height="calc(100% - 45px)"
+ height="calc(100% - 65px)"
>
<el-table-column
align="center"
@@ -24,37 +24,37 @@
/>
<el-table-column
prop="name"
- align="center"
+ align="center" sortable
:label="$t('operatManage.sysLayOutObj.name')"
/>
<el-table-column
prop="cvalue"
- align="center"
+ align="center" sortable
:label="$t('operatManage.sysLayOutObj.cvalue')"
/>
<el-table-column
prop="dvalue"
- align="center"
+ align="center" sortable
:label="$t('operatManage.sysLayOutObj.dvalue')"
/>
<el-table-column
prop="minValue"
- align="center"
+ align="center" sortable
:label="$t('operatManage.sysLayOutObj.minValue')"
/>
<el-table-column
prop="maxValue"
- align="center"
+ align="center" sortable
:label="$t('operatManage.sysLayOutObj.maxValue')"
/>
<el-table-column
prop="descr"
- align="center"
+ align="center" sortable
:label="$t('operatManage.sysLayOutObj.descr')"
/>
<el-table-column
v-if="menuStatus.update"
- fixed="right"
+
:label="$t('common.operate')"
width="100px"
>
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index 53dae53..3a941ff 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -104,7 +104,7 @@
:label="$t('operatManage.tokentoolObj.index')"
/>
<el-table-column
- prop="token"
+ prop="token" sortable
:label="$t('operatManage.tokentoolObj.token')"
>
<template slot-scope="scope">
@@ -120,15 +120,16 @@
<el-table-column
prop="duration"
width="120"
+ sortable
:label="$t('operatManage.tokentoolObj.duration')"
/>
<el-table-column
- prop="expire"
+ prop="expire" sortable
:label="$t('operatManage.tokentoolObj.expire')"
:formatter="formatTime"
/>
<el-table-column
- prop="type"
+ prop="type" sortable
:label="$t('operatManage.tokentoolObj.type')"
>
<template slot-scope="scope">
@@ -137,29 +138,29 @@
</template>
</el-table-column>
<el-table-column
- prop="ip"
+ prop="ip" sortable
:label="$t('operatManage.tokentoolObj.ip')"
/>
- <el-table-column
- prop="createName"
+ <el-table-column
+ prop="createName" sortable
:label="$t('operatManage.tokentoolObj.createUser')"
/>
<el-table-column
- prop="createTime"
+ prop="createTime" sortable
:label="$t('operatManage.tokentoolObj.createTime')"
:formatter="formatTime"
/>
<el-table-column
- prop="updateName"
+ prop="updateName" sortable
:label="$t('operatManage.tokentoolObj.updateUser')"
/>
<el-table-column
- prop="updateTime"
+ prop="updateTime" sortable
:label="$t('operatManage.tokentoolObj.updateTime')"
:formatter="formatTime"
/>
<el-table-column
- fixed="right"
+
:label="$t('operatManage.tokentoolObj.operation')"
width="220"
>
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index e202451..4e9e6bb 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -127,24 +127,29 @@
type="index"
:label="$t('common.index')"
width="70px"
+
/>
<el-table-column
align="center"
prop="uname"
width="150px"
+ sortable
:label="$t('userManage.userInfoObj.uname')"
/>
<el-table-column
align="center"
prop="uid"
width="150px"
+
+ sortable
:label="$t('userManage.userInfoObj.uid')"
/>
<el-table-column
align="center"
prop="sex"
- width="80px"
+ width="120px"
+ sortable
:label="$t('userManage.userInfoObj.sex')"
>
<template slot-scope="scope">
@@ -157,48 +162,57 @@
align="center"
prop="natives"
width="100px"
+ sortable
:label="$t('userManage.userInfoObj.natives')"
/>
<el-table-column
align="center"
prop="depName"
width="200px"
+ sortable
:label="$t('userManage.userInfoObj.depName')"
/>
<el-table-column
align="center"
prop="idcard"
+ sortable
:label="$t('userManage.userInfoObj.idcard')"
/>
<el-table-column
align="center"
prop="job"
+ sortable
:label="$t('userManage.userInfoObj.job')"
/>
<el-table-column
align="center"
prop="edu"
+ sortable
:label="$t('userManage.userInfoObj.edu')"
/>
<el-table-column
align="center"
prop="addr"
+ sortable
:label="$t('userManage.userInfoObj.addr')"
/>
<el-table-column
align="center"
prop="email"
+ sortable
:label="$t('userManage.userInfoObj.email')"
/>
<el-table-column
align="center"
prop="contact"
+ sortable
:label="$t('userManage.userInfoObj.contact')"
/>
<el-table-column
align="center"
prop="largeModuleName"
+ sortable
:label="$t('userManage.userInfoObj.status')"
>
<template slot-scope="scope">
@@ -246,7 +260,7 @@
</div>
<el-dialog
- width="910px"
+ width="50%"
:title="
behavior == '鏂板鐢ㄦ埛'
? `${$t('common.append')}`
@@ -256,7 +270,7 @@
:before-close="handleClose"
:close-on-click-modal="false"
>
- <div style="height: 500px; overflow: auto">
+ <div style="height: 50%; overflow: auto">
<el-form
:model="editForm"
ref="editForm"
diff --git a/src/views/userManage/authorityManage.vue b/src/views/userManage/authorityManage.vue
index dc88457..330479e 100644
--- a/src/views/userManage/authorityManage.vue
+++ b/src/views/userManage/authorityManage.vue
@@ -92,24 +92,28 @@
<el-table-column
prop="name"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.name')"
>
</el-table-column>
<el-table-column
prop="tag"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.tag')"
>
</el-table-column>
<el-table-column
prop="createName"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.createUser')"
>
</el-table-column>
<el-table-column
prop="createTime"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.createTime')"
:formatter="formatTime"
>
@@ -117,12 +121,14 @@
<el-table-column
prop="updateName"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.updateUser')"
>
</el-table-column>
<el-table-column
prop="updateTime"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.updateTime')"
:formatter="formatTime"
>
@@ -130,12 +136,13 @@
<el-table-column
prop="bak"
align="center"
+ sortable
:label="$t('userManage.userInfoObj.bak')"
>
</el-table-column>
<el-table-column
:label="$t('common.operate')"
- width="170px"
+ width="200px"
>
<template slot-scope="scope">
<el-button
diff --git a/src/views/userManage/resourceManage.vue b/src/views/userManage/resourceManage.vue
index b6e8e2a..99a5d67 100644
--- a/src/views/userManage/resourceManage.vue
+++ b/src/views/userManage/resourceManage.vue
@@ -91,18 +91,21 @@
<el-table-column
prop="name"
align="center"
+ sortable
:label="$t('userManage.resManageObj.name')"
>
</el-table-column>
<el-table-column
prop="server"
align="center"
+ sortable
:label="$t('userManage.resManageObj.server')"
>
</el-table-column>
<el-table-column
prop="source"
align="center"
+ sortable
:label="$t('userManage.resManageObj.source')"
>
</el-table-column>
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 794d299..59a1ce6 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -180,23 +180,27 @@
<el-table-column
align="center"
prop="id"
+ sortable
v-if="false"
/>
<el-table-column
align="center"
prop="name"
:label="$t('userManage.RM.roleName')"
+ sortable
/>
<el-table-column
align="center"
prop="depName"
+ sortable
:label="$t('userManage.RM.ownedSystem')"
/>
<el-table-column
align="center"
prop="isAdmin"
+ sortable
:label="$t('userManage.RM.isAdmin')"
>
<template slot-scope="scope">
@@ -207,6 +211,7 @@
<el-table-column
align="center"
prop="descr"
+ sortable
:label="$t('userManage.RM.describe')"
/>
@@ -238,7 +243,7 @@
:label="$t('userManage.RM.remarks')"
/> -->
<el-table-column
- fixed="right"
+
:label="$t('common.operate')"
width="200"
>
diff --git a/src/views/userManage/templateManage.vue b/src/views/userManage/templateManage.vue
index 6d92a34..0f7516b 100644
--- a/src/views/userManage/templateManage.vue
+++ b/src/views/userManage/templateManage.vue
@@ -97,11 +97,13 @@
<el-table-column
align="center"
prop="name"
+ sortable
:label="$t('dataManage.styleObj.name')"
/>
<el-table-column
align="center"
prop="type"
+ sortable
:label="$t('common.fileType')"
>
<template slot-scope="scope">
@@ -113,6 +115,7 @@
<el-table-column
align="center"
prop="code"
+ sortable
:label="$t('common.templateType')"
:formatter="codeData"
/>
@@ -129,11 +132,13 @@
<el-table-column
align="center"
prop="createName"
+ sortable
:label="$t('dataManage.vmobj.createonuser')"
/>
<el-table-column
align="center"
prop="createTime"
+ sortable
:label="$t('dataManage.vmobj.createontime')"
:formatter="formatData"
/>
--
Gitblit v1.9.3