程志平 3 år sedan
förälder
incheckning
7ed57ae7ef

+ 5 - 5
config/index.js

@@ -8,15 +8,15 @@ module.exports = {
 	dev: {
 		// Paths
 		assetsSubDirectory: 'static',
-		assetsPublicPath: '/shuidian/',
+		assetsPublicPath: '/jxch-smartmp/',
 		// 后端请求地址代理,配置后testIp再之后的页面调用时就直接指代 http://197.82.15.15:8088
 		proxyTable: {
-			'/shuidian': {
-				target: 'https://chtech.ncjti.edu.cn/shuidian/', // 你请求的第三方接口
+			'/jxch-smartmp': {
+				target: 'https://jtishfw.ncjti.edu.cn/jxch-smartmp/', // 你请求的第三方接口
 				// target: 'http://baibai.natapp1.cc', // 你请求的第三方接口
 				changeOrigin: true, // 在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
 				pathRewrite: { // 路径重写,
-					'^/shuidian': '/' // 替换target中的请求地址,也就是说以后你在请求http://api.douban.com/v2/XXXXX这个地址的时候直接写成/api即可。
+					'^/jxch-smartmp': '/' // 替换target中的请求地址,也就是说以后你在请求http://api.douban.com/v2/XXXXX这个地址的时候直接写成/api即可。
 				}
 			}
 		},
@@ -61,7 +61,7 @@ module.exports = {
 		assetsRoot: path.resolve(__dirname, '../dist'),
 		// assetsRoot: path.resolve('C:/Users/38304/Desktop/dist'),
 		assetsSubDirectory: 'static',
-		assetsPublicPath: '/shuidian/',
+		assetsPublicPath: '/jxch-smartmp/',
 
 		/**
 		 * Source Maps

+ 4 - 4
src/components/ad/ad.vue

@@ -220,7 +220,7 @@
 				var _this = this;
 				let formData = new FormData();
 				formData.append("id", this.del_id);
-				this.$axios.post('/shuidian/HotWaters/advertdel_h.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/advertdel_h.action', formData)
 					.then(res => {
 						// console.log(res.data.data);
 						if (res.data.code == 200) {
@@ -278,7 +278,7 @@
 				let formData = new FormData();
 				formData.append("url_name", this.addform.url_name);
 				_this.tableData = []
-				this.$axios.post('/shuidian/HotWaters/advertquery_h.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/advertquery_h.action', formData)
 					.then(res => {
 						// console.log(res.data.data);
 						if (res.data.code == 200) {
@@ -360,7 +360,7 @@
 				}
 				formData.append("state", this.addform.state);
 				var _this = this
-				this.$axios.post('/shuidian/HotWaters/adverthimage.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/adverthimage.action', formData)
 					.then(res => {
 						// console.log(res.data);
 						if (res.data.code == 200) {
@@ -402,7 +402,7 @@
 				formData.append("state", this.form.state);
 				formData.append("id", this.form.id);
 				var _this = this
-				this.$axios.post('/shuidian/HotWaters/adverth_uimage.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/adverth_uimage.action', formData)
 					.then(res => {
 						// console.log(res.data);
 						if (res.data.code == 200) {

+ 4 - 4
src/components/balance/Balance.vue

@@ -152,7 +152,7 @@
 				var _this = this
 				// _this.tableData = []
 				// _this.rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterMoney.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterMoney.action', {
 						params: params
 					})
 					.then(res => {
@@ -176,7 +176,7 @@
 			 */
 			get_total_amount() {
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/waterfindMoneyTotal.action')
+				this.$axios.get('/jxch-smartmp/HotWaters/waterfindMoneyTotal.action')
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.money) != 'undefined' && res.data.money != '' && JSON.stringify(res
@@ -259,7 +259,7 @@
 			get_view_total_amount() {
 				var _this = this
 				_this.view_total_amount = 0.0.toFixed(2)
-				this.$axios.get('/shuidian/HotWaters/waterrechargeTotal.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterrechargeTotal.action', {
 						params: {
 							re_time: this.select_month,
 							stu_number: this.stu_number
@@ -306,7 +306,7 @@
 			 */
 			get_view_list(params) {
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/waterfindRecharge.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterfindRecharge.action', {
 						params: params
 					})
 					.then(res => {

+ 3 - 3
src/components/congzhijilu/congzhijilu.vue

@@ -200,7 +200,7 @@
 				}
 
 				var _this = this;
-				this.$axios.post('/shuidian/HotWaters/wpqueryOrder.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/wpqueryOrder.action', formData)
 					.then(res => {
 						// console.log(res.data);
 						if (res.data.code == 200) {
@@ -286,7 +286,7 @@
 				var _this = this
 				// _this.tableData = []
 				// _this.rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterqueryRe.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterqueryRe.action', {
 						params: params
 					})
 					.then(res => {
@@ -410,7 +410,7 @@
 				var _this = this
 				_this.view_tableData = []
 				// _this.view_rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterfindRecharge.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterfindRecharge.action', {
 						params: params
 					})
 					.then(res => {

+ 17 - 17
src/components/dev_mgr/DevMgr.vue

@@ -9,7 +9,7 @@
 						<el-button type="primary" size="small">表格导入</el-button>
 					</el-upload>
 					<el-link type="primary" target="_blank"
-						href="https://chtech.ncjti.edu.cn/shuidian/HotWaters/download/模板.xls">
+						href="https://jtishfw.ncjti.edu.cn/jxch-smartmp/HotWaters/download/模板.xls">
 						模板下载</el-link>
 				</span>
 			</el-col>
@@ -249,7 +249,7 @@
 				rows: this.pageRows
 			}
 			// 更新表格
-			this.updateTable('/shuidian/HotWaters/waterlist.action', params)
+			this.updateTable('/jxch-smartmp/HotWaters/waterlist.action', params)
 			// 取得楼栋号,填充下拉列表
 			this.getBuildsFillSelect()
 		},
@@ -271,7 +271,7 @@
 				form.append('file', param.file);
 				this.$axios({
 						method: "post",
-						url: "/shuidian/HotWaters/upload",
+						url: "/jxch-smartmp/HotWaters/upload",
 						headers: {
 							'Content-type': 'multipart/form-data'
 						},
@@ -289,7 +289,7 @@
 			 */
 			getBuilds(url) {
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/watergetBuilds.action')
+				this.$axios.get('/jxch-smartmp/HotWaters/watergetBuilds.action')
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.builds) != 'undefined' && res.data.builds != '' && JSON.stringify(res
@@ -367,7 +367,7 @@
 					}
 				}
 				// 查询该栋的信息
-				this.updateTable('/shuidian/HotWaters/waterquerylist.action', params)
+				this.updateTable('/jxch-smartmp/HotWaters/waterquerylist.action', params)
 			},
 			/**
 			 * 改变页码
@@ -389,7 +389,7 @@
 					}
 				}
 				// 查询该栋的信息
-				this.updateTable('/shuidian/HotWaters/waterquerylist.action', params)
+				this.updateTable('/jxch-smartmp/HotWaters/waterquerylist.action', params)
 			},
 			/**
 			 * 导出表格
@@ -406,12 +406,12 @@
 				} else {
 					params = ''
 				}
-				this.$axios.post('/shuidian/HotWaters/watertoExcel.action', params)
+				this.$axios.post('/jxch-smartmp/HotWaters/watertoExcel.action', params)
 					.then(res => {
 						console.log(res.data.downurl);
 						if (typeof(res.data.downurl) != 'undefined' && res.data.downurl != '' && JSON.stringify(res
 								.data) != '{}') {
-							window.open('https://chtech.ncjti.edu.cn/shuidian' + res.data.downurl)
+							window.open('https://jtishfw.ncjti.edu.cn/jxch-smartmp' + res.data.downurl)
 						} else {
 							_this.$message.error('【未获得】表格!');
 						}
@@ -436,7 +436,7 @@
 			 */
 			handleDelRow() {
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/waterdelBuild.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterdelBuild.action', {
 						params: {
 							id: this.delRowId
 						}
@@ -450,7 +450,7 @@
 								page: this.currentPage,
 								rows: this.pageRows
 							}
-							this.updateTable('/shuidian/HotWaters/waterlist.action', params)
+							this.updateTable('/jxch-smartmp/HotWaters/waterlist.action', params)
 							// 取得楼栋号,填充下拉列表
 							this.getBuildsFillSelect()
 						} else {
@@ -501,7 +501,7 @@
 							_this.$message.error('请输入宿舍号')
 							return
 						}
-						_this.$axios.get('/shuidian/HotWaters/wateraddBuild.action', {
+						_this.$axios.get('/jxch-smartmp/HotWaters/wateraddBuild.action', {
 								params: {
 									user_id: String(_this.addform.user_id).trim(),
 									dom: String(_this.addform.dom).trim(),
@@ -523,7 +523,7 @@
 										page: _this.currentPage,
 										rows: _this.pageRows
 									}
-									_this.updateTable('/shuidian/HotWaters/waterlist.action', params)
+									_this.updateTable('/HotWaters/waterlist.action', params)
 									// 取得楼栋号,填充下拉列表
 									_this.getBuildsFillSelect()
 								} else {
@@ -561,7 +561,7 @@
 							return
 						}
 						
-						_this.$axios.get('/shuidian/HotWaters/waterupdateBuild.action', {
+						_this.$axios.get('/jxch-smartmp/HotWaters/waterupdateBuild.action', {
 								params: {
 									id: _this.modifyForm.id,
 									user_id: String(_this.modifyForm.user_id).trim(),
@@ -579,7 +579,7 @@
 										page: _this.currentPage,
 										rows: _this.pageRows
 									}
-									_this.updateTable('/shuidian/HotWaters/waterlist.action', params)
+									_this.updateTable('/jxch-smartmp/HotWaters/waterlist.action', params)
 									// 取得楼栋号,填充下拉列表
 									_this.getBuildsFillSelect()
 								} else {
@@ -630,7 +630,7 @@
 							rows: this.pageRows
 						}
 					}
-					this.updateTable('/shuidian/HotWaters/waterquerylist.action', params)
+					this.updateTable('/jxch-smartmp/HotWaters/waterquerylist.action', params)
 					this.$message.success('水表id包含:' + this.query_shuibiaoId + ' 查询完成!')
 				} else {
 					if (this.form_select.value == 0) {
@@ -638,14 +638,14 @@
 							page: 1,
 							rows: this.pageRows
 						}
-						this.updateTable('/shuidian/HotWaters/waterquerylist.action', params)
+						this.updateTable('/HotWaters/waterquerylist.action', params)
 					} else {
 						params = {
 							build: this.form_select.label,
 							page: 1,
 							rows: this.pageRows
 						}
-						this.updateTable('/shuidian/HotWaters/waterquerylist.action', params)
+						this.updateTable('/jxch-smartmp/HotWaters/waterquerylist.action', params)
 					}
 					// this.$message.error('请输入水表id 或 选择 楼栋号')
 				}

+ 3 - 3
src/components/feilvset/feilvset.vue

@@ -96,7 +96,7 @@
 			 * 获取当前费率
 			 */
 			get_current_feilv() {
-				this.$axios.get('/shuidian/HotWaters/watercurrentRate.action')
+				this.$axios.get('/jxch-smartmp/HotWaters/watercurrentRate.action')
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.rate) != 'undefined' && res.data.rate != '' && JSON.stringify(res
@@ -117,7 +117,7 @@
 			get_history_feilv() {
 				this.tableData = []
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/waterqueryPrice.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterqueryPrice.action', {
 						params: {
 							page: this.current_page,
 							rows: this.page_rows
@@ -184,7 +184,7 @@
 				_this.$refs[formName].validate((valid) => {
 					if (valid) {
 						if (_this.modifyForm.inputFeilv) {
-							_this.$axios.get('/shuidian/HotWaters/waterupdatePrice.action', {
+							_this.$axios.get('/jxch-smartmp/HotWaters/waterupdatePrice.action', {
 									params: {
 										rate: _this.modifyForm.inputFeilv
 									}

+ 1 - 1
src/components/login/Login.vue

@@ -99,7 +99,7 @@
 				}
 
 				_this.$refs[formName].validate((valid) => {
-					_this.$axios.get('/shuidian/HotWaters/userlog.action', {
+					_this.$axios.get('/jxch-smartmp/HotWaters/userlog.action', {
 							params: params
 						})
 						.then(res => {

+ 8 - 8
src/components/shangjiaduizhang/shangjiaduizhang.vue

@@ -235,13 +235,13 @@
 				if (_this.select_riqi.select_day) {
 					formData.append("begin_time", _this.select_riqi.select_day);
 				}
-				this.$axios.post('/shuidian/HotWaters/watertoComExcel.action', formData)
+				this.$axios.post('/jxch-smartmp/HotWaters/watertoComExcel.action', formData)
 					.then(res => {
 						if (typeof(res.data.downurl) != 'undefined' && res.data.downurl != '' && JSON
 							.stringify(res
 								.data) != '{}') {
 							// console.log(res.data.downurl);
-							window.open('https://chtech.ncjti.edu.cn/shuidian' + res.data.downurl);
+							window.open('https://jtishfw.ncjti.edu.cn/jxch-smartmp' + res.data.downurl);
 						} else {
 							_this.$message.error('【未获得】表格!');
 						}
@@ -314,7 +314,7 @@
 						build: this.drom_options.label
 					}
 				}
-				this.$axios.get('/shuidian/HotWaters/watergetdoms.action', params)
+				this.$axios.get('/jxch-smartmp/HotWaters/watergetdoms.action', params)
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.doms) != 'undefined' && res.data.doms != '' && JSON.stringify(
@@ -414,7 +414,7 @@
 			 */
 			getTodayXiaofei(params) {
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/waterfindConsume.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterfindConsume.action', {
 						params: params
 					})
 					.then(res => {
@@ -448,7 +448,7 @@
 			getBuildsFillSelect() {
 				// 获取楼栋号,填充下拉列表
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/watergetBuilds.action')
+				this.$axios.get('/jxch-smartmp/HotWaters/watergetBuilds.action')
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.builds) != 'undefined' && res.data.builds != '' && JSON
@@ -485,7 +485,7 @@
 				this.xiaofei.day_balance = 0.0.toFixed(2)
 				this.today_xiaofei = 0.0.toFixed(2)
 				// 年消费记录
-				this.$axios.get('/shuidian/HotWaters/watertotalFeel.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/watertotalFeel.action', {
 						params: {
 							year: this.select_riqi.select_year
 						}
@@ -506,7 +506,7 @@
 					})
 
 				// 月消费记录
-				this.$axios.get('/shuidian/HotWaters/watertotalFeel.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/watertotalFeel.action', {
 						params: {
 							month: this.select_riqi.select_month
 						}
@@ -527,7 +527,7 @@
 					})
 
 				// 日消费记录
-				this.$axios.get('/shuidian/HotWaters/watertotalFeel.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/watertotalFeel.action', {
 						params: {
 							day: this.select_riqi.select_day
 						}

+ 6 - 6
src/components/yongshuifenxi/yongshuifenxi.vue

@@ -211,7 +211,7 @@
 					dom: this.room_value
 				}
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/waterwaterTotal.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterwaterTotal.action', {
 						params: params
 					})
 					.then(res => {
@@ -242,7 +242,7 @@
 			getBuildsFillSelect() {
 				// 获取楼栋号,填充下拉列表
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/watergetBuilds.action')
+				this.$axios.get('/jxch-smartmp/HotWaters/watergetBuilds.action')
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.builds) != 'undefined' && res.data.builds != '' && JSON.stringify(res
@@ -285,7 +285,7 @@
 				// 日用水量
 				if (riqi == '日') {
 					// 查询日的数据
-					this.$axios.get('/shuidian/HotWaters/waterdayTong.action', {
+					this.$axios.get('/jxch-smartmp/HotWaters/waterdayTong.action', {
 							params: params
 						})
 						.then(res => {
@@ -304,7 +304,7 @@
 						})
 				} else if (riqi == '月') { // 月用水量
 					// 查询月的数据
-					this.$axios.get('/shuidian/HotWaters/watermonthTong.action', {
+					this.$axios.get('/jxch-smartmp/HotWaters/watermonthTong.action', {
 							params: params
 						})
 						.then(res => {
@@ -323,7 +323,7 @@
 						})
 				} else if (riqi == '年') { // 年用水量
 					// 查询年的数据
-					this.$axios.get('/shuidian/HotWaters/wateryearTong.action', {
+					this.$axios.get('/jxch-smartmp/HotWaters/wateryearTong.action', {
 							params: params
 						})
 						.then(res => {
@@ -416,7 +416,7 @@
 				
 				var _this = this;
 				// 显示详细列表
-				this.$axios.get('/shuidian/HotWaters/waterdetailWater.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterdetailWater.action', {
 						params: params
 					})
 					.then(res => {

+ 2 - 2
src/components/yongshuiyichang/yongshuiyichang.vue

@@ -215,7 +215,7 @@
 				var _this = this
 				// _this.tableData = []
 				// _this.rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterqueryErrorWater.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterqueryErrorWater.action', {
 						params: params
 					})
 					.then(res => {
@@ -239,7 +239,7 @@
 			getBuildsFillSelect() {
 				// 获取楼栋号,填充下拉列表
 				var _this = this
-				this.$axios.get('/shuidian/HotWaters/watergetBuilds.action')
+				this.$axios.get('/jxch-smartmp/HotWaters/watergetBuilds.action')
 					.then(res => {
 						// console.log(res.data);
 						if (typeof(res.data.builds) != 'undefined' && res.data.builds != '' && JSON.stringify(res

+ 4 - 4
src/components/zhifuyichang/zhifuyichang.vue

@@ -142,7 +142,7 @@
 								id: row.id
 							}
 							if (this.drom == '水费') {
-								this.$axios.get('/shuidian/HotWaters/waterhandlerPayError.action', {
+								this.$axios.get('/jxch-smartmp/HotWaters/waterhandlerPayError.action', {
 										params: params
 									})
 									.then(res => {
@@ -159,7 +159,7 @@
 										_this.$message.error('【处理】请求异常: ' + err);
 									})
 							} else if (this.drom == '电费') {
-								this.$axios.get('/shuidian/HotWaters/waterhandlerElecPayError.action', {
+								this.$axios.get('/jxch-smartmp/HotWaters/waterhandlerElecPayError.action', {
 										params: params
 									})
 									.then(res => {
@@ -189,7 +189,7 @@
 				var _this = this
 				// _this.tableData = []
 				// _this.rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterfindErrorPayByNo.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterfindErrorPayByNo.action', {
 						params: params
 					})
 					.then(res => {
@@ -214,7 +214,7 @@
 				var _this = this
 				// _this.tableData = []
 				// _this.rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterfindErrorElcPayByNo.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterfindErrorElcPayByNo.action', {
 						params: params
 					})
 					.then(res => {

+ 4 - 4
src/components/zhuanghaoguanli/zhuanghaoguanli.vue

@@ -337,7 +337,7 @@
 					params.number = this.account
 				}
 				// _this.rows_total = 0
-				this.$axios.get('/shuidian/HotWaters/waterqueryAdmin.action', {
+				this.$axios.get('/jxch-smartmp/HotWaters/waterqueryAdmin.action', {
 						params: params
 					})
 					.then(res => {
@@ -405,7 +405,7 @@
 							return
 						}
 						var _this = this
-						this.$axios.get('/shuidian/HotWaters/wateraddAdmin.action', {
+						this.$axios.get('/jxch-smartmp/HotWaters/wateraddAdmin.action', {
 								params: {
 									name: String(this.addform.name).trim(),
 									number: String(this.addform.number).trim(),
@@ -486,7 +486,7 @@
 							return
 						}
 
-						_this.$axios.get('/shuidian/HotWaters/waterupdateAdmin.action', {
+						_this.$axios.get('/jxch-smartmp/HotWaters/waterupdateAdmin.action', {
 								params: {
 									id: _this.form.id,
 									name: String(_this.form.name).trim(),
@@ -544,7 +544,7 @@
 				_this.$refs[formName].validate((valid) => {
 					if (valid) {
 						if (_this.delConfirmPwdform.delPwd.trim()) {
-							_this.$axios.get('/shuidian/HotWaters/waterdelAdmin.action', {
+							_this.$axios.get('/jxch-smartmp/HotWaters/waterdelAdmin.action', {
 									params: {
 										id: _this.del_id,
 										password: _this.delPwd

+ 1 - 1
src/router/index.js

@@ -17,7 +17,7 @@ Vue.use(Router)
 
 export default new Router({
 	mode: 'history',
-	base: '/shuidian/',
+	base: '/jxch-smartmp/',
 	routes: [{
 		path: '/',
 		name: 'Login',

+ 3 - 2
static/interface/index.js

@@ -1,6 +1,7 @@
 // 配置主机地址和端口号(可以有多个,需要测试那个环境字节打开那个base即可)
-// let base = "https://jtishfw.ncjti.edu.cn/jxch-smartmp"
-let base = "https://chtech.ncjti.edu.cn/shuidian"
+let base = "https://jtishfw.ncjti.edu.cn/jxch-smartmp"
+// let base = "https://chtech.ncjti.edu.cn/shuidian"
+// let base = "http://192.168.1.34:8080/HotWaters/"
 
 // 在线api接口路径,需要和项目后台确认
 let online_url = {