From a7d306cb0fe6482251f9d4acdc29674ffc13a032 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 18 四月 2023 12:10:07 +0800
Subject: [PATCH] 底图切换
---
src/views/datamanage/metadataManage.vue | 8
src/views/datamanage/uploadmanage.vue | 7
src/components/mapol.vue | 53 ++++---
src/views/Synthesis/LeftMenu.vue | 32 ++++
src/components/mapsdk.vue | 37 +++--
src/views/datamanage/dataUpdata.vue | 35 +++-
src/views/datamanage/styleManage.vue | 3
src/components/Screen/mapsdk.vue | 87 ++++++-----
src/views/datamanage/SpatialData.vue | 2
src/components/Screen/bottom.vue | 67 +++++---
src/api/api.js | 4
src/views/Tools/LayerTree.vue | 35 +++-
src/views/datamanage/dictionaryManage.vue | 4
public/config/config.js | 3
src/views/datamanage/versionManage.vue | 3
src/views/Archive/dataApplication.vue | 2
src/views/datamanage/domainManage.vue | 5
src/views/Tools/AddOnlineMap.vue | 2
18 files changed, 244 insertions(+), 145 deletions(-)
diff --git a/public/config/config.js b/public/config/config.js
index 39af600..7ac397a 100644
--- a/public/config/config.js
+++ b/public/config/config.js
@@ -1,6 +1,9 @@
//var isWeb = location.hostname.indexOf("103.85.165.") > -1;
var isWeb = true;
+
+var is_production = false;//鍒ゆ柇鏄惁涓虹敓浜х幆澧�
+
var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.20.205' + ":8088";
// var webHost = isWeb ? "103.85.165.99" + ":8052" : '192.168.16.162' + ":12316";
diff --git a/src/api/api.js b/src/api/api.js
index a79f170..71b8abd 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -594,7 +594,7 @@
}
//鏁版嵁涓婁紶=鏌ヨ浠诲姟鐘舵��
export function dataUpload_selectMappers(params) {
- return request.get('/dataUpload/selectMappers', { params: params });
+ return service.get('/dataUpload/selectMappers', { params: params });
}
//鏁版嵁涓婁紶=鏌ヨ鎵�鏈夎〃
export function dataUpload_selectTabs(params) {
@@ -602,7 +602,7 @@
}
//鏁版嵁涓婁紶=鎻掑叆鏂囦欢
export function dataUpload_insertFiles(params) {
- return request.post('/dataUpload/insertFiles', params);
+ return service.post('/dataUpload/insertFiles', params);
}
//鏁版嵁涓婁紶=鏌ヨ瀛楁淇℃伅
export function dataUpload_selectFields(params) {
diff --git a/src/components/Screen/bottom.vue b/src/components/Screen/bottom.vue
index a8b94da..2e777e5 100644
--- a/src/components/Screen/bottom.vue
+++ b/src/components/Screen/bottom.vue
@@ -228,10 +228,15 @@
methods: {
ChangeBaseLayer(name) {
this.currYX = name
- Viewer.imageryLayers._layers[2].show = false
- Viewer.imageryLayers._layers[1].show = false
- // Viewer.imageryLayers._layers[2].show = false
- // Viewer.imageryLayers._layers[3].show = false
+
+ if (is_production) {
+ Viewer.imageryLayers._layers[1].show = false
+ Viewer.imageryLayers._layers[0].show = false
+ } else {
+ Viewer.imageryLayers._layers[1].show = false
+
+ }
+
if (yunxuanLayer) {
Viewer.imageryLayers.remove(yunxuanLayer);
yunxuanLayer = null
@@ -254,28 +259,30 @@
// true,
// ""
// )
- // var urls = "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=";
- // var tokne = "94a34772eb88317fcbf8428e10448561"
- // yunxuanLayer = Viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider({
- // url: urls + tokne,
- // layer: "tdtImgLayer",
- // style: "default",
- // format: "image/jpeg",
- // tileMatrixSetID: "GoogleMapsCompatible",
- // }))
+ var urls = "http://t0.tianditu.com/ter_w/wmts?service=wmts&request=GetTile&version=1.0.0&LAYER=ter&tileMatrixSet=w&TileMatrix={TileMatrix}&TileRow={TileRow}&TileCol={TileCol}&style=default&format=tiles&tk=";
+ var tokne = "94a34772eb88317fcbf8428e10448561"
+ if (is_production) {
+ var baseUrl_yx = window.sceneConfig.baseUrl_yx;
+ if (baseUrl_yx.indexOf('{host}') > -1) {
+ baseUrl_yx = baseUrl_yx.replace("{host}", iisHost)
+ }
-
- var baseUrl_yx = window.sceneConfig.baseUrl_yx;
- if (baseUrl_yx.indexOf('{host}') > -1) {
- baseUrl_yx = baseUrl_yx.replace("{host}", iisHost)
+ yunxuanLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: baseUrl_yx,
+ maximumLevel: 22,
+ })
+ );
+ } else {
+ yunxuanLayer = Viewer.imageryLayers.addImageryProvider(new Cesium.WebMapTileServiceImageryProvider({
+ url: urls + tokne,
+ layer: "tdtImgLayer",
+ style: "default",
+ format: "image/jpeg",
+ tileMatrixSetID: "GoogleMapsCompatible",
+ }))
}
- debugger
- yunxuanLayer = Viewer.imageryLayers.addImageryProvider(
- new Cesium.UrlTemplateImageryProvider({
- url: baseUrl_yx,
- maximumLevel: 22,
- })
- );
+
Viewer.imageryLayers.lowerToBottom(yunxuanLayer);//灏嗗浘灞傜Щ鍒版渶搴曞眰
Viewer.imageryLayers.raise(yunxuanLayer);//灏嗗浘灞備笂绉讳竴灞�
@@ -285,11 +292,17 @@
break
case "褰卞儚鍥�":
- Viewer.imageryLayers._layers[1].show = true
+
+ if (is_production) {
+ Viewer.imageryLayers._layers[0].show = true
+ }
break
case "娉ㄨ鍥�":
- Viewer.imageryLayers._layers[2].show = true
-
+ if (is_production) {
+ Viewer.imageryLayers._layers[1].show = true
+ } else {
+ Viewer.imageryLayers._layers[1].show = true
+ }
break
default:
break
diff --git a/src/components/Screen/mapsdk.vue b/src/components/Screen/mapsdk.vue
index 5121e48..5e80b3a 100644
--- a/src/components/Screen/mapsdk.vue
+++ b/src/components/Screen/mapsdk.vue
@@ -49,10 +49,13 @@
// function () { }
// )
window.sgworld = new SmartEarth.SGWorld("Centermapdiv", {
- url: SmartEarthRootUrl + "Workers/image/earth.jpg",
+
licenseServer: window.sceneConfig.licenseServer,
});
window.viewer = window.Viewer = window.sgworld._Viewer;
+ if (is_production) {
+ Viewer.imageryLayers.removeAll();
+ }
// Viewer.imageryLayers._layers[0].show = false
sgworld.Navigate.jumpTo({ //璺宠浆瑙嗚
destination: new Cesium.Cartesian3.fromDegrees(110, 32, 50000000)
@@ -67,49 +70,55 @@
})
}, 1000);
- // Viewer.imageryLayers.addImageryProvider(
- // new Cesium.UrlTemplateImageryProvider({
- // url: gaoDeBaseUrl[0].url,
- // })
- // )
- //
- var base_ulr = window.sceneConfig.baseUrl;
- if (base_ulr.indexOf('{host}') > -1) {
- base_ulr = base_ulr.replace("{host}", iisHost)
+ if (is_production) {
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+
+ })
+ );
+
+ var base_ulr_sl = window.sceneConfig.baseUrl_sl;
+ if (base_ulr_sl.indexOf('{host}') > -1) {
+ base_ulr_sl = base_ulr_sl.replace("{host}", iisHost)
+ }
+
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr_sl,
+
+ })
+ );
+
+ Viewer.imageryLayers._layers[1].show = false
+ } else {
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: gaoDeBaseUrl[0].url,
+ })
+ )
+
+ // Viewer.imageryLayers.addImageryProvider(
+ // new Cesium.UrlTemplateImageryProvider({
+ // url: gaoDeBaseUrl[1].url,
+ // })
+ // )
+ // Viewer.imageryLayers.addImageryProvider(
+ // new Cesium.UrlTemplateImageryProvider({
+ // url: gaoDeBaseUrl[2].url,
+ // })
+ // )
+ Viewer.imageryLayers._layers[1].show = false
}
- window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
- new Cesium.UrlTemplateImageryProvider({
- url: base_ulr,
- maximumLevel: 22,
- })
- );
- var base_ulr_sl = window.sceneConfig.baseUrl_sl;
- if (base_ulr_sl.indexOf('{host}') > -1) {
- base_ulr_sl = base_ulr_sl.replace("{host}", iisHost)
- }
- window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
- new Cesium.UrlTemplateImageryProvider({
- url: base_ulr_sl,
- maximumLevel: 22,
- })
- );
-
- Viewer.imageryLayers._layers[2].show = false
-
- // Viewer.imageryLayers.addImageryProvider(
- // new Cesium.UrlTemplateImageryProvider({
- // url: gaoDeBaseUrl[1].url,
- // })
- // )
- // Viewer.imageryLayers.addImageryProvider(
- // new Cesium.UrlTemplateImageryProvider({
- // url: gaoDeBaseUrl[2].url,
- // })
- // )
Viewer._enableInfoOrSelection = false
//鏄剧ずfps
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index ad45c74..4a78b1d 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -96,19 +96,23 @@
methods: {
init2DMap() {
- // var vectorLayer = new TileLayer({
- // source: new XYZ({
- // url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
- // }),
- // })
- // var imageLayer = new TileLayer({
- // source: new XYZ({
- // url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
- // }),
- // })
+ var layerBase = [];
+ if (!is_production) {
+ var vectorLayer = new TileLayer({
+ source: new XYZ({
+ url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+ }),
+ })
+ var imageLayer = new TileLayer({
+ source: new XYZ({
+ url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
+ }),
+ })
+ layerBase = [vectorLayer, imageLayer]
+ }
window.map = new Map({
target: "mapol",
- layers: [],
+ layers: layerBase,
view: new View({
center: [105.02, 34.9],
zoom: 4,
@@ -121,18 +125,23 @@
]),
interactions: defaultInteractions().extend([new DragRotateAndZoom()]),
})
- var base_ulr = window.sceneConfig.baseUrl;
- if (base_ulr.indexOf('{host}') > -1) {
- base_ulr = base_ulr.replace("{host}", iisHost)
+
+
+ if (is_production) {
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+ window.olBaseMapLayer = new TileLayer({
+ title: "楂樺痉鍦板浘",
+ source: new XYZ({
+ url: base_ulr,
+ wrapX: false
+ })
+ });
+ window.map.addLayer(window.olBaseMapLayer);
+
}
- window.olBaseMapLayer = new TileLayer({
- title: "楂樺痉鍦板浘",
- source: new XYZ({
- url: base_ulr,
- wrapX: false
- })
- });
- window.map.addLayer(window.olBaseMapLayer);
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 7528095..0efb01d 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -915,11 +915,16 @@
var webKey = "94a34772eb88317fcbf8428e10448561";
//鍦板浘鍒濆鍖�
window.sgworld = new SmartEarth.SGWorld("mapdiv", {
- url: SmartEarthRootUrl + "Workers/image/earth.jpg",
+
licenseServer: window.sceneConfig.licenseServer,
});
+
+
window.Viewer = window.sgworld._Viewer;
+ if (is_production) {
+ Viewer.imageryLayers.removeAll();
+ }
//瀹氫綅
// sgworld.Navigate.jumpTo({
// //璺宠浆瑙嗚
@@ -949,21 +954,23 @@
//寮�鍚繁搴︽娴�
// sgworld.Analysis.depthTestAgainstTerrain(true)
Viewer.scene.globe.depthTestAgainstTerrain = true;
-
-
- var base_ulr = window.sceneConfig.baseUrl;
- if (base_ulr.indexOf('{host}') > -1) {
- base_ulr = base_ulr.replace("{host}", iisHost)
+ if (is_production) {
+ var base_ulr = window.sceneConfig.baseUrl;
+ if (base_ulr.indexOf('{host}') > -1) {
+ base_ulr = base_ulr.replace("{host}", iisHost)
+ }
+ Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ maximumLevel: 9
+ })
+ );
+ window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: base_ulr,
+ })
+ );
}
-
- window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
- new Cesium.UrlTemplateImageryProvider({
- url: base_ulr,
- maximumLevel: 22,
- })
- );
-
-
diff --git a/src/views/Archive/dataApplication.vue b/src/views/Archive/dataApplication.vue
index 158843e..d790ce9 100644
--- a/src/views/Archive/dataApplication.vue
+++ b/src/views/Archive/dataApplication.vue
@@ -184,7 +184,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index d55d280..92f5dfd 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -2498,6 +2498,7 @@
}
if (std[0].length != 0) {
if (this.$store.state.pigCode) {
+
this.setPrjidWmsLayer(std[0])
} else {
@@ -2584,6 +2585,7 @@
}
},
setAddWmsLayer(res) {
+
var url = [];
for (var i in res) {
if (res[i].url) {
@@ -2669,6 +2671,7 @@
this.attributeData = []
var valadata = data.result
var laydomain = data1.result
+ this.optionx = data1.result
for (var i in valadata) {
if (valadata[i].showtype == 1) {
if (
@@ -2677,11 +2680,11 @@
) {
for (var j in laydomain) {
if (laydomain[j].domName == valadata[i].domainNa) {
- valadata[i].domainNa = laydomain[j].codeDesc
+ // valadata[i].domainNa = laydomain[j].codeDesc
}
}
}
- this.optionx.push(valadata[i])
+ // this.optionx.push(valadata[i])
this.attributeData.push(valadata[i])
}
}
@@ -2749,8 +2752,31 @@
var arr = {}
for (var i = (this.attributeData.length - 1); i >= 0; i--) {
var vla = this.attributeData[i]
- arr[vla.alias] = valste[vla.field]
+
+
+ if (vla.domainNa) {
+
+ var val = this.optionx.filter(res => {
+ if (res.domName == vla.domainNa && res.domCode == valste[vla.field]) {
+ return res;
+ }
+ })
+ var vlue = null
+ if (val.length > 0) {
+ vlue = val[0].codeDesc
+ } else {
+ vlue = ''
+ }
+ arr[vla.alias] = vlue
+ } else {
+ arr[vla.alias] = valste[vla.field]
+ }
}
+
+
+
+
+
arr['eventid'] = valste.eventid
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index d269f9d..156b600 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -297,7 +297,7 @@
window.BaseMapLayer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: map.urls,
- maximumLevel: 18,
+ maximumLevel: 22,
})
);
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index 4459ab7..7c365c5 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -218,7 +218,7 @@
import { Fill, Stroke, Style } from "ol/style.js";
import {
perms_selectLayers, inquiry_selectDomains, comprehensive_selectPubById,
- project_selectDirAll, project_selectByDirid
+ project_selectDirAll, project_selectByDirid, dataQuerySelectWktById
} from "../../api/api.js";
export default {
name: "tree",
@@ -803,7 +803,7 @@
}
},
- setAddLayers(res) {
+ async setAddLayers(res) {
if (res.serveType == "WMS") {
var resource = geoServerURl;
@@ -943,10 +943,11 @@
if (res.pubid) {
this.setQueryPubid(res);
} else {
+
var layer = Viewer.imageryLayers.addImageryProvider(
new Cesium.UrlTemplateImageryProvider({
url: url,
- maximumLevel: 18,
+ maximumLevel: 22,
})
);
layer.name = res.cnName;
@@ -994,15 +995,31 @@
} else {
var url = data.result.url;
+
if (res.url.indexOf("{host}") != -1) {
url = res.url.replace("{host}", iisHost);
}
- var layer = Viewer.imageryLayers.addImageryProvider(
- new Cesium.UrlTemplateImageryProvider({
- url: url,
- maximumLevel: 18,
- })
- );
+ var min = data.result.min;
+ var max = data.result.max;
+ var layer;
+ if (max > 0) {
+ layer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: url,
+ minimumLevel: min,
+ maximumLevel: max,
+
+ })
+ );
+ } else {
+ layer = Viewer.imageryLayers.addImageryProvider(
+ new Cesium.UrlTemplateImageryProvider({
+ url: url,
+ minimumLevel: min,
+ })
+ );
+ }
+
layer.name = res.cnName;
if (data.result.geom) {
diff --git a/src/views/datamanage/SpatialData.vue b/src/views/datamanage/SpatialData.vue
index 9d68832..6975923 100644
--- a/src/views/datamanage/SpatialData.vue
+++ b/src/views/datamanage/SpatialData.vue
@@ -179,7 +179,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100,200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index a3be7b5..1490915 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -3,6 +3,7 @@
class="subpage_Box"
v-loading="loading"
element-loading-background="rgba(0, 0, 0, 0.8)"
+ :element-loading-text="loadText"
>
<My-bread :list="[
`${$t('dataManage.dataManage')}`,
@@ -632,7 +633,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -1126,7 +1127,7 @@
@size-change="handleLoaderSizeChange"
@current-change="handleLoaderCurrentChange"
:current-page="listLoader.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listLoader.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count1"
@@ -1288,7 +1289,7 @@
@size-change="handleMetaSizeChange"
@current-change="handMetaCurrentChange"
:current-page="listMetaData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listMetaData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="listMetaData.count"
@@ -1610,6 +1611,7 @@
wareTableFlag: null,
insertWareList: null,
loading: false,
+ loadText: '',
dbTableData: [],
dialogVisible: false,
listLoader: {
@@ -2013,6 +2015,8 @@
},
//鑷姩鍖归厤纭
async setInsrtWareTable() {
+ this.loading = true;
+ this.loadText = "鏁版嵁鍏ュ簱涓�,璇风瓑寰�..."
if (this.tableWareThree.length != 0) {
for (var i in this.tableWareThree) {
var tabs = this.tableWareThree[i].tabs;
@@ -2031,20 +2035,22 @@
});
}
- this.loading = true;
+
const res = await dataUpload_insertFiles(
JSON.stringify(this.insertWareList)
);
- this.loading = false;
+
if (res.code != 200) {
this.$message.error("鏁版嵁鍏ュ簱澶辫触");
return;
}
- debugger
+
this.$message({
message: "鏁版嵁鍏ュ簱鎴愬姛",
type: "success",
});
+ this.loading = false;
+ this.loadText = ""
if (res.result.length > 0) {
this.warehouseDialog = true;
this.wareData = res.result;
@@ -2192,18 +2198,21 @@
}
}
}
-
+ this.loading = true;
var obj = {
dirid: this.formInline.dirid,
epsgCode: this.formInline.coordinateId,
path: this.formInline.path,
verid: this.formInline.verid,
};
+ this.loadText = "鏁版嵁鏄犲皠鏌ヨ涓�,璇风瓑寰�..."
//鏌ヨ鏄犲皠
const data = await dataUpload_selectMappers(obj);
if (data.code != 200) {
return this.$message.error("鏁版嵁鏄犲皠澶辫触");
}
+ this.loading = false;
+ this.loadText = " "
var std = [];
var result = data.result;
this.insertWareList = data.result;
@@ -2869,11 +2878,13 @@
},
//涓婁紶鏁版嵁鍒楄〃娓呭崟鍒濆鍖�
setStartWareTable() {
- this.listData = {
- pageIndex: 1,
- pageSize: 10,
- name: null,
- };
+ // this.listData = {
+ // pageIndex: 1,
+ // pageSize: 10,
+ // name: null,
+ // };
+ this.listData.pageIndex = 1;
+ this.listData.name = null;
this.getAllWareTable();
},
//鑾峰彇鏁版嵁涓婁紶鍒楄〃娓呭崟
diff --git a/src/views/datamanage/dictionaryManage.vue b/src/views/datamanage/dictionaryManage.vue
index 6ed0f2b..8285579 100644
--- a/src/views/datamanage/dictionaryManage.vue
+++ b/src/views/datamanage/dictionaryManage.vue
@@ -214,7 +214,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -731,7 +731,7 @@
this.$message.error("鍒犻櫎澶辫触");
}
this.listData.pageIndex = 1;
- this.listData.pageSize = 10;
+
this.startQueryNameData();
this.$message({
type: "success",
diff --git a/src/views/datamanage/domainManage.vue b/src/views/datamanage/domainManage.vue
index 11b0249..b40592f 100644
--- a/src/views/datamanage/domainManage.vue
+++ b/src/views/datamanage/domainManage.vue
@@ -172,7 +172,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -590,13 +590,14 @@
std.push(this.multipleSelection[i].id);
}
deleteDomain({ ids: std.toString() }).then((res) => {
- console.log(res);
+
if (res.code == 200) {
this.$message({
type: "success",
message: "鍒犻櫎鎴愬姛!",
});
this.multipleSelection = [];
+ this.listData.pageIndex = 1;
getSingleTab(this.listData).then((res) => {
setTimeout(() => {
this.tableData = res.result;
diff --git a/src/views/datamanage/metadataManage.vue b/src/views/datamanage/metadataManage.vue
index 38d2227..5bef34d 100644
--- a/src/views/datamanage/metadataManage.vue
+++ b/src/views/datamanage/metadataManage.vue
@@ -337,7 +337,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -601,7 +601,7 @@
@size-change="handleLoaderSizeChange"
@current-change="handleLoaderCurrentChange"
:current-page="listLoader.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listLoader.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count1"
@@ -770,7 +770,7 @@
@size-change="handleMetaSizeChange"
@current-change="handMetaCurrentChange"
:current-page="listMetaData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listMetaData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="listMetaData.count"
@@ -1566,7 +1566,7 @@
message: "鍒犻櫎鎴愬姛!",
})
this.multipleSelection = []
- this.listData.pageSize = 10
+ // this.listData.pageSize = 10
this.listData.pageIndex = 1
this.getMetaData()
} else {
diff --git a/src/views/datamanage/styleManage.vue b/src/views/datamanage/styleManage.vue
index bb70694..a468052 100644
--- a/src/views/datamanage/styleManage.vue
+++ b/src/views/datamanage/styleManage.vue
@@ -190,7 +190,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50,100,200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -1261,6 +1261,7 @@
message: "鍒犻櫎鎴愬姛锛�",
type: "success",
});
+ this.listData.pageIndex = 1;
this.getRoleTabelData();
} else {
this.$message({
diff --git a/src/views/datamanage/uploadmanage.vue b/src/views/datamanage/uploadmanage.vue
index c61aef4..38f9a90 100644
--- a/src/views/datamanage/uploadmanage.vue
+++ b/src/views/datamanage/uploadmanage.vue
@@ -911,17 +911,17 @@
if (this.active == "first") {
this.listData = {
pageIndex: 1,
- pageSize: 100,
+ pageSize: 10,
count: 0
}
- this.showPageSize = [100, 200, 500, 1000]
+ this.showPageSize = [10, 50, 100, 200]
} else {
this.listData = {
pageIndex: 1,
pageSize: 10,
count: 0
}
- this.showPageSize = [10, 20, 50, 100]
+ this.showPageSize = [10, 50, 100, 200]
}
this.formInline.type = this.typeOption[0].value;
@@ -978,6 +978,7 @@
async getTableData() {
this.tableData = [];
this.listData.count = 0;
+ this.listData.pageIndex = 1;
if (this.active == "first") {
this.listData.depcode = this.formInline.depid;
diff --git a/src/views/datamanage/versionManage.vue b/src/views/datamanage/versionManage.vue
index 4efbbaf..6c2ad6d 100644
--- a/src/views/datamanage/versionManage.vue
+++ b/src/views/datamanage/versionManage.vue
@@ -183,7 +183,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
+ :page-sizes="[10, 50, 100, 200]"
:page-size="listData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="count"
@@ -775,6 +775,7 @@
message: "鍒犻櫎鎴愬姛锛�",
type: "success",
});
+ this.listData.pageIndex = 1;
this.getRoleTabelData();
} else {
this.$message({
--
Gitblit v1.9.3