Skip to content

Z
ZiBoYingJI
Commit 6c9e4708 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

大屏本地请求地址修改 搜素条件4个全部展示 本地运行报错处理

parent 6ff128c1
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 28 deletions
public/datav/env.html
View file @ 6c9e4708
...@@ -734,12 +734,12 @@ ...@@ -734,12 +734,12 @@
<!-- cookie --> <!-- cookie -->
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script> <script>
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
...@@ -993,13 +993,23 @@ const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:805 ...@@ -993,13 +993,23 @@ const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:805
}; };
gitem.id = id; gitem.id = id;
if(gitem.id === (pervItem && pervItem.id)){ // if(gitem.id === (pervItem && pervItem.id)){
gitem.select.style.display = 'none'; // gitem.select.style.display = 'none';
}else{ // }else{
gitem.select.style.display = 'block'; // gitem.select.style.display = 'block';
}; // };
gitem.select.dataset.type = gitem.type; gitem.select.dataset.type = gitem.type;
// 2024-12-18 添加逻辑，如果id为24（默认初始化时，且当前select的类型为area的，则将list置为空数组）
if(id === 24 && gitem.type === 'area'){
list = [{
name: "全部",
label: "全部",
id: id,
}]
}
!selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, { qf.UI.selectRender(gitem.select, list, {
'value':'id', 'value':'id',
......
public/datav/index.html
View file @ 6c9e4708
...@@ -892,12 +892,12 @@ ...@@ -892,12 +892,12 @@
<!-- cookie --> <!-- cookie -->
<script src="js/js.cookie.js"></script> <script src="js/js.cookie.js"></script>
<script> <script>
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
...@@ -1151,13 +1151,22 @@ ...@@ -1151,13 +1151,22 @@
}; };
gitem.id = id; gitem.id = id;
if(gitem.id === (pervItem && pervItem.id)){ // 2024-12-17 添加逻辑，如果id为24（默认初始化时，所有的下拉都显示出来。原来的area也不做id）
/*if(gitem.id === (pervItem && pervItem.id)){
gitem.select.style.display = 'none'; gitem.select.style.display = 'none';
}else{ }else{
gitem.select.style.display = 'block'; gitem.select.style.display = 'block';
}; };*/
gitem.select.dataset.type = gitem.type; gitem.select.dataset.type = gitem.type;
// 2024-12-17 添加逻辑，如果id为24（默认初始化时，且当前select的类型为area的，则将list置为空数组）
if(id === 24 && gitem.type === 'area'){
list = [{
name: "全部",
label: "全部",
id: id,
}]
}
!selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, { qf.UI.selectRender(gitem.select, list, {
'value':'id', 'value':'id',
......
public/datav/natural.html
View file @ 6c9e4708
...@@ -756,12 +756,12 @@ ...@@ -756,12 +756,12 @@
<script> <script>
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.3.180' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
...@@ -1015,13 +1015,22 @@ ...@@ -1015,13 +1015,22 @@
}; };
gitem.id = id; gitem.id = id;
if(gitem.id === (pervItem && pervItem.id)){ /*if(gitem.id === (pervItem && pervItem.id)){
gitem.select.style.display = 'none'; gitem.select.style.display = 'none';
}else{ }else{
gitem.select.style.display = 'block'; gitem.select.style.display = 'block';
}; };*/
gitem.select.dataset.type = gitem.type; gitem.select.dataset.type = gitem.type;
// 2024-12-18 添加逻辑，如果id为24（默认初始化时，且当前select的类型为area的，则将list置为空数组）
if(id === 24 && gitem.type === 'area'){
list = [{
name: "全部",
label: "全部",
id: id,
}]
}
!selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, { qf.UI.selectRender(gitem.select, list, {
'value':'id', 'value':'id',
......
public/datav/open-air.html
View file @ 6c9e4708
...@@ -345,9 +345,9 @@ ...@@ -345,9 +345,9 @@
} }
); );
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '218.56.105.134') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
// 请求 token 用 // 请求 token 用
......
public/datav/tailings.html
View file @ 6c9e4708
...@@ -421,9 +421,9 @@ ...@@ -421,9 +421,9 @@
//const host = location.protocol + '//' + window.location.host; //const host = location.protocol + '//' + window.location.host;
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '218.56.105.134') + ':8013';
const selfHost = 'http://192.168.3.38:8057'; const selfHost = 'http://192.168.2.11:8057';
......
public/datav/watersource.html
View file @ 6c9e4708
...@@ -863,12 +863,12 @@ ...@@ -863,12 +863,12 @@
<script src="js/highcharts.js"></script> <script src="js/highcharts.js"></script>
<script> <script>
const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.3.37' : '218.56.105.134') + ':8013'; const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.37' : '218.56.105.134') + ':8013';
// 小黄 // 小黄
//const host = location.protocol + '//' + (location.hostname === '192.168.3.38' ? '192.168.2.200' : '218.56.105.134') + ':8013'; //const host = location.protocol + '//' + (location.hostname === '192.168.2.11' ? '192.168.2.200' : '218.56.105.134') + ':8013';
const selfHost = location.hostname === '192.168.3.38' ? 'http://192.168.3.38:8057' : location.protocol + '//' + window.location.host; const selfHost = location.hostname === '192.168.2.11' ? 'http://192.168.2.11:8057' : location.protocol + '//' + window.location.host;
const token = Cookies.get('ELADMIN-TOEKN'); const token = Cookies.get('ELADMIN-TOEKN');
axios = axios.create({ axios = axios.create({
...@@ -1243,13 +1243,23 @@ ...@@ -1243,13 +1243,23 @@
}; };
gitem.id = id; gitem.id = id;
if(gitem.id === (pervItem && pervItem.id)){ /*if(gitem.id === (pervItem && pervItem.id)){
gitem.select.style.display = 'none'; gitem.select.style.display = 'none';
}else{ }else{
gitem.select.style.display = 'block'; gitem.select.style.display = 'block';
}; };*/
gitem.select.dataset.type = gitem.type; gitem.select.dataset.type = gitem.type;
// 2024-12-17 添加逻辑，如果id为24（默认初始化时，且当前select的类型为area的，则将list置为空数组）
if(id === 24 && gitem.type === 'area'){
list = [{
name: "全部",
label: "全部",
id: id,
}]
}
!selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, { qf.UI.selectRender(gitem.select, list, {
'value':'id', 'value':'id',
......
vue.config.js
View file @ 6c9e4708
...@@ -25,7 +25,7 @@ module.exports = { ...@@ -25,7 +25,7 @@ module.exports = {
devServer: { devServer: {
port: port, port: port,
host: VUE_APP_BASE_API && VUE_APP_BASE_API.split(/\/\/|:/).slice(-2)[0], host: VUE_APP_BASE_API && VUE_APP_BASE_API.split(/\/\/|:/).slice(-2)[0],
open: true, // open: true,
overlay: { overlay: {
warnings: false, warnings: false,
errors: true, errors: true,
......
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