ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/release-sy-v1.0.0'

master_tdsql
zth 2 months ago
parent
b48623a808 3f39e703d3
commit
8e17527fe1
3 changed files with 73 additions and 235 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/aiSupervision/layerConfigApi.js
  2. 302
      src/views/aiSupervision/layerManage/resource/LayerDetails.vue
  3. 2
      src/views/reservoir/safeOperation/js/mapUtils.js

4
src/api/aiSupervision/layerConfigApi.js
View File

@ -212,8 +212,8 @@ export function queryServiceInfoApi(url, layer) {
} }
} else if (nameArr.length === 2) { } else if (nameArr.length === 2) {
let layerName = nameArr[1]; let layerName = nameArr[1];
nameArr = layerName.split(":"); layerNameArr = layerName.split(":");
const newUrl = `${nameArr[1]}/rest/data/datasources/${nameArr[0]}/datasets/${nameArr[1]}/fields.json?k=${token}`; const newUrl = `${nameArr[0]}/rest/data/datasources/${layerNameArr[0]}/datasets/${layerNameArr[1]}/fields.json?k=${token}`;
const result = await axios.get(newUrl); const result = await axios.get(newUrl);
if (result.status === 200 && result.data) { if (result.status === 200 && result.data) {
const fields = result.data.fieldNames.map((item) => { const fields = result.data.fieldNames.map((item) => {

302
src/views/aiSupervision/layerManage/resource/LayerDetails.vue
View File

@ -17,208 +17,93 @@
</div> </div>
</div> </div>
<div class="middle"> <div class="middle">
<el-button type="primary" plain @click="dialogFormVisible = true" <el-button type="primary" plain @click="dialogFormVisible = true">添加图层</el-button>
>添加图层</el-button
>
<el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible"> <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
<el-tabs v-model="activeName" type="card"> <el-tabs v-model="activeName" type="card">
<el-tab-pane label="基础字段" name="1"> <el-tab-pane label="基础字段" name="1">
<el-form :model="editDataInfoForm"> <el-form :model="editDataInfoForm">
<el-form-item <el-form-item label="服务类型" style="font-size: 1rem" :label-width="'120px'">
label="服务类型" <el-select style="width: 80%" v-model="editDataInfoForm.serviceType" placeholder="请选择">
style="font-size: 1rem" <el-option v-for="item in serviceTypeOptions" :key="item.value" :label="item.label"
:label-width="'120px'" :value="item.value" />
>
<el-select
style="width: 80%"
v-model="editDataInfoForm.serviceType"
placeholder="请选择"
>
<el-option
v-for="item in serviceTypeOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="服务名称" prop="serviceName" style="font-size: 1rem" :label-width="'120px'"
<el-form-item v-if="editDataInfoForm.serviceType === '081100'">
label="服务名称" <el-input v-model.trim="editDataInfoForm.serviceName"
prop="serviceName" placeholder="服务名称由两部分构成：数据服务url(如/iserver/services/data-supermap_shuili/rest);服务名称(如namespace:layer1)"
style="font-size: 1rem" style="width: 80%"></el-input>
:label-width="'120px'" </el-form-item>
placeholder="服务名称由两部分构成：数据服务url(如/iserver/services/data-supermap_shuili/rest);服务名称(如namespace:layer1)" <el-form-item label="服务名称" style="font-size: 1rem" :label-width="'120px'" v-else>
> <el-input v-model.trim="editDataInfoForm.serviceName" style="width: 80%"></el-input>
<el-input
v-model.trim="editDataInfoForm.serviceName"
style="width: 80%"
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务别名" prop="serviceNameAlias" style="font-size: 1rem" :label-width="'120px'">
label="服务别名" <el-input v-model.trim="editDataInfoForm.serviceNameAlias" style="width: 80%"></el-input>
prop="serviceNameAlias"
style="font-size: 1rem"
:label-width="'120px'"
>
<el-input
v-model.trim="editDataInfoForm.serviceNameAlias"
style="width: 80%"
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务地址" prop="serviceUrl" style="font-size: 1rem" :label-width="'120px'">
label="服务地址" <el-input v-model.trim="editDataInfoForm.serviceUrl" style="width: 80%"></el-input>
prop="serviceUrl"
style="font-size: 1rem"
:label-width="'120px'"
>
<el-input
v-model.trim="editDataInfoForm.serviceUrl"
style="width: 80%"
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务token" prop="serviceToken" style="font-size: 1rem" :label-width="'120px'">
label="服务token" <el-input v-model.trim="editDataInfoForm.serviceToken" style="width: 80%"></el-input>
prop="serviceToken"
style="font-size: 1rem"
:label-width="'120px'"
>
<el-input
v-model.trim="editDataInfoForm.serviceToken"
style="width: 80%"
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-if="editDataInfoForm.serviceType === '030300'" label="服务索引" prop="serviceIndex"
v-if="editDataInfoForm.serviceType === '030300'" style="font-size: 1rem" :label-width="'120px'">
label="服务索引" <el-input v-model="editDataInfoForm.serviceIndex" style="width: 80%"></el-input>
prop="serviceIndex"
style="font-size: 1rem"
:label-width="'120px'"
>
<el-input
v-model="editDataInfoForm.serviceIndex"
style="width: 80%"
></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item v-show="['030300'].includes(editDataInfoForm.serviceType)" label="样式选择"
v-show="['030300'].includes(editDataInfoForm.serviceType)" style="font-size: 1rem" :label-width="'120px'">
label="样式选择"
style="font-size: 1rem"
:label-width="'120px'"
>
<div class="styleBtn"> <div class="styleBtn">
<el-tag <el-tag type="info" effect="plain" class="style-button" :class="{
type="info" 'style-button-none': editDataInfoForm.relationStyleName,
effect="plain" }" @click="handleLayerStyleTypeChange">
class="style-button"
:class="{
'style-button-none': editDataInfoForm.relationStyleName,
}"
@click="handleLayerStyleTypeChange"
>
{{ {{
editDataInfoForm.relationStyleName editDataInfoForm.relationStyleName
? editDataInfoForm.relationStyleName ? editDataInfoForm.relationStyleName
: "点击选择样式" : "点击选择样式"
}} }}
</el-tag> </el-tag>
<el-button <el-button style="margin-left: 15px" :disabled="editDataInfoForm.relationStyleName === ''" @click="
style="margin-left: 15px" editDataInfoForm.relationStyleName = '';
:disabled="editDataInfoForm.relationStyleName === ''" editDataInfoForm.relationStyleId = '';
@click=" ">取消选择样式</el-button>
editDataInfoForm.relationStyleName = '';
editDataInfoForm.relationStyleId = '';
"
>取消选择样式</el-button
>
</div> </div>
<styleListDialogVue <styleListDialogVue :visible="styleDialogVisible" :$currentStyleId="editDataInfoForm.relationStyleId"
:visible="styleDialogVisible" @closeDialog="styleDialogVisible = false" @confirm="handleConfirm"></styleListDialogVue>
:$currentStyleId="editDataInfoForm.relationStyleId"
@closeDialog="styleDialogVisible = false"
@confirm="handleConfirm"
></styleListDialogVue>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="扩展字段" name="2"> <el-tab-pane label="扩展字段" name="2">
<div class="fn-btns"> <div class="fn-btns">
<el-button type="primary" class="btn" @click="addRow" <el-button type="primary" class="btn" @click="addRow">添加</el-button>
>添加</el-button <el-button type="danger" class="btn" @click="deleteRow">删除</el-button>
>
<el-button type="danger" class="btn" @click="deleteRow"
>删除</el-button
>
</div> </div>
<el-table <el-table max-height="400px" :data="extendTable" border @selection-change="handleSelectionChange">
max-height="400px" <el-table-column type="selection" width="50" align="center"></el-table-column>
:data="extendTable"
border
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="50"
align="center"
></el-table-column>
<el-table-column prop="field" label="字段名称"> <el-table-column prop="field" label="字段名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input v-model="scope.row.field" :disabled="!scope.row.isEdit"></el-input>
v-model="scope.row.field"
:disabled="!scope.row.isEdit"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="alias" label="别名"> <el-table-column prop="alias" label="别名">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input v-model="scope.row.alias" :disabled="!scope.row.isEdit"></el-input>
v-model="scope.row.alias"
:disabled="!scope.row.isEdit"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="value" label="字段值"> <el-table-column prop="value" label="字段值">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input v-model="scope.row.value" :disabled="!scope.row.isEdit"></el-input>
v-model="scope.row.value"
:disabled="!scope.row.isEdit"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="200"> <el-table-column label="操作" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button v-if="scope.row.isEdit" type="primary" icon="el-icon-success" size="mini"
v-if="scope.row.isEdit" @click="saveRow(scope.$index)">保存</el-button>
type="primary" <el-button v-if="scope.row.isEdit" type="warning" icon="el-icon-error" size="mini"
icon="el-icon-success" @click="cancelRow(scope.$index)">取消</el-button>
size="mini" <el-button v-if="!scope.row.isEdit" type="primary" icon="el-icon-edit" size="mini"
@click="saveRow(scope.$index)" @click="editRow(scope.$index)">编辑</el-button>
>保存</el-button <el-button v-if="!scope.row.isEdit" type="danger" icon="el-icon-delete-solid" size="mini"
> @click="deleteRow(scope.$index)">删除</el-button>
<el-button
v-if="scope.row.isEdit"
type="warning"
icon="el-icon-error"
size="mini"
@click="cancelRow(scope.$index)"
>取消</el-button
>
<el-button
v-if="!scope.row.isEdit"
type="primary"
icon="el-icon-edit"
size="mini"
@click="editRow(scope.$index)"
>编辑</el-button
>
<el-button
v-if="!scope.row.isEdit"
type="danger"
icon="el-icon-delete-solid"
size="mini"
@click="deleteRow(scope.$index)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -226,22 +111,13 @@
<el-tab-pane label="字段配置" v-if="showFieldExtend()" name="3"> <el-tab-pane label="字段配置" v-if="showFieldExtend()" name="3">
<div class="field-box"> <div class="field-box">
<div class="field-filter"> <div class="field-filter">
<el-input <el-input class="keyword-input" placeholder="请输入搜索字段" v-model="fieldValue" clearable>
class="keyword-input"
placeholder="请输入搜索字段"
v-model="fieldValue"
clearable
>
</el-input> </el-input>
<el-button class="search-btn">搜索</el-button> <el-button class="search-btn">搜索</el-button>
</div> </div>
</div> </div>
<el-table max-height="400px" :data="fieldsTable" border> <el-table max-height="400px" :data="fieldsTable" border>
<el-table-column <el-table-column type="index" width="50" align="center"></el-table-column>
type="index"
width="50"
align="center"
></el-table-column>
<el-table-column prop="field" label="字段名称"> <el-table-column prop="field" label="字段名称">
</el-table-column> </el-table-column>
<el-table-column prop="fieldName" label="字段别名"> <el-table-column prop="fieldName" label="字段别名">
@ -251,18 +127,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="fieldType" label="字段类型"> <el-table-column prop="fieldType" label="字段类型">
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="isShow" label="支持查询" width="80" align="center">
prop="isShow"
label="支持查询"
width="80"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox <el-checkbox v-model="scope.row.isShow" :true-label="1" :false-label="0"></el-checkbox>
v-model="scope.row.isShow"
:true-label="1"
:false-label="0"
></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -271,34 +138,20 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button> <el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="saveOrUpdateLayer" <el-button type="primary" @click="saveOrUpdateLayer">确 定</el-button>
>确 定</el-button
>
</div> </div>
</el-dialog> </el-dialog>
<div class="keyword-filter"> <div class="keyword-filter">
<el-input <el-input class="keyword-input" placeholder="请输入内容" v-model="keyword" clearable>
class="keyword-input"
placeholder="请输入内容"
v-model="keyword"
clearable
>
</el-input> </el-input>
<el-button class="search-btn">搜索</el-button> <el-button class="search-btn">搜索</el-button>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<el-table :data="tableData" stripe style="width: 100%"> <el-table :data="tableData" stripe style="width: 100%">
<el-table-column <el-table-column type="index" :index="(index) =>
type="index" index + (pageOptions.pageNum - 1) * pageOptions.pageSize + 1
:index=" " label="序号" width="50" header-align="center"></el-table-column>
(index) =>
index + (pageOptions.pageNum - 1) * pageOptions.pageSize + 1
"
label="序号"
width="50"
header-align="center"
></el-table-column>
<el-table-column prop="id" label="图层资源目录编号" width="350"> <el-table-column prop="id" label="图层资源目录编号" width="350">
</el-table-column> </el-table-column>
<el-table-column prop="serviceNameAlias" label="图层资源名称"> <el-table-column prop="serviceNameAlias" label="图层资源名称">
@ -307,28 +160,13 @@
<el-table-column prop="createUser" label="创建人"> </el-table-column> <el-table-column prop="createUser" label="创建人"> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
size="mini" <el-button size="mini" type="danger" @click="handleDelete(scope.row)">删除</el-button>
@click="handleEdit(scope.$index, scope.row)"
>编辑</el-button
>
<el-button
size="mini"
type="danger"
@click="handleDelete(scope.row)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination background layout="prev, pager, next" :current-page.sync="pageOptions.pageNum"
background :total="pageOptions.total" :page-size="pageOptions.pageSize" @current-change="getLayerList">
layout="prev, pager, next"
:current-page.sync="pageOptions.pageNum"
:total="pageOptions.total"
:page-size="pageOptions.pageSize"
@current-change="getLayerList"
>
</el-pagination> </el-pagination>
</div> </div>
</el-container> </el-container>
@ -519,15 +357,15 @@ export default {
}); });
}, },
async saveOrUpdateLayer() { async saveOrUpdateLayer() {
const reg = /^(?=.{1,100}$)[\u4e00-\u9fa5\w:]+$/; // const reg = /^(?=.{1,100}$)[\u4e00-\u9fa5\w:./-;]+$/;
if (!reg.test(this.editDataInfoForm.serviceName)) { // if (!reg.test(this.editDataInfoForm.serviceName)) {
this.$message({ // this.$message({
type: "info", // type: "info",
message: // message:
"格式有误，目录名称仅支持中文、数字、字母、下划线、冒号，最大长度不超过100", // "格式有误，目录名称仅支持中文、数字、字母、下划线、冒号，最大长度不超过100",
}); // });
return; // return;
} // }
const params = { const params = {
...this.editDataInfoForm, ...this.editDataInfoForm,
extendData: JSON.stringify(this.extendTable), extendData: JSON.stringify(this.extendTable),

2
src/views/reservoir/safeOperation/js/mapUtils.js
View File

@ -46,7 +46,7 @@ const identifyLayerActions = {
queryUrl = url.split("maps/")[0].replace("map-", "data-"); queryUrl = url.split("maps/")[0].replace("map-", "data-");
} else if (layerName.split(";").length == 2 && layerName.includes(":")) { } else if (layerName.split(";").length == 2 && layerName.includes(":")) {
let dataServiceLayerInfo = layerName.split(";"); let dataServiceLayerInfo = layerName.split(";");
queryUrl = dataServiceLayerInfo[0]; queryUrl = dataServiceLayerInfo[0]+"/";
layerName = dataServiceLayerInfo[1]; layerName = dataServiceLayerInfo[1];
} }
let requestUrl = `${queryUrl}data/featureResults.rjson?returnContent=true`; let requestUrl = `${queryUrl}data/featureResults.rjson?returnContent=true`;

Write Preview
Loading…
Cancel
Save