Commit 018e5fe6 authored by 夏敏伟's avatar 夏敏伟

更新环境

parent 12515667
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
application.js
application.json
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
...@@ -22,9 +22,11 @@ var community_conf={ ...@@ -22,9 +22,11 @@ var community_conf={
//测试环境 //测试环境
// {name:"影像",url:"http://61.155.110.210:7008/mapurl/earth_image_geodetic/MapServer"}, // {name:"影像",url:"http://61.155.110.210:7008/mapurl/earth_image_geodetic/MapServer"},
// {name:"注记",url:"http://61.155.110.210:7008/mapurl/earth_image_anno_geodetic/MapServer"} // {name:"注记",url:"http://61.155.110.210:7008/mapurl/earth_image_anno_geodetic/MapServer"}
// // // 发布环境 // // // 发布环境 -- 20230718
{name:"影像",url:"http://170.2.229.218:5000/earth_image_geodetic/MapServer"}, // {name:"影像",url:"http://170.2.229.218:5000/earth_image_geodetic/MapServer"},
{name:"注记",url:"http://170.2.229.218:5000/earth_image_anno_geodetic/MapServer"} // {name:"注记",url:"http://170.2.229.218:5000/earth_image_anno_geodetic/MapServer"}
{name:"影像",url:"http://map.geoq.cn/arcgis/rest/services/ChinaOnlineCommunity_Mobile/MapServer"},
{name:"注记",url:"http://map.geoq.cn/arcgis/rest/services/ChinaOnlineCommunity_Mobile/MapServer"}
// {name:"影像",url:"mapurl/earth_image_geodetic/MapServer"}, // {name:"影像",url:"mapurl/earth_image_geodetic/MapServer"},
// {name:"注记",url:"mapurl/earth_image_anno_geodetic/MapServer"} // {name:"注记",url:"mapurl/earth_image_anno_geodetic/MapServer"}
//发布环境 //发布环境
......
{ {
"oracle": { "oracle": {
"user": "XWSQ", "user": "XWSQ",
"password": "XWSQ", "password": "xwsq",
"connectString": "170.2.229.213/helowin" "connectString": "192.168.168.110/helowin"
}, },
"port":"4085", "port":"4085",
"session_name":"xwsq.connect.sid", "session_name":"xwsq.connect.sid",
......
This diff is collapsed.
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
"log4js": "^3.0.6", "log4js": "^3.0.6",
"morgan": "~1.9.0", "morgan": "~1.9.0",
"oracle": "^0.4.1", "oracle": "^0.4.1",
"oracledb": "^2.3.0", "oracledb": "^6.0.3",
"request": "^2.88.0", "request": "^2.88.0",
"shapefile": "^0.6.6" "shapefile": "^0.6.6"
} }
......
...@@ -1173,7 +1173,6 @@ ...@@ -1173,7 +1173,6 @@
}, },
open3: function (item, n, dom) { open3: function (item, n, dom) {
debugger
$("#layui3").css("display", "none"); $("#layui3").css("display", "none");
if (item.show) { if (item.show) {
$(dom.srcElement).next().css("display", "block"); $(dom.srcElement).next().css("display", "block");
...@@ -1255,7 +1254,6 @@ ...@@ -1255,7 +1254,6 @@
setTimeout(() => { setTimeout(() => {
let zm=[]; let zm=[];
for (var i = 0; i < this.tree_list.length; i++) { //遍历本模块的一级树 for (var i = 0; i < this.tree_list.length; i++) { //遍历本模块的一级树
debugger;
console.log('treelist'+this.tree_list[i].children.length); console.log('treelist'+this.tree_list[i].children.length);
for(var k = 0; k < this.tree_list[i].children.length; k++) { for(var k = 0; k < this.tree_list[i].children.length; k++) {
console.log('treelist'+this.tree_list[i].children[k].length); console.log('treelist'+this.tree_list[i].children[k].length);
......
...@@ -131,7 +131,6 @@ module.exports = { ...@@ -131,7 +131,6 @@ module.exports = {
}, },
showphotos: function (item) { showphotos: function (item) {
var playsrc={data: []}; var playsrc={data: []};
debugger
array=item.split(","); array=item.split(",");
for(var j = 0; j <array.length ; j++ ) for(var j = 0; j <array.length ; j++ )
{ {
......
...@@ -164,11 +164,9 @@ module.exports = { ...@@ -164,11 +164,9 @@ module.exports = {
parent.vue_left.locate(item); parent.vue_left.locate(item);
}, },
showright: function (item,n, dom) { showright: function (item,n, dom) {
debugger
if(item.event=='showright'){ if(item.event=='showright'){
if(item.children.length>0){ if(item.children.length>0){
parent.vue_left.showright(item); parent.vue_left.showright(item);
debugger
if(item.children[0].name=='人民调解委员会'){ if(item.children[0].name=='人民调解委员会'){
item.children[0].name='兴卫村社区人民调解委员会'; item.children[0].name='兴卫村社区人民调解委员会';
} }
...@@ -183,7 +181,6 @@ module.exports = { ...@@ -183,7 +181,6 @@ module.exports = {
}, },
showphotos: function (items) { showphotos: function (items) {
var playsrc={data: []}; var playsrc={data: []};
debugger
for(var j = 0; j <items.length ; j++ ) for(var j = 0; j <items.length ; j++ )
{ {
playsrc.data.push({ src: items[j].src,alt:items[j].name}); playsrc.data.push({ src: items[j].src,alt:items[j].name});
......
...@@ -159,7 +159,6 @@ module.exports = { ...@@ -159,7 +159,6 @@ module.exports = {
}, },
showphotos: function (item) { showphotos: function (item) {
var playsrc={data: []}; var playsrc={data: []};
debugger
array=item.split(","); array=item.split(",");
for(var j = 0; j <array.length ; j++ ) for(var j = 0; j <array.length ; j++ )
{ {
......
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
mounted(){//挂载的时候执行 mounted(){//挂载的时候执行
var that=this; var that=this;
getByAjax("./rest/moduledataquery/gdgl",function(data){ getByAjax("./rest/moduledataquery/gdgl",function(data){
// debugger;
that.datax=JSON.parse(data[0].content); that.datax=JSON.parse(data[0].content);
}); });
} }
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<script> <script>
module.exports = { module.exports = {
data: function() { data: function() {
debugger;
return { return {
searchText:"" searchText:""
} }
...@@ -41,7 +40,6 @@ ...@@ -41,7 +40,6 @@
//this.dataxself=value; //this.dataxself=value;
//console.log(value); //console.log(value);
},get:function(){ },get:function(){
debugger;
return this.dataxself.data[0].data; return this.dataxself.data[0].data;
//console.log(this.dataxself); //console.log(this.dataxself);
} }
......
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
props:["dataxself"], props:["dataxself"],
methods:{ methods:{
show:function(item){ show:function(item){
debugger;
this.folderid=item.typeid; this.folderid=item.typeid;
getByAjax("./localx/areadetail/"+item.extenddata+"/"+item.id,data=>{ getByAjax("./localx/areadetail/"+item.extenddata+"/"+item.id,data=>{
this.obj=data[0]; this.obj=data[0];
......
...@@ -62,7 +62,6 @@ ...@@ -62,7 +62,6 @@
mounted(){//挂载的时候执行 mounted(){//挂载的时候执行
var that=this; var that=this;
getByAjax("./rest/moduledataquery/zaaq",function(data){ getByAjax("./rest/moduledataquery/zaaq",function(data){
debugger;
that.datax=JSON.parse(data[0].content); that.datax=JSON.parse(data[0].content);
}); });
} }
......
...@@ -89,6 +89,7 @@ function getByAjax(url, callback) { ...@@ -89,6 +89,7 @@ function getByAjax(url, callback) {
if (model.resultStatus.code == 200) { if (model.resultStatus.code == 200) {
callback(model.data); callback(model.data);
} else { } else {
// alert(url);
alert(model.resultStatus.msg); alert(model.resultStatus.msg);
} }
}); });
......
...@@ -191,7 +191,6 @@ var vue_top = new Vue({ ...@@ -191,7 +191,6 @@ var vue_top = new Vue({
$(".left-nav").css("display", "none"); $(".left-nav").css("display", "none");
} }
//控制右侧面板显示隐藏 //控制右侧面板显示隐藏
debugger
vue_right.currentView = (item.show ? (item.rightView) : ("")); vue_right.currentView = (item.show ? (item.rightView) : (""));
if(vue_right.currentView ==undefined || vue_right.currentView ==''){ if(vue_right.currentView ==undefined || vue_right.currentView ==''){
document.getElementById('rightvue').style.display = 'none'; document.getElementById('rightvue').style.display = 'none';
...@@ -568,6 +567,7 @@ function createSpecialTopicLayer() { ...@@ -568,6 +567,7 @@ function createSpecialTopicLayer() {
//查询业务数据 //查询业务数据
function getData(layer, i) { function getData(layer, i) {
getByAjax('./business/' + vue_top.businessLayers[i].http, data => { getByAjax('./business/' + vue_top.businessLayers[i].http, data => {
try {
for (var j = 0; j < data.length; j++) { for (var j = 0; j < data.length; j++) {
var polygon = null, symbolx; var polygon = null, symbolx;
if (vue_top.businessLayers[i].event == "building" && data[j].wkt) {//房屋 if (vue_top.businessLayers[i].event == "building" && data[j].wkt) {//房屋
...@@ -701,6 +701,10 @@ function getData(layer, i) { ...@@ -701,6 +701,10 @@ function getData(layer, i) {
} }
} }
vue_top.businessLayers[i].data = data; vue_top.businessLayers[i].data = data;
} catch (error) {
alert(vue_top.businessLayers[i].http);
alert(error);
}
}); });
} }
......
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
methods:{ methods:{
queryimg:function(index){ queryimg:function(index){
var data = []; var data = [];
debugger
if(index==1){ if(index==1){
data = this.photo; data = this.photo;
}else{ }else{
...@@ -146,7 +145,6 @@ ...@@ -146,7 +145,6 @@
mounted() { mounted() {
that=this; that=this;
getByAjax("../rest/queryphotos/"+str.id+"/11",result=>{ getByAjax("../rest/queryphotos/"+str.id+"/11",result=>{
debugger
that.photo=result.filter(item=>item.module==1); that.photo=result.filter(item=>item.module==1);
that.photohd=result.filter(item=>item.module==2); that.photohd=result.filter(item=>item.module==2);
......
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
} }
}, },
mounted() { mounted() {
debugger
that = this; that = this;
getByAjax("../rest/queryphotos/" + str.id + "/" + folderid, result => { getByAjax("../rest/queryphotos/" + str.id + "/" + folderid, result => {
that.photos = result; that.photos = result;
......
...@@ -8,6 +8,7 @@ var pool; ...@@ -8,6 +8,7 @@ var pool;
var poolconfig = Object.assign(oraConfig, {}); var poolconfig = Object.assign(oraConfig, {});
poolconfig.poolMax = 20; poolconfig.poolMax = 20;
poolconfig.queueRequests = true; poolconfig.queueRequests = true;
oracledb.initOracleClient();
oracledb.createPool(poolconfig, function (err, pl) { oracledb.createPool(poolconfig, function (err, pl) {
pool = pl; pool = pl;
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment