|
@@ -315,8 +315,8 @@
|
|
|
<el-form-item class="form_item" label="图标" prop="icon">
|
|
|
<el-input v-model="form.icon" placeholder="请输入图标" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="form_item" label="级别" prop="lev">
|
|
|
- <el-input v-model="form.lev" placeholder="请输入级别" />
|
|
|
+ <el-form-item class="form_item" label="数据年份" prop="year">
|
|
|
+ <el-input v-model="form.year" placeholder="请输入数据年份" />
|
|
|
</el-form-item>
|
|
|
<el-form-item class="form_item" label="排序" prop="sort">
|
|
|
<el-input v-model="form.sort" placeholder="请输入排序" />
|
|
@@ -384,8 +384,8 @@
|
|
|
<el-form-item class="form_item" label="数据坐标系" prop="epsg">
|
|
|
<el-input v-model="form.epsg" placeholder="请输入数据坐标系" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="form_item" label="数据年份" prop="year">
|
|
|
- <el-input v-model="form.year" placeholder="请输入数据年份" />
|
|
|
+ <el-form-item class="form_item" label="级别" prop="lev">
|
|
|
+ <el-input v-model="form.lev" placeholder="请输入级别" />
|
|
|
</el-form-item>
|
|
|
<el-form-item class="form_item" label="过滤条件" prop="gltj">
|
|
|
<el-input v-model="form.gltj" placeholder="请输入过滤条件" />
|
|
@@ -500,6 +500,7 @@
|
|
|
</el-tab-pane>
|
|
|
</el-tabs>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="refresh">刷 新</el-button>
|
|
|
<el-button type="primary" @click="confirmUpdateDict">确 定</el-button>
|
|
|
<el-button @click="closeDialogDict">取 消</el-button>
|
|
|
</div>
|
|
@@ -753,13 +754,13 @@ export default {
|
|
|
this.form[key] = "";
|
|
|
}
|
|
|
}
|
|
|
- if (this.form.sde) {
|
|
|
- if (typeof this.form.sde != "string") {
|
|
|
- //if (this.form.sde.length > 0) {
|
|
|
- this.form.sde = this.form.sde.join(",");
|
|
|
- //}
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (this.form.sde) {
|
|
|
+ // if (typeof this.form.sde != "string") {
|
|
|
+ // //if (this.form.sde.length > 0) {
|
|
|
+ // this.form.sde = this.form.sde.join(",");
|
|
|
+ // //}
|
|
|
+ // }
|
|
|
+ // }
|
|
|
if (this.form.bsm != null) {
|
|
|
// && this.oldServerUrl != this.form.url
|
|
|
if (
|
|
@@ -928,59 +929,67 @@ export default {
|
|
|
this.tempTableData = [];
|
|
|
//默认选中
|
|
|
this.tabActiveName = row.name;
|
|
|
+ if (row.legend == "" && row.url != "") {
|
|
|
+ this.getDict(row);
|
|
|
+ } else {
|
|
|
+ this.processData(row);
|
|
|
+ }
|
|
|
+ this.cur_server_name_dic = row.name;
|
|
|
+ this.dialogDictVisible = true;
|
|
|
+ },
|
|
|
+ getDict(row) {
|
|
|
let indexss = row.url.lastIndexOf("/");
|
|
|
var resolvess = row.url.substring(0, indexss);
|
|
|
let url1 = resolvess.replace("map-", "data-");
|
|
|
- let url3 = row.sde.substring(0, row.sde.indexOf(":")) + "/datasets/";
|
|
|
+ // let url3 = row.sde.substring(0, row.sde.indexOf(":")) + "/datasets/";
|
|
|
+ let url3 = row.fwgzkj + "/datasets/";
|
|
|
let url2 = url1.replace("maps", "data/datasources/" + url3);
|
|
|
- let reqName = row.sde.substring(row.sde.indexOf(":") + 1, row.sde.length);
|
|
|
- if (row.legend == "" && row.url != "") {
|
|
|
- //从iserver中获取数据地址
|
|
|
- let newUrl = url2 + reqName + "/fields.json";
|
|
|
- request({
|
|
|
- method: "get",
|
|
|
- url: newUrl,
|
|
|
- }).then((res) => {
|
|
|
- if (res.fieldNames.length > 0) {
|
|
|
- //处理数据
|
|
|
- res.fieldNames.forEach((item, iindex) => {
|
|
|
- this.tempTableData.push({
|
|
|
- fieldname: item,
|
|
|
- fieldaliasname: item,
|
|
|
- status: true,
|
|
|
- order: iindex,
|
|
|
- id: iindex,
|
|
|
- });
|
|
|
+ // let reqName = row.sde.substring(row.sde.indexOf(":") + 1, row.sde.length);
|
|
|
+ let reqName = row.fwmc;
|
|
|
+ //从iserver中获取数据地址
|
|
|
+ let newUrl = url2 + reqName + "/fields.json";
|
|
|
+ request({
|
|
|
+ method: "get",
|
|
|
+ url: newUrl,
|
|
|
+ }).then((res) => {
|
|
|
+ if (res.fieldNames.length > 0) {
|
|
|
+ //处理数据
|
|
|
+ res.fieldNames.forEach((item, iindex) => {
|
|
|
+ this.tempTableData.push({
|
|
|
+ fieldname: item,
|
|
|
+ fieldaliasname: item,
|
|
|
+ status: true,
|
|
|
+ order: iindex,
|
|
|
+ id: iindex,
|
|
|
});
|
|
|
+ });
|
|
|
|
|
|
- this.tabelList.push({
|
|
|
- bsm: row.bsm,
|
|
|
- name: row.name,
|
|
|
- tabelData: this.tempTableData,
|
|
|
- servicename: row.name,
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
- } else {
|
|
|
- let newLegend = JSON.parse(row.legend);
|
|
|
- newLegend.forEach((le, n) => {
|
|
|
- if (!le.id) {
|
|
|
- le.id = n;
|
|
|
- }
|
|
|
- });
|
|
|
- //如果lenged中存在字段修正数据,则直接使用
|
|
|
- this.tabelList.push({
|
|
|
- bsm: row.bsm,
|
|
|
- name: row.name,
|
|
|
- // tabelData: JSON.parse(row.legend),
|
|
|
- tabelData: newLegend,
|
|
|
- servicename: row.name,
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- this.cur_server_name_dic = row.name;
|
|
|
- this.dialogDictVisible = true;
|
|
|
+ this.tabelList.push({
|
|
|
+ bsm: row.bsm,
|
|
|
+ name: row.name,
|
|
|
+ tabelData: this.tempTableData,
|
|
|
+ servicename: row.name,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
+ processData(row) {
|
|
|
+ let newLegend = JSON.parse(row.legend);
|
|
|
+ newLegend.forEach((le, n) => {
|
|
|
+ if (!le.id) {
|
|
|
+ le.id = n;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ //如果lenged中存在字段修正数据,则直接使用
|
|
|
+ this.tabelList.push({
|
|
|
+ bsm: row.bsm,
|
|
|
+ name: row.name,
|
|
|
+ // tabelData: JSON.parse(row.legend),
|
|
|
+ tabelData: newLegend,
|
|
|
+ servicename: row.name,
|
|
|
+ });
|
|
|
},
|
|
|
+ refresh() {},
|
|
|
//确定字典维护的修改
|
|
|
confirmUpdateDict() {
|
|
|
if (this.tabelList.length > 0) {
|