From f25f3604f80ecb2fae3e2ef1fb95394cac4660f9 Mon Sep 17 00:00:00 2001
From: liupengpeng <276665548@qq.com>
Date: 星期二, 14 二月 2023 18:32:54 +0800
Subject: [PATCH] 所有页面只活动部分
---
src/views/maintenance/parameterConfiguration.vue | 11
src/views/maintenance/tokentool.vue | 14
src/views/maintenance/userManagement.vue | 25 -
src/views/datamanage/catalogueManage.vue | 2
src/views/datamanage/dataUpdata.vue | 23 +-
src/views/datamanage/styleManage.vue | 2
src/views/datamanage/SpatialData.vue | 438 +++++++++++++++++++++++++++--------------------
7 files changed, 286 insertions(+), 229 deletions(-)
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 2bf88f9..22717f8 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -22,8 +22,9 @@
></el-tree>
</div>
</div>
- <div class="spatial_rightContent subpage_Div">
- <el-form
+ <div style="width: 80%;">
+ <div>
+ <el-form
ref="ruleForm"
:model="ruleForm"
:inline="true"
@@ -77,14 +78,6 @@
</el-form-item> -->
<el-form-item style="float: right">
<el-button
- @click="resetForm"
- size="small"
- icon="el-icon-refresh"
- type="info"
- >{{$t('common.reset')}}</el-button>
- </el-form-item>
- <el-form-item style="float: right">
- <el-button
@click="getSpaceMapVisibale"
size="small"
type="primary"
@@ -110,13 +103,15 @@
>{{$t('common.append')}}</el-button>
</el-form-item>
</el-form>
- <el-divider class="eldivider" />
+ <!-- <el-divider class="eldivider" /> -->
+ </div>
+ <!-- <div class="spatial_rightContent subpage_Div">
<div>
<el-table
ref="filterTable"
:data="tableData"
border
- style="width: 100% "
+ style="width: 100%;max-height: 593px;overflow: auto;"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -171,7 +166,67 @@
</el-pagination>
</div>
</div>
+ </div> -->
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="99%"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ />
+ <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-column
+ min-width="120"
+ :label="$t('common.operate')"
+ >
+ <template slot-scope="scope">
+ <el-link
+ class="elLink"
+ @click="showDetail(scope.$index, scope.row)"
+ >{{$t('common.details')}}</el-link>
+ <el-link
+ class="elLink"
+ @click="getAttachTable(scope.$index, scope.row)"
+ style="margin-left: 20px; "
+ >{{$t('common.enclosure')}}</el-link>
+ </template>
+ </el-table-column>
+ </el-table>
+ <div
+ style="margin-top: 20px; "
+ class="pagination_box"
+ >
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
+ >
+ </el-pagination>
+ </div>
+ </div>
</div>
+
</div>
<div
class="infoBox box_div"
@@ -391,9 +446,9 @@
</template>
<script>
-import MapSdk from '../../components/mapsdk.vue'
-import $ from 'jquery';
-import { conditions } from '../Archive/Archive.js'
+import MapSdk from "../../components/mapsdk.vue";
+import $ from "jquery";
+import { conditions } from "../Archive/Archive.js";
import {
dataQuery_selectTabs,
dataQuery_selectDomains,
@@ -402,51 +457,61 @@
dataQuery_uploadFiles,
dataQuery_selectFiles,
dataQuery_deletes,
-} from '../../api/api';
+} from "../../api/api";
import { getToken } from "../../utils/auth.js";
-import catalogueTree from '../../components/catalogueTree.vue';
-import MyBread from '../../components/MyBread.vue';
+import catalogueTree from "../../components/catalogueTree.vue";
+import MyBread from "../../components/MyBread.vue";
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- name: 'dataSearch',
+ name: "dataSearch",
components: { MyBread, catalogueTree, MapSdk },
data() {
return {
- attachtable: ['b_pac_geologic_hazard', 'b_hydrogeology', 'b_pac_meteorological', 'b_pac_marine_meteorological', 'b_pac_frozensoil', 's_borehole', 'm_marker', 'm_hydraulic_protection', 'm_equipment_nameplate'],
+ attachtable: [
+ "b_pac_geologic_hazard",
+ "b_hydrogeology",
+ "b_pac_meteorological",
+ "b_pac_marine_meteorological",
+ "b_pac_frozensoil",
+ "s_borehole",
+ "m_marker",
+ "m_hydraulic_protection",
+ "m_equipment_nameplate",
+ ],
formInline: {
- file: '',
+ file: "",
},
formSql: {
- field: '',
- condition: '',
- value: '',
- type: '',
- date: '',
-
+ field: "",
+ condition: "",
+ value: "",
+ type: "",
+ date: "",
},
fromSqlflag: false,
tree: [
{
- tabDesc: '鍩虹鏁版嵁',
- label: '鍩虹鏁版嵁',
- value: 'BD',
- ns: 'bd',
+ tabDesc: "鍩虹鏁版嵁",
+ label: "鍩虹鏁版嵁",
+ value: "BD",
+ ns: "bd",
id: 1,
children: [],
},
{
id: 2,
- tabDesc: '涓氬姟鏁版嵁',
- label: '涓氬姟鏁版嵁',
- value: 'BS',
- ns: 'bs',
+ tabDesc: "涓氬姟鏁版嵁",
+ label: "涓氬姟鏁版嵁",
+ value: "BS",
+ ns: "bs",
children: [],
- }, {
+ },
+ {
id: 3,
- tabDesc: '鍏冩暟鎹�',
- label: '鍏冩暟鎹�',
- value: 'MD',
- ns: 'md',
+ tabDesc: "鍏冩暟鎹�",
+ label: "鍏冩暟鎹�",
+ value: "MD",
+ ns: "md",
children: [],
},
],
@@ -455,8 +520,8 @@
condOption: [],
defaultProps: {
- children: 'children',
- label: 'label',
+ children: "children",
+ label: "label",
},
btnStatus: {
select: false,
@@ -468,22 +533,22 @@
},
tableType: null,
ruleForm: {
- fileName: ''
+ fileName: "",
},
FBtest: false,
tableData: [],
- formLabelWidth: '120px',
+ formLabelWidth: "120px",
dialogFormVisible: false,
upform: {
- gid: '',
- pipename: '',
- sitename: '',
- type: '',
- seriesname: '',
- stationvalue: '',
- transportm: '',
- diameter: '',
- name: '',
+ gid: "",
+ pipename: "",
+ sitename: "",
+ type: "",
+ seriesname: "",
+ stationvalue: "",
+ transportm: "",
+ diameter: "",
+ name: "",
},
changePag: true,
@@ -492,7 +557,7 @@
attributeData: [],
currentPage: 1,
- searchName: '',
+ searchName: "",
multipleSelection: [],
filedsLayer: null,
count: 0,
@@ -512,8 +577,7 @@
tabName: null,
eventid: null,
},
- filterText: ''
-
+ filterText: "",
};
},
created() {
@@ -525,7 +589,7 @@
watch: {
filterText(val) {
this.$refs.tree.filter(val);
- }
+ },
},
methods: {
@@ -537,18 +601,17 @@
this.dialogMapVisible = true;
this.showMapVisible = true;
this.$store.state.mapMenuBoolean = true;
- this.$store.state.mapMenuBoxFlag = '1';
+ this.$store.state.mapMenuBoxFlag = "1";
this.$store.state.mapPopBoolean = false;
this.$store.state.mapPopBoxFlag = null;
this.$store.state.download = true;
-
},
handleMapClose() {
- this.$confirm('纭鍏抽棴锛�')
+ this.$confirm("纭鍏抽棴锛�")
.then((_) => {
this.closeMapDown();
})
- .catch((_) => { });
+ .catch((_) => {});
},
closeMapDown() {
this.dialogMapVisible = false;
@@ -566,7 +629,7 @@
}
const res = await dataQuery_deletes({ ids: std.toString() });
if (res.code != 200) {
- this.$message.error('鏂囦欢鍒犻櫎澶辫触');
+ this.$message.error("鏂囦欢鍒犻櫎澶辫触");
}
this.getAttacthFlieList();
},
@@ -574,69 +637,75 @@
var token = getToken();
var fs = document.getElementById("insertFile");
if (fs.files.length == 0) {
-
this.$message({
- message: '璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢锛�',
- type: 'warning'
+ message: "璇烽�夋嫨瑕佷笂浼犵殑鏂囦欢锛�",
+ type: "warning",
});
return;
}
- const formData = new FormData()
+ const formData = new FormData();
for (var i = 0, c = fs.files.length; i < c; i++) {
-
- formData.append('file', fs.files[i]); // fs.files[i].name,file
+ formData.append("file", fs.files[i]); // fs.files[i].name,file
}
- $.ajax(BASE_URL + "/dataQuery/uploadFiles?token=" + token + "&tabName= " + this.upAttach.tabName + "&eventid=" + this.upAttach.eventid, {
- type: "post",
- data: formData,
- async: true,
- cache: false,
- processData: false,
- contentType: false,
- success: (rs) => {
- this.$message({
- message: '闄勪欢娣诲姞鎴愬姛',
- type: 'success'
- });
- document.getElementById("insertFile").value = "";
- this.formInline = {
- file: '',
- }
- this.getAttacthFlieList();
- },
- error: (e) => {
- document.getElementById("insertFile").value = "";
- this.$message.error('闄勪欢娣诲姞澶辫触');
+ $.ajax(
+ BASE_URL +
+ "/dataQuery/uploadFiles?token=" +
+ token +
+ "&tabName= " +
+ this.upAttach.tabName +
+ "&eventid=" +
+ this.upAttach.eventid,
+ {
+ type: "post",
+ data: formData,
+ async: true,
+ cache: false,
+ processData: false,
+ contentType: false,
+ success: (rs) => {
+ this.$message({
+ message: "闄勪欢娣诲姞鎴愬姛",
+ type: "success",
+ });
+ document.getElementById("insertFile").value = "";
+ this.formInline = {
+ file: "",
+ };
+ this.getAttacthFlieList();
+ },
+ error: (e) => {
+ document.getElementById("insertFile").value = "";
+ this.$message.error("闄勪欢娣诲姞澶辫触");
+ },
}
- });
+ );
},
async getAttacthFlieList() {
- var obj = this.upAttach
+ var obj = this.upAttach;
const res = await dataQuery_selectFiles(obj);
if (res.code != 200) {
- this.$message.error('鍒楄〃璋冪敤澶辫触');
- return
+ this.$message.error("鍒楄〃璋冪敤澶辫触");
+ return;
}
this.tableAttach = res.result;
},
-
getAttachTable(index, row) {
if (row.eventid != null) {
this.upAttach.eventid = row.eventid;
} else {
- this.upAttach.eventid = '';
+ this.upAttach.eventid = "";
}
this.getAttacthFlieList();
this.dialogFormVisible = true;
},
//闄勪欢=>鏂囦欢閫夋嫨
getInsertFile() {
- $('#insertFile').click();
+ $("#insertFile").click();
},
insertFile() {
- var val = document.getElementById('insertFile').files;
+ var val = document.getElementById("insertFile").files;
if (!val || !val.length) return;
this.formInline.file = val[0].name;
@@ -645,16 +714,16 @@
async getTreeDataAll() {
const data = await dataQuery_selectTabs();
if (data.code != 200) {
- this.$message.error('鍒楄〃璋冪敤澶辫触');
+ this.$message.error("鍒楄〃璋冪敤澶辫触");
}
var option = data.result;
for (var i in option) {
var val_Data = option[i];
- val_Data.id = '1' + i;
+ val_Data.id = "1" + i;
// val_Data.label = val_Data.tabDesc + "(" + val_Data.tab + ")"
- val_Data.label = val_Data.tabDesc
- option[i].id = parseInt(option[i].id)
+ val_Data.label = val_Data.tabDesc;
+ option[i].id = parseInt(option[i].id);
for (var j in this.tree) {
if (this.tree[j].ns == option[i].ns) {
this.tree[j].children.push(val_Data);
@@ -667,7 +736,7 @@
// this.tree[1].children.push(val_Data);
// }
}
- this.handleNodeClick(this.tree[0].children[0])
+ this.handleNodeClick(this.tree[0].children[0]);
},
//鎺堟潈绠＄悊
showPermsBtn() {
@@ -676,7 +745,6 @@
permsEntity
.filter((item) => item.perms == currentPerms)
.map((item) => {
-
this.btnStatus[item.tag.substr(1)] = true;
});
},
@@ -700,7 +768,7 @@
res.then((val) => {
this.attributeData = val;
});
- if (this.ruleForm.fileName != '') {
+ if (this.ruleForm.fileName != "") {
this.listData.filter = this.ruleForm.fileName;
} else {
this.listData.filter = null;
@@ -708,7 +776,7 @@
const data = await dataQuery_selectByPage(this.listData);
if (data.code != 200) {
- this.$message.error('璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!');
+ this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
var res_val = this.attributeData;
@@ -733,7 +801,7 @@
name: this.listData.name,
});
if (fileds.code != 200) {
- this.$message.error('璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!');
+ this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
@@ -742,15 +810,15 @@
name: this.listData.name,
});
if (domains.code != 200) {
- this.$message.error('璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!');
+ this.$message.error("璋冪敤鍒楄〃澶辫触,璇疯仈绯诲伐浣滀汉鍛�!");
return;
}
var data1 = fileds.result;
var data2 = domains.result;
var std = [];
for (var i in data1) {
- if (data1[i].type != 'geomtry' && data1[i].type != 'null') {
- this.filedsOption.push(data1[i])
+ if (data1[i].type != "geomtry" && data1[i].type != "null") {
+ this.filedsOption.push(data1[i]);
}
if (data1[i].showtype == 1) {
if (data1[i].domainNa != null) {
@@ -769,55 +837,54 @@
this.formSql.date = new Date();
},
handleconditionClose() {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
+ this.$confirm("纭鍏抽棴锛�")
+ .then((_) => {
this.startFiledAndcondition();
})
- .catch(_ => { });
+ .catch((_) => {});
},
fieldChange(value) {
- var obj = {}
+ var obj = {};
obj = this.filedsOption.find(function (item) {
return item.field === value;
- })
- this.conditionChange(obj)
-
+ });
+ this.conditionChange(obj);
},
conditionChange(res) {
this.formSql.field = res.field;
this.formSql.type = res.type;
if (res.type == "date" || res.type == "datetime") {
- this.fromSqlflag = true
+ this.fromSqlflag = true;
} else {
- this.fromSqlflag = false
+ this.fromSqlflag = false;
}
var std = [];
this.condOption = [];
- if (res.type == 'text' || res.type == 'blob') {
- std = conditions[0]
- } else if (res.type == 'date' || res.type == 'datetime') {
- std = conditions[2]
+ if (res.type == "text" || res.type == "blob") {
+ std = conditions[0];
+ } else if (res.type == "date" || res.type == "datetime") {
+ std = conditions[2];
} else {
- std = conditions[1]
+ std = conditions[1];
}
for (var i in std) {
this.condOption.push({
label: std[i],
value: std[i],
- })
+ });
}
- this.formSql.condition = this.condOption[0].value
+ this.formSql.condition = this.condOption[0].value;
},
appendQueryFilter() {
if (this.formSql.type == "date" || this.formSql.type == "datetime") {
if (this.formSql.date == null) {
- this.$message.error('璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!');
+ this.$message.error("璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!");
return;
}
} else {
if (this.formSql.value == "") {
- this.$message.error('璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!');
+ this.$message.error("璇疯緭鍏ヨ鏌ヨ鐨勪俊鎭�!");
return;
}
}
@@ -829,32 +896,29 @@
if (this.formSql.type == "long" || this.formSql.type == "integer") {
val = parseInt(this.formSql.value);
- } else if (this.formSql.type == 'double') {
-
+ } else if (this.formSql.type == "double") {
if (this.formSql.value.indexOf(".") != -1) {
val = this.formSql.value;
} else {
- val = parseFloat(this.formSql.value).toFixed(1)
+ val = parseFloat(this.formSql.value).toFixed(1);
}
- } else if (this.formSql.type == "date" || this.formSql.type == "datetime") {
+ } else if (
+ this.formSql.type == "date" ||
+ this.formSql.type == "datetime"
+ ) {
var time = new Date(this.formSql.date);
var m = time.getMonth() + 1;
var d = time.getDate();
var y = time.getFullYear();
- val = "'" + y +
- '-' +
- this.add0(m) +
- '-' +
- this.add0(d) + "'";
+ val = "'" + y + "-" + this.add0(m) + "-" + this.add0(d) + "'";
} else {
val = "'" + this.formSql.value + "'";
}
- this.ruleForm.fileName += this.formSql.field + " " + this.formSql.condition + " " + val;
+ this.ruleForm.fileName +=
+ this.formSql.field + " " + this.formSql.condition + " " + val;
this.startFiledAndcondition();
},
-
-
//鍊煎煙瀛楁鍖归厤
getDomainNaFild(res, result) {
@@ -924,12 +988,11 @@
},
// 閲嶇疆鏌ヨ
resetForm() {
- this.ruleForm.fileName = '';
+ this.ruleForm.fileName = "";
this.listData.pageIndex = 1;
this.listData.pageSize = 10;
//鑾峰彇table淇℃伅
this.getCollapseTable(this.filedsLayer);
-
},
// 鍙戝竷鎸夐挳
@@ -943,9 +1006,9 @@
// .then(() => {
const loading = this.$loading({
lock: true,
- text: 'Loading',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)',
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
});
setTimeout(() => {
loading.close();
@@ -984,15 +1047,15 @@
// 鎻愪氦淇敼
updateForm() {
let params = {};
- this.$confirm('鏄惁纭畾缂栬緫?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
+ this.$confirm("鏄惁纭畾缂栬緫?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
})
.then(() => {
this.dialogFormVisible = false;
switch (this.tableType) {
- case '鍦虹珯鐐�':
+ case "鍦虹珯鐐�":
params = {
gid: this.upform.gid,
pipename: this.upform.pipename,
@@ -1002,15 +1065,15 @@
UpdateSitePoint(params).then((res) => {
if (res.data == 1) {
this.$message({
- message: '淇敼鎴愬姛',
- type: 'success',
+ message: "淇敼鎴愬姛",
+ type: "success",
});
}
- this.getSPData(10, 1, '');
- this.getSPCount('');
+ this.getSPData(10, 1, "");
+ this.getSPCount("");
});
break;
- case '绠￠亾涓績绾�':
+ case "绠￠亾涓績绾�":
params = {
gid: this.upform.gid,
pipename: this.upform.pipename,
@@ -1022,15 +1085,15 @@
UpdateStationSeries(params).then((res) => {
if (res.data == 1) {
this.$message({
- message: '淇敼鎴愬姛',
- type: 'success',
+ message: "淇敼鎴愬姛",
+ type: "success",
});
}
- this.getSSData(10, 1, '');
- this.getSSCount('');
+ this.getSSData(10, 1, "");
+ this.getSSCount("");
});
break;
- case '鏍囨々':
+ case "鏍囨々":
params = {
gid: this.upform.gid,
pipename: this.upform.pipename,
@@ -1040,12 +1103,12 @@
UpdatgeMarker(params).then((res) => {
if (res.data == 1) {
this.$message({
- message: '淇敼鎴愬姛',
- type: 'success',
+ message: "淇敼鎴愬姛",
+ type: "success",
});
}
- this.getMData(10, 1, '');
- this.getMCount('');
+ this.getMData(10, 1, "");
+ this.getMCount("");
});
break;
}
@@ -1060,7 +1123,7 @@
// this.getMetaCount("");
// });
})
- .catch(() => { });
+ .catch(() => {});
},
// 鑾峰彇澶氶�夐�変腑鐨勫璞�
handleSelectionChange(val) {
@@ -1075,47 +1138,47 @@
for (var i in this.multipleSelection) {
std.push(this.multipleSelection[i].gid);
}
- this.$confirm('纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning',
+ this.$confirm("纭畾鏄惁鍒犻櫎鎵�閫夊唴瀹�?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
})
.then(() => {
switch (this.tableType) {
- case '鍦虹珯鐐�':
+ case "鍦虹珯鐐�":
dltSitePoint(std).then((res) => {
if (res.data !== 0) {
this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success',
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
});
}
- this.getSPData(10, 1, '');
- this.getSPCount('');
+ this.getSPData(10, 1, "");
+ this.getSPCount("");
});
break;
- case '绠￠亾涓績绾�':
+ case "绠￠亾涓績绾�":
dltStationSeries(std).then((res) => {
if (res.data !== 0) {
this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success',
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
});
}
- this.getSSData(10, 1, '');
- this.getSSCount('');
+ this.getSSData(10, 1, "");
+ this.getSSCount("");
});
break;
- case '鏍囨々':
+ case "鏍囨々":
dltMarker(std).then((res) => {
if (res.data !== 0) {
this.$message({
- message: '鍒犻櫎鎴愬姛',
- type: 'success',
+ message: "鍒犻櫎鎴愬姛",
+ type: "success",
});
}
- this.getMData(10, 1, '');
- this.getMCount('');
+ this.getMData(10, 1, "");
+ this.getMCount("");
});
break;
}
@@ -1128,7 +1191,7 @@
// });
// });
})
- .catch(() => { });
+ .catch(() => {});
},
},
};
@@ -1151,11 +1214,12 @@
border-radius: 5px;
padding: 1%;
- overflow: auto;
+ max-height: 670px;
+ overflow-y: auto;
}
.spatial_rightContent {
- width: 80%;
- height: 91%;
+ // width: 80%;
+ // height: 91%;
border-radius: 5px;
padding: 1%;
diff --git a/src/views/datamanage/catalogueManage.vue b/src/views/datamanage/catalogueManage.vue
index c8f417a..c4cf971 100644
--- a/src/views/datamanage/catalogueManage.vue
+++ b/src/views/datamanage/catalogueManage.vue
@@ -29,7 +29,7 @@
$t('dataManage.dictionaryManageObj.particulars')
}}</el-breadcrumb-item>
</el-breadcrumb>
- <div>
+ <div style="margin-right: -5px;">
<div class="menuTop">
<el-form
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index d6ba022..06db611 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -25,7 +25,7 @@
class="demo-form-inline"
>
<!-- 鍏ュ簱绫诲瀷 -->
- <el-form-item :label="$t('dataManage.dataUpObj.UploadType')">
+ <el-form-item :label="$t('dataManage.dataUpObj.UploadType')" style="margin-right: 2%">
<el-select
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.uploadType"
@@ -43,6 +43,7 @@
</el-form-item>
<!-- 瀛樺偍鐩綍 -->
<el-form-item
+ style="margin-right: 2%"
v-show="uploadFlag"
:label="$t('dataManage.dataUpObj.storageDirectory')"
>
@@ -76,6 +77,7 @@
</el-form-item>
<!-- 椤圭洰鍚嶇О -->
<el-form-item
+ style="margin-right: 2%"
v-show="!uploadFlag"
:label="$t('dataManage.dataUpObj.entryName')"
>
@@ -95,7 +97,7 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁鐗堟湰 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')">
+ <el-form-item :label="$t('dataManage.dataUpObj.dataVersion')" style="margin-right: 2%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -112,7 +114,7 @@
</el-select>
</el-form-item>
<!-- 鏁版嵁涓撲笟 -->
- <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
+ <el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')" style="margin-right: 2%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -129,7 +131,7 @@
</el-select>
</el-form-item>
<!-- 鍧愭爣绯� -->
- <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')">
+ <el-form-item :label="$t('dataManage.dataUpObj.coordinateSystem')" style="margin-right: 3%">
<el-select
:popper-append-to-body="false"
:disabled="tableData.length == 0 ? false : true"
@@ -175,7 +177,7 @@
<el-input
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="formInline.specialtyData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -205,11 +207,11 @@
@change="handleMetaFileChange"
></input>
</el-form-item>
- <el-form-item v-show="uploadFlag">
+ <el-form-item v-show="uploadFlag" style="margin-left: 0.7%;">
<el-input
placeholder="璇疯緭鍏ュ唴瀹�"
v-model="formInline.metaData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -244,7 +246,7 @@
<el-input
placeholder="璇烽�夋嫨WBS鏁版嵁"
v-model="formInline.wbsData"
- style="width:350px;"
+ style="width:210px;"
disabled
>
</el-input>
@@ -281,6 +283,7 @@
>{{ $t('common.Warehousin') }}</el-button>
<!-- 璐ㄦ -->
<el-button
+ style="margin-right:-9px"
v-if="menuStatus.insert"
:disabled="multipleSelection.length == 0 ? true : false"
type="info"
@@ -297,6 +300,7 @@
<!-- 涓婁紶鏁版嵁鍒楄〃 -->
<div class="subpage_Content subpage_Div">
<el-table
+ style="min-height: 450px;"
:data="tableData"
@selection-change="handleSelectionChange"
>
@@ -2428,5 +2432,4 @@
},
}
};
-</script>
-
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 000c4aa..725ff6b 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -142,7 +142,7 @@
</el-table>
</div>
<div
- style="margin-top: 20px; margin-left: 400px"
+ style="margin-top: 20px;"
class="pagination_box"
>
<el-pagination
diff --git a/src/views/maintenance/parameterConfiguration.vue b/src/views/maintenance/parameterConfiguration.vue
index a55cb62..ad93913 100644
--- a/src/views/maintenance/parameterConfiguration.vue
+++ b/src/views/maintenance/parameterConfiguration.vue
@@ -5,11 +5,12 @@
`${$t('operatManage.systemLayout')}`,
]"></My-bread>
<el-divider />
- <div class="parameterConfiguration">
- <el-table
- :data="tableData"
- style="width: 100%"
- >
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="99%">
<el-table-column
align="center"
type="index"
diff --git a/src/views/maintenance/tokentool.vue b/src/views/maintenance/tokentool.vue
index a634739..a718578 100644
--- a/src/views/maintenance/tokentool.vue
+++ b/src/views/maintenance/tokentool.vue
@@ -70,14 +70,12 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box subpage_Div">
- <div></div>
- <el-table
- :data="tableData"
-
- style="width: 100%"
- @selection-change="handleSelectionChange"
- >
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="94%">
<el-table-column
type="selection"
width="55"
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index 59cc059..7044423 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -64,15 +64,6 @@
</el-form-item>
<el-form-item style="float:right">
<el-button
- size="small"
- @click="queryInfo()"
- icon="el-icon-search"
- type="primary"
- >{{ $t('operatManage.ELM.search') }}
- </el-button>
- </el-form-item>
- <el-form-item style="float:right">
- <el-button
v-if="menuStatus.delete"
type="danger"
size="small"
@@ -95,14 +86,14 @@
</el-form-item>
</el-form>
</div>
- <div class="table_box subpage_Div">
- <el-table
- :data="tableData"
- border
- style="width: 100%;overflow: auto;height: 900px;"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
+ <div style="height: 73%">
+ <el-table
+ ref="filterTable"
+ :data="tableData"
+ style="width: 100%"
+ height="99%"
+ >
+ <el-table-column
type="selection"
width="55"
/>
--
Gitblit v1.9.3