From 731d894cf232d98b547df2bd006795de74fb16a7 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期四, 09 二月 2023 15:05:10 +0800
Subject: [PATCH] 数据管理样式修改
---
src/views/datamanage/metadataManage.vue | 136 +++++++-
src/assets/css/config.css | 13
public/config/config.js | 2
src/views/datamanage/projectManage.vue | 24 -
src/components/MapView/mapMenuTop.vue | 64 ++--
src/components/MapView/mapMenuPop.vue | 54 +-
src/views/datamanage/domainManage.vue | 96 +++---
src/views/datamanage/dataUpdata.vue | 15
src/views/datamanage/styleManage.vue | 456 ++++++++++++++++-------------
src/views/datamanage/SpatialData.vue | 16
10 files changed, 512 insertions(+), 364 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index e16ca7c..18ba69f 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,5 +1,5 @@
//var isWeb = location.hostname.indexOf("103.85.165.") > -1;
-var isWeb = true;
+var isWeb = false;
var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.20.205' + ":8088";
diff --git a/src/assets/css/config.css b/src/assets/css/config.css
index 071c3cc..69d88a0 100644
--- a/src/assets/css/config.css
+++ b/src/assets/css/config.css
@@ -227,4 +227,15 @@
}
-
\ No newline at end of file
+ .Black_theme .contLable{
+ color: white;
+ }
+ .Black_theme .elLink{
+ color: white;
+ }
+ .Black_theme .el-icon-folder-opened{
+ color: white;
+ }
+ .Black_theme .el-link.el-link--default{
+ color: white;
+ }
\ No newline at end of file
diff --git a/src/components/MapView/mapMenuPop.vue b/src/components/MapView/mapMenuPop.vue
index a7c77b2..c4c6d05 100644
--- a/src/components/MapView/mapMenuPop.vue
+++ b/src/components/MapView/mapMenuPop.vue
@@ -196,7 +196,7 @@
></iframe>
</div>
</template>
-
+
<script>
import {
dataQuery_selectByPage,
@@ -266,7 +266,7 @@
entity: [],
wkt: null,
descr: null,
-
+
},
listPage: {
pageSize: 10,
@@ -331,9 +331,9 @@
this.$message.error("鏁版嵁璇锋眰澶辫触");
return;
}
-
+
if (data.result.length == 0 || data.result == null) {
-
+
this.insertFlag = 1;
this.dialogVisible = true;
} else {
@@ -347,20 +347,20 @@
} else {
val += "&ids=" + data.result[i]
}
-
+
std.push({
name: data.result[i]
})
}
const data1 = await dataLib_selectDepsByIds(val);
-
+
this.ruleForm.depid = data1.result;
this.ruleForm.depname = std;
this.ruleForm.wkt = decr(this.listdata.wkt)
this.ruleForm.tabs = this.option;
this.dialogInsertVisible = true;
}
-
+
},
async signGetPublicKey() {
const res = await sign_getPublicKey();
@@ -400,7 +400,7 @@
var std = [];
var std1 = [];
for (var i in this.option) {
-
+
std.push(this.option[i].tabDesc)
std1.push(this.option[i].entity)
}
@@ -421,10 +421,10 @@
message: '鏁版嵁鐢宠鎴愬姛',
type: 'success'
});
-
+
this.closeDown();
}
-
+
},
async selectDownloadFile(rsid, rspwd) {
var downObj = {
@@ -481,7 +481,7 @@
}, []);
this.option = arr;
this.listdata.name = this.option[0].entity;
-
+
this.getTableDateHidder();
},
async getTableDateHidder() {
@@ -497,7 +497,7 @@
this.attributeData = [];
var valadata = data.result;
var laydomain = data1.result;
-
+
for (var i in valadata) {
if (valadata[i].showtype == 1) {
if (
@@ -525,7 +525,7 @@
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触");
}
-
+
var val1 = decr(data.result);
if (val1) {
if (this.imagePoint != null) {
@@ -554,7 +554,7 @@
} else if (res.type == "MultiPolygon") {
var val = res.coordinates[0][0];
var std = [];
-
+
for (var i in val) {
std.push({ x: val[i][0], y: val[i][1], z: 1000 });
}
@@ -573,7 +573,7 @@
} else if (res.type == "MultiLineString") {
var line = res.coordinates[0];
var std = [];
-
+
for (var i in line) {
std.push({ x: line[i][0], y: line[i][1], z: 1000 });
}
@@ -604,12 +604,12 @@
},
async getTableData() {
this.tableData = [];
-
+
const data = await dataQuery_selectByPage(this.listdata);
if (data.code != 200) {
this.$message.error("鍒楄〃璋冪敤澶辫触");
}
-
+
var val_Data = data.result;
for (var i in val_Data) {
var valste = val_Data[i];
@@ -725,7 +725,7 @@
break;
}
},
-
+
closeMenuBox() {
if (this.imagePoint != null) {
sgworld.Creator.DeleteObject(this.imagePoint);
@@ -748,7 +748,7 @@
},
};
</script>
-
+
<style scoped lang="less">
.menuPop {
width: 100%;
@@ -782,7 +782,7 @@
justify-content: flex-end;
}
}
-
+
.rightBox {
width: calc(80% - 1px);
height: 100%;
@@ -844,7 +844,7 @@
}
/deep/ .el-table {
background-color: transparent;
-
+
th,
td {
background-color: transparent;
@@ -852,7 +852,7 @@
.el-table__expanded-cell {
background-color: transparent !important;
}
-
+
// 琛ㄥご鑳屾櫙鑹�
th.el-table__cell {
background-color: #303030;
@@ -862,23 +862,23 @@
background-color: #303030;
color: #fff;
}
-
+
// hover鏁堟灉
tr:hover > td {
background-color: rgba(255, 255, 255, 0.3) !important;
}
-
+
tbody tr:hover {
background-color: rgba(255, 255, 255, 0.3) !important;
// text-align: center;
}
-
+
// 婊氬姩鏉″楂�
.el-table__body-wrapper::-webkit-scrollbar {
width: 5px;
height: 5px;
}
-
+
.el-table__body-wrapper::-webkit-scrollbar {
width: 5px;
/*婊氬姩鏉″搴�*/
@@ -891,7 +891,7 @@
/*婊氬姩鏉＄殑鑳屾櫙鍖哄煙鐨勫唴闃村奖*/
border-radius: 10px;
}
-
+
/*瀹氫箟婊戝潡 鍐呴槾褰�+鍦嗚*/
.el-table__body-wrapper::-webkit-scrollbar-thumb {
box-shadow: 0px 1px 3px #216fe6 inset;
diff --git a/src/components/MapView/mapMenuTop.vue b/src/components/MapView/mapMenuTop.vue
index bbd2eb2..0280977 100644
--- a/src/components/MapView/mapMenuTop.vue
+++ b/src/components/MapView/mapMenuTop.vue
@@ -43,7 +43,7 @@
</el-option>
</el-select>
</el-form-item>
-
+
<el-form-item>
<el-select
@change="changeValue($event)"
@@ -91,7 +91,7 @@
<queryinfo ref="queryinfo" />
</div>
</template>
-
+
<script>
import queryinfo from "../../views/Tools/queryinfo.vue"
import $ from 'jquery';
@@ -122,7 +122,7 @@
children: [],
},
],
-
+
queryOption: [
{
value: 'point',
@@ -156,10 +156,10 @@
graphicLayer: null,
};
},
-
+
mounted() {
// sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
-
+
this.menuTopFrom.queryType = 'rectangle';
this.getAllTable();
},
@@ -179,7 +179,7 @@
this.$message.error('鍒楄〃璋冪敤澶辫触');
}
var option = data.result;
-
+
for (var i in option) {
var val_Data = option[i];
val_Data.id = '1' + i;
@@ -195,7 +195,7 @@
getCheckedNodes() {
var valTree = this.$refs.tree.getCheckedNodes();
if (valTree.length == 0) return;
-
+
this.menuTopFrom.queryLayer = valTree[0].tabDesc;
for (var i = 0; i < valTree.length; i++) {
this.treeChange.push(valTree[i]);
@@ -206,7 +206,7 @@
this.treeChange = [];
this.menuTopFrom.queryLayer = null;
this.$refs.tree.setCheckedKeys([]);
-
+
},
//瀵煎叆shp鏂囦欢
async setMenuTopFile() {
@@ -224,7 +224,7 @@
}
}
if (count != 4) {
-
+
this.$message({
message: 'ShapeFile鏂囦欢閫夋嫨涓嶅叏锛�',
type: 'warning'
@@ -258,7 +258,7 @@
//娓呯┖鏍囩粯
sgworld.Creator.SimpleGraphic.edit(false, { editProp: false });
sgworld.Creator.SimpleGraphic.clear();
-
+
if (this.treeChange.length == 0) {
this.$message.error('璇烽�夋嫨瑕佹煡璇㈢殑鏁版嵁');
return;
@@ -288,7 +288,7 @@
break;
case 'polyline': //绾�
var polyline = res.polyline.positions.getValue();
-
+
that.setTurfPolyOrLine(polyline, 'polyline');
break;
case 'rectangle': //鐭╁舰
@@ -299,7 +299,7 @@
rectangle.height
);
that.setTurfPolyOrLine(result, 'rectangle');
-
+
break;
case 'circle': //鍦�
var val = that.setCartesianToEightFour(res.position.getValue());
@@ -342,12 +342,12 @@
}
this.setJonToWKT(restVal);
},
-
+
setJonToWKT(res) {
console.log(res.geometry)
var jsonToWkt = this.$wkt.convert(res.geometry);
this.$store.state.mapMenuShpFile = encr(jsonToWkt);
-
+
this.showMapMenuPop();
},
showMapMenuPop() {
@@ -356,12 +356,12 @@
// this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close();
this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.open("绌洪棿鏌ヨ", null, {
close: () => {
-
+
if (this.$store.state.primitLayer != null) {
sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
this.$store.state.primitLayer = null;
}
-
+
if (window.Viewer.scene.primitives.length != 0) {
window.Viewer.scene.primitives.removeAll()
}
@@ -382,21 +382,21 @@
this.menuTopFrom.queryType = 'rectangle';
this.$refs.tree.setCheckedKeys([]);
-
- // //娓呴櫎瀵硅薄
- // if (window.Viewer.scene.primitives.length != null) {
- // window.Viewer.scene.primitives.removeAll();
- // }
- // if (this.$store.state.primitLayer != null) {
- // sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
- // this.$store.state.primitLayer = null;
- // }
- //鍏抽棴绐楀彛
- this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close("queryinfo");
-
-
-
-
+
+ // //娓呴櫎瀵硅薄
+ // if (window.Viewer.scene.primitives.length != null) {
+ // window.Viewer.scene.primitives.removeAll();
+ // }
+ // if (this.$store.state.primitLayer != null) {
+ // sgworld.Creator.DeleteObject(this.$store.state.primitLayer);
+ // this.$store.state.primitLayer = null;
+ // }
+ //鍏抽棴绐楀彛
+ this.$refs && this.$refs.queryinfo && this.$refs.queryinfo.close("queryinfo");
+
+
+
+
},
setCartesianToEightFour(res) {
var std = {};
@@ -410,7 +410,7 @@
},
};
</script>
-
+
<style lang="less" scoped>
.menuBox {
width: 98%;
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 6f6be2a..60ce304 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -225,7 +225,7 @@
<el-table
:data="tableAttach"
ref="filterTable"
- height="99%"
+ height="100%"
border
style="width: 100%"
@selection-change="handleAttatchChange"
@@ -251,7 +251,7 @@
</el-table>
</el-form-item>
- <el-form-item>
+ <!-- <el-form-item>
<el-row :gutter="20">
<el-col
@@ -259,7 +259,7 @@
:offset="8"
>
<el-button
- class="primary"
+ type="primary"
size="small"
@click="dialogFormVisible = false"
>纭</el-button>
@@ -270,14 +270,13 @@
>鍙栨秷</el-button>
</el-col>
</el-row>
- </el-form-item>
+ </el-form-item> -->
</el-form>
</el-dialog>
<el-dialog
width="37%"
:visible.sync="conditionVisible"
- append-to-body
title="鏌ヨ鏉′欢"
:before-close="handleconditionClose"
>
@@ -290,6 +289,7 @@
<el-select
@change="fieldChange($event)"
v-model="formSql.field"
+ :popper-append-to-body="false"
>
<el-option
v-for="item in filedsOption"
@@ -301,7 +301,10 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-select v-model="formSql.condition">
+ <el-select
+ :popper-append-to-body="false"
+ v-model="formSql.condition"
+ >
<el-option
v-for="item in condOption"
:key="item.value"
@@ -343,6 +346,7 @@
:title=" $t('synthesis.rangequery')"
:visible.sync="dialogMapVisible"
width="90%"
+ top="10vh"
:before-close="handleMapClose"
>
<div style="height:700px">
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 06d4491..599e1d0 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -47,7 +47,7 @@
:label="$t('dataManage.dataUpObj.storageDirectory')"
>
<el-select
- :popper-append-to-body="false"
+ :popper-append-to-body="false"
v-model="formInline.dirName"
:disabled="tableData.length == 0 ? false : true"
>
@@ -115,7 +115,7 @@
<el-form-item :label="$t('dataManage.dataUpObj.dataSpecialty')">
<el-select
:popper-append-to-body="false"
- style="z-index:2022"
+
:disabled="tableData.length == 0 ? false : true"
v-model="formInline.specialtyId"
:placeholder="$t('common.choose')"
@@ -2236,12 +2236,12 @@
}
},
//鐩綍鍒囨崲
- catalogChange(data, node, nodeData){
+ catalogChange(data, node, nodeData) {
this.startQuayTestForms();
// this.$refs['selectcascader'].dropDownVisible = false
// var value = this.$refs['selectcascader'].getCheckedNodes();
-debugger
- var bak = value[0].data.bak;
+
+ var bak = node.data.bak;
this.pathBak = bak;
if (bak != null) {
for (var key in this.quayTestShow) {
@@ -2250,12 +2250,13 @@
}
}
}
- var fileType = value[0].data.code;
+ var fileType = node.data.code;
if (fileType == null) {
fileType = "*.*"
}
this.formInline.selectFileType = fileType;
- this.formInline.dirid = res;
+ this.formInline.dirid = node.data.id;
+ this.formInline.dirName = node.data.name
this.getselectVerByDirid();
},
//Tabsq鍒囨崲
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index e7da7d5..c9c1744 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -163,60 +163,60 @@
class="infoBox subpage_Div box_div"
v-show="showinfoBox"
>
-
+
+ <div
+ slot="header"
+ class="clearfix"
+ >
+ <span>{{ $t('common.details') }}</span>
<div
- slot="header"
- class="clearfix"
+ style="float: right; cursor: pointer"
+ @click="closeDetial"
>
- <span>{{ $t('common.details') }}</span>
- <div
- style="float: right; cursor: pointer"
- @click="closeDetial"
- >
- <i class="el-icon-close"></i>
- </div>
+ <i class="el-icon-close"></i>
</div>
- <el-divider></el-divider>
- <div class="contentBox">
- <p>
- {{ $t('dataManage.domainManage.domName') }}锛歿{
+ </div>
+ <el-divider></el-divider>
+ <div class="contentBox">
+ <p>
+ {{ $t('dataManage.domainManage.domName') }}锛歿{
itemdetail.domName
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.domainManage.domDesc') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.domainManage.domDesc') }}锛歿{
itemdetail.domDesc
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.domainManage.domCode') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.domainManage.domCode') }}锛歿{
itemdetail.domCode
}}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.domainManage.codeDesc') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.domainManage.codeDesc') }}锛歿{
itemdetail.codeDesc
}}
- </p>
- <el-divider></el-divider>
- <p>{{ $t('dataManage.domainManage.bsm') }}锛歿{ itemdetail.bsm }}</p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.domainManage.level') }}锛歿{ itemdetail.level }}
- </p>
- <el-divider></el-divider>
- <p>
- {{ $t('dataManage.domainManage.orderid') }}锛歿{
+ </p>
+ <el-divider></el-divider>
+ <p>{{ $t('dataManage.domainManage.bsm') }}锛歿{ itemdetail.bsm }}</p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.domainManage.level') }}锛歿{ itemdetail.level }}
+ </p>
+ <el-divider></el-divider>
+ <p>
+ {{ $t('dataManage.domainManage.orderid') }}锛歿{
itemdetail.orderid
}}
- </p>
- <el-divider></el-divider>
- <p>{{ $t('dataManage.domainManage.bak') }}锛歿{ itemdetail.bak }}</p>
- </div>
-
+ </p>
+ <el-divider></el-divider>
+ <p>{{ $t('dataManage.domainManage.bak') }}锛歿{ itemdetail.bak }}</p>
+ </div>
+
</div>
<el-dialog
width="510px"
@@ -238,6 +238,8 @@
:label-width="formLabelWidth"
>
<el-select
+ :popper-append-to-body="false"
+ style="width:100%"
v-model="editForm.domName"
placeholder="璇烽�夋嫨"
>
@@ -431,11 +433,11 @@
return this.$store.state.cataNode.id;
},
},
-
+
methods: {
- filterNode(value, data) {
+ filterNode(value, data) {
if (!value) return true;
-
+
return data.val.indexOf(value) !== -1;
},
async toggleTabs(data) {
@@ -737,7 +739,7 @@
.leftTree {
width: 15%;
height: 91%;
-
+
border-radius: 5px;
padding: 1%;
max-height: 670px;
@@ -746,7 +748,7 @@
.right {
width: 80%;
height: 91%;
-
+
border-radius: 5px;
padding: 1%;
max-height: 670px;
@@ -780,7 +782,5 @@
}
}
}
-
-
}
</style>
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index c814193..e8e2db2 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -12,7 +12,25 @@
:inline="true"
>
<el-form-item>
- <el-cascader
+ <el-select
+ :popper-append-to-body="false"
+ v-model="queryForm.depName"
+ >
+ <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
v-model="queryForm.depid"
:show-all-levels="false"
:options="companyOption1"
@@ -24,10 +42,28 @@
checkStrictly: true,
emitPath: false,
}"
- ></el-cascader>
+ ></el-cascader> -->
</el-form-item>
<el-form-item>
- <el-cascader
+ <el-select
+ :popper-append-to-body="false"
+ v-model="queryForm.dirName"
+ >
+ <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
v-model="queryForm.dirid"
:show-all-levels="false"
:options="companyOption"
@@ -39,10 +75,11 @@
checkStrictly: true,
emitPath: false,
}"
- ></el-cascader>
+ ></el-cascader> -->
</el-form-item>
<el-form-item>
<el-select
+ :popper-append-to-body="false"
v-model="queryForm.verid"
placeholder="璇烽�夋嫨"
@change="verHandleChange($event)"
@@ -183,16 +220,13 @@
:label="$t('common.operate')"
>
<template slot-scope="scope">
- <el-link
- style="color: white"
- @click="showDetail(scope.row)"
- >{{
+ <el-link @click="showDetail(scope.row)">{{
$t('common.details')
}}</el-link>
<el-link
v-if="btnStatus.update"
@click="editInfo(scope.row)"
- style="margin-left: 10px; color: white"
+ style="margin-left: 10px; "
>{{ $t('common.edit') }}</el-link>
</template>
</el-table-column>
@@ -287,7 +321,7 @@
</el-card>
</div>
<el-dialog
- width="510px"
+ width="80vh"
top="5vh"
:title="
behavior == '鏂板鐢ㄦ埛'
@@ -332,25 +366,61 @@
:label="$t('dataManage.vmobj.depName')"
:label-width="formLabelWidth"
>
- <!-- <el-input v-model="editForm.depName" autocomplete="off"></el-input> -->
- <el-cascader
+ <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
v-model="editForm.depid"
:options="companyOption"
:props="cascader"
style="width:350px"
- ></el-cascader>
+ ></el-cascader> -->
</el-form-item>
<el-form-item
:label="$t('dataManage.vmobj.dirName')"
:label-width="formLabelWidth"
>
- <!-- <el-input v-model="editForm.depName" autocomplete="off"></el-input> -->
- <el-cascader
+ <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
v-model="editForm.dirid"
:options="dirComPanyOption"
:props="cascader"
style="width:350px"
- ></el-cascader>
+ ></el-cascader> -->
</el-form-item>
<el-form-item
:label="$t('dataManage.vmobj.describe')"
@@ -452,7 +522,7 @@
</el-dialog>
<div
- class="downloadBox"
+ class="downloadBox box_div subpage_Div"
v-if="showCodeBox"
>
<h4 style="padding: 20px">{{$t('common.passworld')}}</h4>
@@ -714,7 +784,7 @@
}
this.companyOption1 = this.treeData(res.result);
this.queryForm.depid = this.companyOption1[0].id
-
+ this.queryForm.depName = this.companyOption1[0].name
this.getQueryDirTree();
},
@@ -727,6 +797,7 @@
}
this.companyOption = this.treeData(res.result);
this.queryForm.dirid = this.companyOption[0].id
+ this.queryForm.dirName = this.companyOption[0].name
this.getQueryVerList();
},
@@ -746,17 +817,31 @@
this.listData.pageIndex = 1;
this.getMetaData();
},
- handleChange(value) {
+ handleChange(data, node, nodeData) {
this.listData.pageSize = 10;
this.listData.pageIndex = 1;
- this.queryForm.dirid = value;
+ this.queryForm.dirid = data.id;
+ this.queryForm.dirName = data.name
this.getQueryVerList()
},
- handleChange1(value) {
+ handleChange1(data, node, nodeData) {
this.listData.pageSize = 10;
this.listData.pageIndex = 1;
- this.queryForm.depid = value;
+ this.queryForm.depid = data.id;
+ this.queryForm.depName = data.name
this.getMetaData();
+ },
+ handleChange2(data, node, nodeData) {
+
+ this.editForm.depid = data.id;
+ this.editForm.depName = data.name
+
+ },
+ handleChange3(data, node, nodeData) {
+
+ this.editForm.dirid = data.id;
+ this.editForm.dirName = data.name
+
},
//鏍煎紡鍖栧垪琛�
formatData(row, column) {
@@ -880,7 +965,7 @@
getMetaData() {
this.listData.depid = this.queryForm.depid;
this.listData.dirid = this.queryForm.dirid;
-
+
this.listData.verid = this.queryForm.verid;
// this.listData.dirid = 57
@@ -905,6 +990,8 @@
this.listData.name = null;
this.queryForm.dirid = this.companyOption[0].id;
this.queryForm.depid = this.companyOption1[0].id;
+ this.queryForm.dirName = this.companyOption[0].name;
+ this.queryForm.depName = this.companyOption1[0].name;
this.getQueryVerList();
this.getMetaData();
},
@@ -1009,6 +1096,7 @@
this.behavior = '淇敼淇℃伅';
this.editForm = JSON.parse(JSON.stringify(row));
this.dialogFormVisible = true;
+ this.getSelectDictTab();
},
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -1131,7 +1219,7 @@
.inquire {
position: relative;
- overflow: auto;
+
padding-bottom: 8px;
border-radius: 5px;
diff --git a/src/views/datamanage/projectManage.vue b/src/views/datamanage/projectManage.vue
index 8ba403e..cbbe5fe 100644
--- a/src/views/datamanage/projectManage.vue
+++ b/src/views/datamanage/projectManage.vue
@@ -124,9 +124,9 @@
style="margin-top: 10px"
class="pagination_box"
>
-
+
</div>
-
+
</div>
</div>
</div>
@@ -143,7 +143,7 @@
width="60%"
:title="$t('dataManage.projectObj.location')"
:visible.sync="innerVisible"
- append-to-body
+ :modal="false"
:before-close="innerClose"
>
<div style="height: 540px">
@@ -320,9 +320,9 @@
this.editFrom.country = val;
} else if (key == "鐪�") {
this.editFrom.province = val;
- }else if (key == "甯�") {
+ } else if (key == "甯�") {
this.editFrom.location = val;
- }
+ }
}
}
this.editFrom.geom = this.$store.state.projeOl;
@@ -393,7 +393,7 @@
this.$message.error('鍒楄〃鑾峰彇澶辫触');
return;
}
-
+
// this.count = data.result;
this.count1 = data.count;
this.dbTableData = data.result;
@@ -441,7 +441,7 @@
.verSion_leftTree {
width: 15%;
height: 91%;
-
+
border-radius: 5px;
padding: 1%;
@@ -450,7 +450,7 @@
.verSion_rightContent {
width: 80%;
height: 91%;
-
+
border-radius: 5px;
padding: 1%;
overflow-y: auto;
@@ -459,7 +459,7 @@
height: 46px;
padding: 12px 12px;
font-size: 14px;
-
+
border-bottom: 1px solid white;
line-height: 46px;
}
@@ -477,12 +477,6 @@
width: 600px;
}
}
-
-
-
-
-
}
-
</style>
>
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index 9d56b1c..c7f3077 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -291,24 +291,27 @@
:label="$t('dataManage.styleObj.dirid')"
:label-width="formLabelWidth"
>
- <el-select
- v-model="upform.dirid"
- placeholder="璇烽�夋嫨"
- style="width:85%"
- @focus="setOptionWidth"
- >
- <el-option :value="upform.dirid" :label="upform.dirName"
- :style="{ width: selectOptionWidth, height: selectheight }">
- <el-tree
- ref="tree"
- :data="editcatalogOption"
- :default-expand-all="defaultexpand"
- node-key="id"
- :props="defaultProps"
- @node-click="handleNodeClickto"
- />
- </el-option>
- </el-select>
+ <el-select
+ v-model="upform.dirid"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
+ @focus="setOptionWidth"
+ >
+ <el-option
+ :value="upform.dirid"
+ :label="upform.dirName"
+ :style="{ width: selectOptionWidth, height: selectheight }"
+ >
+ <el-tree
+ ref="tree"
+ :data="editcatalogOption"
+ :default-expand-all="defaultexpand"
+ node-key="id"
+ :props="defaultProps"
+ @node-click="handleNodeClickto"
+ />
+ </el-option>
+ </el-select>
<!-- <el-cascader
v-model="upform.dirid"
:options="editcatalogOption"
@@ -332,24 +335,27 @@
:label="$t('dataManage.styleObj.depid')"
:label-width="formLabelWidth"
>
- <el-select
- v-model="upform.depid"
- placeholder="璇烽�夋嫨"
- style="width:85%"
- @focus="setOptionWidth"
- >
- <el-option :value="upform.depid" :label="upform.depName"
- :style="{ width: selectOptionWidth, height: selectheight }">
- <el-tree
- ref="tree"
- :data="editCompanyOption"
- :default-expand-all="defaultexpand"
- node-key="id"
- :props="defaultProps"
- @node-click="handleNodeClick"
- />
- </el-option>
- </el-select>
+ <el-select
+ v-model="upform.depid"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
+ @focus="setOptionWidth"
+ >
+ <el-option
+ :value="upform.depid"
+ :label="upform.depName"
+ :style="{ width: selectOptionWidth, height: selectheight }"
+ >
+ <el-tree
+ ref="tree"
+ :data="editCompanyOption"
+ :default-expand-all="defaultexpand"
+ node-key="id"
+ :props="defaultProps"
+ @node-click="handleNodeClick"
+ />
+ </el-option>
+ </el-select>
<!-- <el-cascader
v-model="upform.depid"
:options="editCompanyOption"
@@ -423,33 +429,41 @@
:label="$t('dataManage.styleObj.fileguid')"
:label-width="formLabelWidth"
>
- <el-input
- v-model="upform.fileGuid"
- disabled
- autocomplete="off"
- style="width:70%"
- ></el-input>
- <input
- name="file1"
- type="file"
- id="editFile"
- multiple="multiple"
- style="display: none"
- @change="editFile(0)"
- />
- <el-button
- style="margin-left: 6px;"
- type="primary"
- size="small"
- :underline="false"
- @click="geteditFile(0)"
- >閫夋嫨</el-button>
- <el-button
- type="primary"
- size="small"
- :underline="false"
- @click="seteditFile(0)"
- >涓婁紶</el-button>
+ <!-- -->
+ <div class="BoxFlex">
+ <div class="BoxFlexinput">
+ <el-input
+ v-model="upform.fileGuid"
+ disabled
+ autocomplete="off"
+ style="width:100%"
+ ></el-input>
+ </div>
+ <div class="BoxFlexbutton">
+ <input
+ name="file1"
+ type="file"
+ id="editFile"
+ multiple="multiple"
+ style="display: none"
+ @change="editFile(0)"
+ />
+ <el-button
+ style="margin-left: 6px;"
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="geteditFile(0)"
+ >閫夋嫨</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="seteditFile(0)"
+ >涓婁紶</el-button>
+ </div>
+ </div>
+ <!-- -->
<!-- <el-link
:underline="false"
@click="geteditFile(0)"
@@ -467,34 +481,42 @@
:label="$t('dataManage.styleObj.viewguid')"
:label-width="formLabelWidth"
>
- <el-input
- v-model="upform.viewGuid"
- disabled
- autocomplete="off"
- style="width:70%"
- ></el-input>
- <input
- name="file1"
- :accept="'.jpg,.png'"
- type="file"
- id="editimageFile"
- multiple="multiple"
- style="display: none"
- @change="editFile(1)"
- />
- <el-button
- style="margin-left: 6px;"
- type="primary"
- size="small"
- :underline="false"
- @click="geteditFile(1)"
- >閫夋嫨</el-button>
- <el-button
- type="primary"
- size="small"
- :underline="false"
- @click="seteditFile(1)"
- >涓婁紶</el-button>
+ <div class="BoxFlex">
+ <div class="BoxFlexinput">
+ <el-input
+ v-model="upform.viewGuid"
+ disabled
+ autocomplete="off"
+ style="width:100%"
+ ></el-input>
+ </div>
+ <div>
+ <input
+ name="file1"
+ :accept="'.jpg,.png'"
+ type="file"
+ id="editimageFile"
+ multiple="multiple"
+ style="display: none"
+ @change="editFile(1)"
+ />
+ <el-button
+ style="margin-left: 6px;"
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="geteditFile(1)"
+ >閫夋嫨</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="seteditFile(1)"
+ >涓婁紶</el-button>
+ </div>
+ </div>
+ <!--
+ -->
<!-- <el-link
:underline="false"
@click="geteditFile(1)"
@@ -566,24 +588,27 @@
:label="$t('dataManage.styleObj.dirid')"
:label-width="formLabelWidth"
>
- <el-select
- v-model="insertform.dirid"
- placeholder="璇烽�夋嫨"
- style="width:85%"
- @focus="setOptionWidth"
- >
- <el-option :value="insertform.dirid" :label="insertform.dirName"
- :style="{ width: selectOptionWidth, height: selectheight }">
- <el-tree
- ref="tree"
- :data="catalogOption"
- :default-expand-all="defaultexpand"
- node-key="id"
- :props="defaultProps"
- @node-click="handcatalogChange"
- />
- </el-option>
- </el-select>
+ <el-select
+ v-model="insertform.dirid"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
+ @focus="setOptionWidth"
+ >
+ <el-option
+ :value="insertform.dirid"
+ :label="insertform.dirName"
+ :style="{ width: selectOptionWidth, height: selectheight }"
+ >
+ <el-tree
+ ref="tree"
+ :data="catalogOption"
+ :default-expand-all="defaultexpand"
+ node-key="id"
+ :props="defaultProps"
+ @node-click="handcatalogChange"
+ />
+ </el-option>
+ </el-select>
<!-- <el-cascader
v-model="insertform.dirid"
:options="catalogOption"
@@ -607,24 +632,27 @@
:label="$t('dataManage.styleObj.depid')"
:label-width="formLabelWidth"
>
- <el-select
- v-model="insertform.depid"
- placeholder="璇烽�夋嫨"
- style="width:85%"
- @focus="setOptionWidth"
- >
- <el-option :value="insertform.depid" :label="insertform.depName"
- :style="{ width: selectOptionWidth, height: selectheight }">
- <el-tree
- ref="tree"
- :data="companyOption"
- :default-expand-all="defaultexpand"
- node-key="id"
- :props="cascader"
- @node-click="handcompanyChange"
- />
- </el-option>
- </el-select>
+ <el-select
+ v-model="insertform.depid"
+ placeholder="璇烽�夋嫨"
+ style="width:85%"
+ @focus="setOptionWidth"
+ >
+ <el-option
+ :value="insertform.depid"
+ :label="insertform.depName"
+ :style="{ width: selectOptionWidth, height: selectheight }"
+ >
+ <el-tree
+ ref="tree"
+ :data="companyOption"
+ :default-expand-all="defaultexpand"
+ node-key="id"
+ :props="cascader"
+ @node-click="handcompanyChange"
+ />
+ </el-option>
+ </el-select>
<!-- <el-cascader
v-model="insertform.depid"
:options="companyOption"
@@ -697,33 +725,41 @@
:label="$t('dataManage.styleObj.fileguid')"
:label-width="formLabelWidth"
>
- <el-input
- v-model="insertform.fileGuid"
- disabled
- autocomplete="off"
- style="width:70%"
- />
- <input
- name="file1"
- type="file"
- id="insertFile"
- multiple="multiple"
- style="display: none"
- @change="insertFile(0)"
- />
- <el-button
- style="margin-left: 6px;"
- type="primary"
- size="small"
- :underline="false"
- @click="getInsertFile(0)"
- >閫夋嫨</el-button>
- <el-button
- type="primary"
- size="small"
- :underline="false"
- @click="setinsertFile(0)"
- >涓婁紶</el-button>
+ <div class="BoxFlex">
+ <div class="BoxFlexinput">
+ <el-input
+ v-model="insertform.fileGuid"
+ disabled
+ autocomplete="off"
+ style="width:100%"
+ />
+ </div>
+ <div>
+ <input
+ name="file1"
+ type="file"
+ id="insertFile"
+ multiple="multiple"
+ style="display: none"
+ @change="insertFile(0)"
+ />
+ <el-button
+ style="margin-left: 6px;"
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="getInsertFile(0)"
+ >閫夋嫨</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="setinsertFile(0)"
+ >涓婁紶</el-button>
+ </div>
+ </div>
+ <!--
+ -->
<!-- <el-link
:underline="false"
@click="getInsertFile(0)"
@@ -740,34 +776,40 @@
:label="$t('dataManage.styleObj.viewguid')"
:label-width="formLabelWidth"
>
- <el-input
- v-model="insertform.viewGuid"
- disabled
- autocomplete="off"
- style="width:70%"
- />
- <input
- name="file1"
- :accept="'.jpg,.png'"
- type="file"
- id="insertimageFile"
- multiple="multiple"
- style="display: none"
- @change="insertFile(1)"
- />
- <el-button
- style="margin-left: 6px;"
- type="primary"
- size="small"
- :underline="false"
- @click="getInsertFile(1)"
- >閫夋嫨</el-button>
- <el-button
- type="primary"
- size="small"
- :underline="false"
- @click="setinsertFile(1)"
- >涓婁紶</el-button>
+ <div class="BoxFlex">
+ <div class="BoxFlexinput">
+ <el-input
+ v-model="insertform.viewGuid"
+ disabled
+ autocomplete="off"
+ style="width:100%"
+ />
+ </div>
+ <div> <input
+ name="file1"
+ :accept="'.jpg,.png'"
+ type="file"
+ id="insertimageFile"
+ multiple="multiple"
+ style="display: none"
+ @change="insertFile(1)"
+ />
+ <el-button
+ style="margin-left: 6px;"
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="getInsertFile(1)"
+ >閫夋嫨</el-button>
+ <el-button
+ type="primary"
+ size="small"
+ :underline="false"
+ @click="setinsertFile(1)"
+ >涓婁紶</el-button>
+ </div>
+ </div>
+
<!-- <el-link
:underline="false"
@click="getInsertFile(1)"
@@ -1102,29 +1144,29 @@
std.push(this.multipleSelection[i].id);
}
this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ牱寮�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(async () => {
- const data = await deleteStyles({ ids: std.toString() });
- if (data.code == 200) {
- this.$message({
- message: "鍒犻櫎鎴愬姛锛�",
- type: "success",
- });
- this.getRoleTabelData();
- } else {
- this.$message({
- message: "鍒犻櫎澶辫触锛�",
- type: "warning",
- });
- }
- }).catch(() => {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(async () => {
+ const data = await deleteStyles({ ids: std.toString() });
+ if (data.code == 200) {
this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
+ message: "鍒犻櫎鎴愬姛锛�",
+ type: "success",
+ });
+ this.getRoleTabelData();
+ } else {
+ this.$message({
+ message: "鍒犻櫎澶辫触锛�",
+ type: "warning",
+ });
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
});
+ });
},
showDirTree(res) {
this.dirFlag = res;
@@ -1608,6 +1650,14 @@
}
}
}
+ .BoxFlex {
+ display: flex;
+ justify-content: space-around;
+ width: 85%;
+ .BoxFlexinput {
+ flex: 1;
+ }
+ }
}
</style>
--
Gitblit v1.9.3