Porównaj commity

...

2 Commity

4 zmienionych plików z 15 dodań i 23 usunięć
  1. +1
    -1
      config/index.js
  2. +3
    -3
      package-lock.json
  3. +0
    -8
      src/api/login/index.js
  4. +11
    -11
      src/views/homestead/index.vue

+ 1
- 1
config/index.js Wyświetl plik

@@ -13,7 +13,7 @@ module.exports = {
"/api": { "/api": {
// 请求的目标主机 // 请求的目标主机
//target: 'http://116.255.223.226:8081/nsgk_test/', //target: 'http://116.255.223.226:8081/nsgk_test/',
target: 'http://localhost:8080/',
target: 'http://218.59.175.44:8081/nsgk_hc/',
//target: 'http://192.168.0.107:8080/', //target: 'http://192.168.0.107:8080/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {


+ 3
- 3
package-lock.json Wyświetl plik

@@ -4281,7 +4281,7 @@
"fastclick": { "fastclick": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz",
"integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==",
"integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=",
"dev": true "dev": true
}, },
"fastparse": { "fastparse": {
@@ -4436,7 +4436,7 @@
"font-awesome.css": { "font-awesome.css": {
"version": "4.7.2", "version": "4.7.2",
"resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz", "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz",
"integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA=="
"integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI="
}, },
"for-in": { "for-in": {
"version": "1.0.2", "version": "1.0.2",
@@ -12350,7 +12350,7 @@
"vue-html5-editor": { "vue-html5-editor": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz", "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz",
"integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==",
"integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=",
"dev": true "dev": true
}, },
"vue-lazyload": { "vue-lazyload": {


+ 0
- 8
src/api/login/index.js Wyświetl plik

@@ -1,7 +1,4 @@
import request from '@/utils/request' import request from '@/utils/request'
import { encrypt } from '@/utils/jsencrypt' // 公钥,私钥都声明在里面

const VUE_APP_ENABLE_SECRET = true; // 登录账密凭据加密


// 登录方法 // 登录方法
export function login(username, password, code, uuid) { export function login(username, password, code, uuid) {
@@ -11,11 +8,6 @@ export function login(username, password, code, uuid) {
code, code,
uuid uuid
} }
if(VUE_APP_ENABLE_SECRET)
{
data.username = encrypt(username);
data.password = encrypt(password);
}
return request({ return request({
url: '/login', url: '/login',
method: 'post', method: 'post',


+ 11
- 11
src/views/homestead/index.vue Wyświetl plik

@@ -2173,7 +2173,7 @@ export default {


var wmsSource = new ol.source.TileWMS({ var wmsSource = new ol.source.TileWMS({
//url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms', //url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms',
url: "http://116.255.223.226:8080/geoserver/nsgk_hc/wms",
url: "http://218.59.175.44:8080/geoserver/nsgk_hc/wms",
//url: 'http://localhost:8888/geoserver/mywork_mysql/wms', //url: 'http://localhost:8888/geoserver/mywork_mysql/wms',
params: { params: {
LAYERS: "nsgk_hc:nsgk_hc_all", LAYERS: "nsgk_hc:nsgk_hc_all",
@@ -2202,7 +2202,7 @@ export default {
title: "add Layer", title: "add Layer",
source: new ol.source.Vector({ source: new ol.source.Vector({
projection: projection, projection: projection,
// url: "http://116.255.223.226:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
// url: "http://218.59.175.44:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
// format: new ol.format.GeoJSON(), // format: new ol.format.GeoJSON(),
features: new ol.format.GeoJSON().readFeatures(data), features: new ol.format.GeoJSON().readFeatures(data),
}), }),
@@ -2244,7 +2244,7 @@ export default {
// title: "add Layer", // title: "add Layer",
// source: new ol.source.Vector({ // source: new ol.source.Vector({
// projection: projection, // projection: projection,
// url: "http://116.255.223.226:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
// url: "http://218.59.175.44:8081/nsgk_test/profile/geojson/huancui.json", //GeoJSON的文件路径,用户可以根据需求而改变
// format: new ol.format.GeoJSON(), // format: new ol.format.GeoJSON(),
// }), // }),
// style: new ol.style.Style({ // style: new ol.style.Style({
@@ -2264,7 +2264,7 @@ export default {
// title: "add huancui_zhen", // title: "add huancui_zhen",
// source: new ol.source.Vector({ // source: new ol.source.Vector({
// projection: projection, // projection: projection,
// url: "http://116.255.223.226:8081/nsgk_test/profile/geojson/huancui_zhen.json", //GeoJSON的文件路径,用户可以根据需求而改变
// url: "http://218.59.175.44:8081/nsgk_test/profile/geojson/huancui_zhen.json", //GeoJSON的文件路径,用户可以根据需求而改变
// format: new ol.format.GeoJSON(), // format: new ol.format.GeoJSON(),
// }), // }),
// style: new ol.style.Style({ // style: new ol.style.Style({
@@ -2701,7 +2701,7 @@ export default {
nongZt[i] = new ol.layer.Tile({ nongZt[i] = new ol.layer.Tile({
source: new ol.source.TileWMS({ source: new ol.source.TileWMS({
//url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms', //url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms',
url: "http://116.255.223.226:8080/geoserver/nsgk_hc/wms",
url: "http://218.59.175.44:8080/geoserver/nsgk_hc/wms",
//url: 'http://localhost:8888/geoserver/mywork_mysql/wms', //url: 'http://localhost:8888/geoserver/mywork_mysql/wms',
//url: 'http://localhost:8888/geoserver/new_shp/wms', //url: 'http://localhost:8888/geoserver/new_shp/wms',
params: { params: {
@@ -2728,7 +2728,7 @@ export default {
outputFormat: "application/json", outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值 //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
}; };
let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
let url_dw = "http://218.59.175.44:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?"; url_dw = url_dw + "?";
for (let key in param_dw) { for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&"; url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -2860,7 +2860,7 @@ export default {
delete_map[i] = new ol.layer.Tile({ delete_map[i] = new ol.layer.Tile({
source: new ol.source.TileWMS({ source: new ol.source.TileWMS({
//url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms', //url: 'http://192.168.31.150:8888/geoserver/mywork_mysql/wms',
url: "http://116.255.223.226:8080/geoserver/nsgk_hc/wms",
url: "http://218.59.175.44:8080/geoserver/nsgk_hc/wms",
//url: 'http://localhost:8888/geoserver/mywork_mysql/wms', //url: 'http://localhost:8888/geoserver/mywork_mysql/wms',
//url: 'http://localhost:8888/geoserver/new_shp/wms', //url: 'http://localhost:8888/geoserver/new_shp/wms',
params: { params: {
@@ -2888,7 +2888,7 @@ export default {
outputFormat: "application/json", outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值 //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
}; };
let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
let url_dw = "http://218.59.175.44:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?"; url_dw = url_dw + "?";
for (let key in param_dw) { for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&"; url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -3122,7 +3122,7 @@ export default {
outputFormat: "application/json", outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值 //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
}; };
let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
let url_dw = "http://218.59.175.44:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?"; url_dw = url_dw + "?";
for (let key in param_dw) { for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&"; url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -3289,7 +3289,7 @@ export default {
outputFormat: "application/json", outputFormat: "application/json",
//filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值 //filter: ol.format.filter.equalTo(t,e,r)//前者是属性名,后者是对应值
}; };
let url_dw = "http://116.255.223.226:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
let url_dw = "http://218.59.175.44:8080/geoserver/nsgk_hc/wfs"; //wfsurl;
url_dw = url_dw + "?"; url_dw = url_dw + "?";
for (let key in param_dw) { for (let key in param_dw) {
url_dw = url_dw + key + "=" + param_dw[key] + "&"; url_dw = url_dw + key + "=" + param_dw[key] + "&";
@@ -3497,7 +3497,7 @@ export default {
// location.host + // location.host +
// request.defaults.baseURL + // request.defaults.baseURL +
res.fileName; res.fileName;
console.log("历史" + this.houseInfoList.frontHouse); console.log("历史" + this.houseInfoList.frontHouse);
} else { } else {
return "图片上传失败"; return "图片上传失败";


Ładowanie…
Anuluj
Zapisz