From 71ac571768baab6ca36057be77075b80cfe74739 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 29 Jul 2022 15:25:21 +0800
Subject: [PATCH] 地址更换
---
src/views/reservoir/index.vue | 260 +++++++++++++++++++------------------------
public/retail/sitepopup/js/rain.js | 8
public/retail/sitepopup/js/river.js | 4
src/views/login/index.vue | 2
src/views/riskEarlyWarning/mediumOrSmallRivers.vue | 4
src/router/axios.js | 7
src/components/dialog-search/index.vue | 8 -
public/retail/popup/js/reservoirWater.js | 2
src/views/riskEarlyWarning/bigRivers.vue | 4
public/retail/popup/js/reservoir.js | 10
10 files changed, 135 insertions(+), 174 deletions(-)
diff --git a/public/retail/popup/js/reservoir.js b/public/retail/popup/js/reservoir.js
index d067f48..82ed4df 100644
--- a/public/retail/popup/js/reservoir.js
+++ b/public/retail/popup/js/reservoir.js
@@ -134,7 +134,7 @@
// 获取所有数据
function getData () {
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selectInfo',
+ url: 'http://10.36.98.39:85/rsvrr/selectInfo',
type: 'POST',
data: {
stcd: code
@@ -147,7 +147,7 @@
})
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selectTinfo',
+ url: 'http://10.36.98.39:85/rsvrr/selectTinfo',
type: 'POST',
data: {
stcd: code
@@ -230,7 +230,7 @@
function capacityCurve () {
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selLists',
+ url: 'http://10.36.98.39:85/rsvrr/selLists',
type: 'POST',
data: {
stcd: code
@@ -337,7 +337,7 @@
function eightShowPie () {
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selList',
+ url: 'http://10.36.98.39:85/rsvrr/selList',
type: 'POST',
dataType: 'json',
data: {
@@ -486,7 +486,7 @@
eightendTime = MonthLastDay.getFullYear() + '-' + M + '-' + MonthLastDay.getDate()
}
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selectRsvrList',
+ url: 'http://10.36.98.39:85/rsvrr/selectRsvrList',
type: 'POST',
dataType: 'json',
data: {
diff --git a/public/retail/popup/js/reservoirWater.js b/public/retail/popup/js/reservoirWater.js
index 2e4f720..0678113 100644
--- a/public/retail/popup/js/reservoirWater.js
+++ b/public/retail/popup/js/reservoirWater.js
@@ -111,7 +111,7 @@
eightendTime = MonthLastDay.getFullYear() + '-' + M + '-' + MonthLastDay.getDate()
}
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selectRiverList',
+ url: 'http://10.36.98.39:85/rsvrr/selectRiverList',
type: 'POST',
dataType: 'json',
data: {
diff --git a/public/retail/sitepopup/js/rain.js b/public/retail/sitepopup/js/rain.js
index 05300d3..79024c2 100644
--- a/public/retail/sitepopup/js/rain.js
+++ b/public/retail/sitepopup/js/rain.js
@@ -176,7 +176,7 @@
function rainShowPie (startTime, endTime, sd) {
$.ajax({
- url: ' http://192.168.0.110:85/regionWeight/regionweight/selectDayStation',
+ url: 'http://10.36.98.39:85/regionWeight/regionweight/selectDayStation',
type: 'post',
dataType: 'json',
jsonp: 'callback',
@@ -334,7 +334,7 @@
}
$.ajax({
- url: ' http://192.168.0.110:85/regionWeight/regionweight/selectStation',
+ url: 'http://10.36.98.39:85/regionWeight/regionweight/selectStation',
type: 'post',
dataType: 'json',
jsonp: 'callback',
@@ -435,7 +435,7 @@
// 特征雨量---查询
function featuresShowInfo () {
$.ajax({
- url: ' http://192.168.0.110:85/regionWeight/regionweight/selectPptnTz',
+ url: 'http://10.36.98.39:85/regionWeight/regionweight/selectPptnTz',
type: 'post',
async: false,
dataType: 'json',
@@ -470,7 +470,7 @@
// 基础信息---查询
function rainBasicShowInfo () {
$.ajax({
- url: ' http://192.168.0.110:85/stbprpb/selectInfo',
+ url: 'http://10.36.98.39:85/stbprpb/selectInfo',
type: 'post',
async: false,
dataType: 'json',
diff --git a/public/retail/sitepopup/js/river.js b/public/retail/sitepopup/js/river.js
index 6c44785..5f8bbd2 100644
--- a/public/retail/sitepopup/js/river.js
+++ b/public/retail/sitepopup/js/river.js
@@ -125,7 +125,7 @@
// 基础信息---查询
function basicShowInfo () {
$.ajax({
- url: ' http://192.168.0.110:85/stbprpb/selectInfo',
+ url: 'http://10.36.98.39:85/stbprpb/selectInfo',
type: 'post',
async: false,
dataType: 'json',
@@ -193,7 +193,7 @@
eightendTime = MonthLastDay.getFullYear() + '-' + M + '-' + MonthLastDay.getDate()
}
$.ajax({
- url: ' http://192.168.0.110:85/rsvrr/selectRiverList',
+ url: 'http://10.36.98.39:85/rsvrr/selectRiverList',
type: 'POST',
dataType: 'json',
data: {
diff --git a/src/components/dialog-search/index.vue b/src/components/dialog-search/index.vue
index 6ff5f3e..da4ebb1 100644
--- a/src/components/dialog-search/index.vue
+++ b/src/components/dialog-search/index.vue
@@ -88,10 +88,6 @@
label: '南丰县'
},
{
- value: '吉水县',
- label: '吉水县'
- },
- {
value: '黎川县',
label: '黎川县'
},
@@ -118,10 +114,6 @@
{
value: '资溪县',
label: '资溪县'
- },
- {
- value: '井冈山市',
- label: '井冈山市'
}
],
searchKindValue: '',
diff --git a/src/router/axios.js b/src/router/axios.js
index e7d4fe5..10db7cd 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -8,9 +8,10 @@
import axios from 'axios'
const service = axios.create({
- // baseURL: ' http://192.168.0.110:85',
- // baseURL: ' http://192.168.0.110:85',
- baseURL: ' http://192.168.0.110:85',
+ // baseURL: 'http://10.36.98.39:85',
+ // baseURL: 'http://10.36.98.39:85',
+ // http://10.36.98.39:85
+ baseURL: 'http://10.36.98.39:85',
timeout: 600000 // request timeout
})
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b866778..6742cf6 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -64,7 +64,7 @@
var that = this
this.newAxios = axios.create({
- baseURL: ' http://192.168.0.110:85',
+ baseURL: 'http://10.36.98.39:85',
timeout: 600000,
headers: {
Authorization: 'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
diff --git a/src/views/reservoir/index.vue b/src/views/reservoir/index.vue
index 7c93e59..8faafc4 100644
--- a/src/views/reservoir/index.vue
+++ b/src/views/reservoir/index.vue
@@ -2,202 +2,155 @@
* @Author: Morpheus
* @Date: 2021-05-06 16:10:30
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-11-01 15:40:19
+ * @Last Modified time: 2022-07-21 17:48:24
*/
<template>
<el-card class="reservoir-box">
<!-- 头部 -->
- <div v-show='boxShow'
- class="header">
-
- <el-radio v-model="newOrCustomValue"
- @change="newOrCustomValueChange"
- label="最新">最新</el-radio>
- <el-radio v-model="newOrCustomValue"
- @change="newOrCustomValueChange"
- label="自定义">自定义</el-radio>
-
+ <div v-show="boxShow" class="header">
+ <el-radio v-model="newOrCustomValue" @change="newOrCustomValueChange" label="最新">最新</el-radio>
+ <el-radio v-model="newOrCustomValue" @change="newOrCustomValueChange" label="自定义">自定义</el-radio>
</div>
<!-- 搜索条件等 -->
- <div v-show="realOrCustom && boxShow"
- class="search-condition">
- <el-date-picker v-model="customTime"
- type="datetimerange"
- format="yyyy-MM-dd HH"
- :picker-options="pickerOptions"
- range-separator="至"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
- align="right"
- size="small"
- :editable="false"
- @change="pickerDateChange">
- </el-date-picker>
- <el-button size="small"
- type="primary"
- @click="searchCustom"
- icon="el-icon-search">查询</el-button>
+ <div v-show="realOrCustom && boxShow" class="search-condition">
+ <el-date-picker
+ v-model="customTime"
+ type="datetimerange"
+ format="yyyy-MM-dd HH"
+ :picker-options="pickerOptions"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ align="right"
+ size="small"
+ :editable="false"
+ @change="pickerDateChange"
+ ></el-date-picker>
+ <el-button size="small" type="primary" @click="searchCustom" icon="el-icon-search">查询</el-button>
</div>
- <div v-show='boxShow'
- class="reservoir-content"
- v-loading="loading">
+ <div v-show="boxShow" class="reservoir-content" v-loading="loading">
<!-- 文字概况 -->
<div class="text-overview">
- <p v-html="textarea"
- @click="retailOpen($event)"></p>
+ <p v-html="textarea" @click="retailOpen($event)"></p>
</div>
<div class="statistics">
<div>
超汛限水位：
- <el-button @click="openDialog('yj')"
- type="danger"
- size="small">
- {{ yjNum }}
- </el-button>
+ <el-button @click="openDialog('yj')" type="danger" size="small">{{ yjNum }}</el-button>
</div>
<div>
正常水位：
- <el-button @click="openDialog('zc')"
- type="success"
- size="small">
- {{ zcNum }}
- </el-button>
+ <el-button @click="openDialog('zc')" type="success" size="small">{{ zcNum }}</el-button>
</div>
</div>
</div>
- <div v-show="reservoirDetailPopupFlag"
- class="reservoir-detail-popup"
- id="reservoirDetailPopup">
+ <div
+ v-show="reservoirDetailPopupFlag"
+ class="reservoir-detail-popup"
+ id="reservoirDetailPopup"
+ >
<ul v-html="detailPopupContent"></ul>
</div>
- <layerControl ref='layer-control'
- :legendsDetail="legendData"></layerControl>
+ <layerControl ref="layer-control" :legendsDetail="legendData"></layerControl>
- <el-dialog title=""
- :visible.sync="dialogVisible"
- width="width"
- :modal="false"
- :modal-append-to-body="false"
- :fullscreen="true">
+ <el-dialog
+ title
+ :visible.sync="dialogVisible"
+ width="width"
+ :modal="false"
+ :modal-append-to-body="false"
+ :fullscreen="true"
+ >
<!-- 数据表格 -->
- <Dialog-search slot="title"
- :yjOrZc="yjOrZc"
- :yjData="yjData"
- :zcData="zcData"
- :baseData="false"
- @changeDialogTable="changeTable"
- @exportParent="exportExcel"
- ref="dialogSearch"></Dialog-search>
+ <Dialog-search
+ slot="title"
+ :yjOrZc="yjOrZc"
+ :yjData="yjData"
+ :zcData="zcData"
+ :baseData="false"
+ @changeDialogTable="changeTable"
+ @exportParent="exportExcel"
+ ref="dialogSearch"
+ ></Dialog-search>
<div class="dialog-data-table">
- <el-table :data="
+ <el-table
+ :data="
tableData.slice(
(currpage - 1) * pagesize,
currpage * pagesize
)
"
- @sort-change="onSortChange"
- style="width: 100%">
- <el-table-column align="center"
- prop="ind"
- label="序号"
- width="60">
- </el-table-column>
- <el-table-column align="center"
- prop="STCD"
- label="站码">
- </el-table-column>
- <el-table-column align="center"
- prop="STNM"
- label="站名">
- </el-table-column>
- <el-table-column align="center"
- prop="ADDVNM"
- label="行政区">
- </el-table-column>
- <el-table-column align="center"
- prop="TM"
- label="时间"
- width="180">
- </el-table-column>
- <el-table-column align="center"
- prop="FSLTDZ"
- sortable='custom'
- label="汛限水位(m)">
- </el-table-column>
- <el-table-column align="center"
- prop="RZ"
- sortable='custom'
- label="实时水位(m)">
- </el-table-column>
- <el-table-column align="center"
- prop="RZchange"
- label="昨日水位对比(m)"
- v-if="!realOrCustom">
- </el-table-column>
+ @sort-change="onSortChange"
+ style="width: 100%"
+ >
+ <el-table-column align="center" prop="ind" label="序号" width="60"></el-table-column>
+ <el-table-column align="center" prop="STCD" label="站码"></el-table-column>
+ <el-table-column align="center" prop="STNM" label="站名"></el-table-column>
+ <el-table-column align="center" prop="ADDVNM" label="行政区"></el-table-column>
+ <el-table-column align="center" prop="TM" label="时间" width="180"></el-table-column>
+ <el-table-column align="center" prop="FSLTDZ" sortable="custom" label="汛限水位(m)"></el-table-column>
+ <el-table-column align="center" prop="RZ" sortable="custom" label="实时水位(m)"></el-table-column>
+ <el-table-column
+ align="center"
+ prop="RZchange"
+ label="昨日水位对比(m)"
+ v-if="!realOrCustom"
+ ></el-table-column>
- <el-table-column align="center"
- label="趋势"
- v-if="!realOrCustom">
+ <el-table-column align="center" label="趋势" v-if="!realOrCustom">
<template slot-scope="scope">
- <img :src="scope.row.icon"
- style="height: 20px;"
- alt="">
+ <img :src="scope.row.icon" style="height: 20px;" alt />
</template>
</el-table-column>
- <el-table-column align="center"
- sortable='custom'
- label="超汛限水位(m)"
- prop="limited">
- </el-table-column>
+ <el-table-column
+ align="center"
+ sortable="custom"
+ label="超汛限水位(m)"
+ prop="limited"
+ ></el-table-column>
- <el-table-column align="center"
- sortable='custom'
- label="蓄水量(10⁶m³)"
- prop="W">
- </el-table-column>
+ <el-table-column align="center" sortable="custom" label="蓄水量(10⁶m³)" prop="W"></el-table-column>
- <el-table-column align="center"
- sortable='custom'
- label="蓄满率(%)"
- prop="XML">
- </el-table-column>
+ <el-table-column align="center" sortable="custom" label="蓄满率(%)" prop="XML"></el-table-column>
<!-- <el-table-column align="center"
sortable='custom'
label="变幅(m)"
prop="change"
v-if="realOrCustom">
- </el-table-column> -->
+ </el-table-column>-->
</el-table>
<div ref="tablePagination">
- <el-pagination :pager-count="5"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- background
- :page-sizes="[20, 40, 60, 100]"
- layout="sizes, prev, pager, next"
- :current-page="currpage"
- :page-size="pagesize"
- :total="tableData.length">
- </el-pagination>
+ <el-pagination
+ :pager-count="5"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ background
+ :page-sizes="[20, 40, 60, 100]"
+ layout="sizes, prev, pager, next"
+ :current-page="currpage"
+ :page-size="pagesize"
+ :total="tableData.length"
+ ></el-pagination>
</div>
</div>
</el-dialog>
- <el-dialog :title="retailTitle"
- :visible.sync="retailShowFlag"
- width="width"
- :modal="false"
- :modal-append-to-body="false"
- :fullscreen="true"
- class="retail-popup">
- <iframe :src="retailSrc"
- frameborder="0"></iframe>
+ <el-dialog
+ :title="retailTitle"
+ :visible.sync="retailShowFlag"
+ width="width"
+ :modal="false"
+ :modal-append-to-body="false"
+ :fullscreen="true"
+ class="retail-popup"
+ >
+ <iframe :src="retailSrc" frameborder="0"></iframe>
</el-dialog>
</el-card>
</template>
@@ -665,13 +618,28 @@
this.reservoirIconLayer.getSource().clear()
this.reservoirIconLayerYJ.getSource().clear()
},
+ // 大型水库放前面
+ sortArr (array) {
+ var arr = []
+
+ array.forEach((item, index) => {
+ if (item.STNM.indexOf('洪门') != -1 || item.STNM.indexOf('廖坊') != -1) {
+ arr.concat(array.splice(index, 1))
+ }
+ })
+
+ arr.concat(array)
+
+ return arr
+ },
// 打开弹框
openDialog (val) {
this.yjOrZc = val
+
if (val == 'yj') {
- this.tableData = this.yjData
+ this.tableData = this.sortArr(this.yjData)
} else {
- this.tableData = this.zcData
+ this.tableData = this.sortArr(this.zcData)
}
this.$refs.dialogSearch.inputOrSelectClear()
this.dialogVisible = true
diff --git a/src/views/riskEarlyWarning/bigRivers.vue b/src/views/riskEarlyWarning/bigRivers.vue
index d82109a..b2e0509 100644
--- a/src/views/riskEarlyWarning/bigRivers.vue
+++ b/src/views/riskEarlyWarning/bigRivers.vue
@@ -184,7 +184,7 @@
<el-upload
ref="uploadExcel"
- action=" http://192.168.0.110:85/bigriver/import-bgr"
+ action="http://10.36.98.39:85/bigriver/import-bgr"
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
:before-upload="beforeUploadFile"
:on-preview="handlePreview"
@@ -440,7 +440,7 @@
exportWordData: {},
dataType: '实时',
- upload_url: ' http://192.168.0.110:85/mountainrain/import-bgr',
+ upload_url: 'http://10.36.98.39:85/mountainrain/import-bgr',
fileList: [],
// 是否显示时间搜索
boxShow: false,
diff --git a/src/views/riskEarlyWarning/mediumOrSmallRivers.vue b/src/views/riskEarlyWarning/mediumOrSmallRivers.vue
index ce400c6..b927f58 100644
--- a/src/views/riskEarlyWarning/mediumOrSmallRivers.vue
+++ b/src/views/riskEarlyWarning/mediumOrSmallRivers.vue
@@ -174,7 +174,7 @@
<el-upload
ref="uploadExcel"
- action=" http://192.168.0.110:85/smariver/import-mgr"
+ action="http://10.36.98.39:85/smariver/import-mgr"
accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
:before-upload="beforeUploadFile"
:on-preview="handlePreview"
@@ -408,7 +408,7 @@
exportWordData: {},
dataType: '实时',
- upload_url: ' http://192.168.0.110:85/smariver/import-mgr',
+ upload_url: 'http://10.36.98.39:85/smariver/import-mgr',
fileList: [],
// 是否显示时间搜索
realShow: true,
--
Gitblit v1.9.3