productDev/funingyunwei.git

			@@ -82,7 +82,7 @@
			<div class="xm_table">
			<div style="display: flex; align-items: center; margin-bottom: 15px;">
			<el-input v-model="form.code" style="width: 150px; margin-right: 15px;" placeholder="请输入合同编号"></el-input>
			<el-button type="primary" @click="getFetchList">搜索</el-button>
			<el-button type="primary" @click="getFetchList(1)">搜索</el-button>
			<el-button @click="clear">重置</el-button>
			</div>
			<el-table
			@@ -197,7 +197,7 @@
			<div class="xm_table">
			<div style="display: flex; align-items: center; margin-bottom: 15px;">
			<el-input v-model="form.code" style="width: 150px; margin-right: 15px;" placeholder="请输入合同编号"></el-input>
			<el-button type="primary" @click="getFetchList">搜索</el-button>
			<el-button type="primary" @click="getFetchList(1)">搜索</el-button>
			<el-button @click="clear">重置</el-button>
			</div>
			<el-table
			@@ -391,7 +391,7 @@
			<div class="xm_table">
			<div style="display: flex; align-items: center; margin-bottom: 15px;">
			<el-input v-model="form.code" style="width: 150px; margin-right: 15px;" placeholder="请输入合同编号"></el-input>
			<el-button type="primary" @click="getFetchList">搜索</el-button>
			<el-button type="primary" @click="getFetchList(1)">搜索</el-button>
			<el-button @click="clear">重置</el-button>
			</div>
			<el-table
			@@ -571,13 +571,13 @@
			<div class="xm_table">
			<div class="xm_table_search">
			<div class="xm_table_search_left">
			<el-input v-model="form.name" placeholder="请输入设备名称/编码" style="width: 150px; margin-right: 15px;"></el-input>
			<el-input v-model="form.name" placeholder="请输入设备名称/编码" style="width: 200px; margin-right: 15px;"></el-input>
			<el-select v-model="form.status" style="width: 150px; margin-right: 15px;" placeholder="设备状态">
			<el-option label="正常" :value="0"></el-option>
			<el-option label="损坏" :value="1"></el-option>
			<el-option label="报废" :value="2"></el-option>
			</el-select>
			<el-button type="primary" @click="getDevicePage">查询</el-button>
			<el-button type="primary" @click="getDevicePage(1)">查询</el-button>
			<el-button @click="clear">清空</el-button>
			</div>
			<el-button type="primary" @click="handleEdit">新增</el-button>
			@@ -924,7 +924,10 @@
			})
			},
			// 获取设备分页
			getDevicePage() {
			getDevicePage(type) {
			if (type === 1) {
			this.page = 1
			}
			this.loading = true
			devicePage({
			capacity: this.pageTotal,
			@@ -1031,6 +1034,7 @@
			})
			},
			clear() {
			this.page = 1
			this.form.code = ''
			this.form.name = ''
			this.form.status = ''
			@@ -1046,7 +1050,10 @@
			}
			},
			// 获取当前在租合同
			getFetchList() {
			getFetchList(type) {
			if (type === 1) {
			this.page = 1
			}
			this.loading = true
			fetchList({
			capacity: this.pageSize,

	admin/.env.test	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/roomStatus/index.vue	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -4,10 +4,10 @@
			# VUE_APP_API_URL = 'http://192.168.5.13/gateway_interface'

			# 任康
			# VUE_APP_API_URL = 'http://192.168.0.133:10010'
			VUE_APP_API_URL = 'http://192.168.0.133:10010'

			# 萍姐
			# VUE_APP_API_URL = 'http://192.168.0.108:10010/'

			# 测试服务
			VUE_APP_API_URL = 'https://dmtest.ahapp.net/gateway_interface'
			# VUE_APP_API_URL = 'https://dmtest.ahapp.net/gateway_interface'

			@@ -118,6 +118,10 @@
			})
			},
			methods: {
			open(title) {
			this.title = title
			this.visible = true
			},
			__confirmCreate () {
			this.$refs.form.validate((valid) => {
			if (!valid) {
			@@ -201,7 +205,7 @@
			detailById(id).then(res => {
			this.form = res
			if (res.userIds) {
			this.$set(this.form, 'userIds', Number(res.userIds))
			this.$set(this.form, 'userIds', [...res.userIds.split(',').map(item => Number(item))])
			}
			if (res.startTime) {
			this.$set(this.form, 'selTime', [res.startTime, res.endTime])