1.1 0902

src/views/equip-lib/equip-manager/operate-model.vue

@@ -167,7 +167,7 @@
 			<div class="label">二级地址偏移</div>
 			<div class="cotent">
 				<el-input-number
-					v-model="opreateModelForm.cbAddrOffset"
+					v-model="opreateModelForm.cbSecondAddrOffset"
 					:controls="false"
 					label="label"
 				></el-input-number>
@@ -240,7 +240,7 @@ export default {
 	data() {
 		return {
 			opreateModelForm: {
-				cbAddrOffset: 0,
+				cbSecondAddrOffset: 0,
 				cbCoEquipType: "对流",
 				apparatus_device_id: 0,
 				cbHeEquipType: "辐射",
@@ -287,7 +287,7 @@ export default {
 				if (this._props.operateModelType === "edit") {
 					if (n !== EndControlType) {
 						this.opreateModelForm = {
-							cbAddrOffset: 0,
+							cbSecondAddrOffset: 0,
 							cbCoEquipType: "",
 							apparatus_device_id: 0,
 							cbHeEquipType: "",
@@ -304,7 +304,7 @@ export default {
 						};
 					} else {
 						this.opreateModelForm = {
-							cbAddrOffset: 0,
+							cbSecondAddrOffset: 0,
 							cbCoEquipType: "对流",
 							apparatus_device_id: 0,
 							cbHeEquipType: "辐射",
@@ -330,7 +330,7 @@ export default {
 				if (this._props.operateModelType !== "create") {
 					console.log(n);
 					this.opreateModelForm = {
-						cbAddrOffset: n.cbAddrOffset || 0,
+						cbSecondAddrOffset: n.cbSecondAddrOffset || 0,
 						cbCoEquipType: n.cbCoEquipType || "",
 						cbHeEquipType: n.cbHeEquipType || "",
 						apparatus_model_name: n.apparatus_model_name || "",
@@ -362,7 +362,7 @@ export default {
 		async makeSureOperateButton() {
 			if (this._props.operateModelType === "create") {
 				const {
-					cbAddrOffset,
+					cbSecondAddrOffset,
 					cbCoEquipType,
 					apparatus_device_id,
 					cbHeEquipType,
@@ -379,7 +379,7 @@ export default {
 					consumption_cycle,
 				} = this.opreateModelForm;
 				const res = await createApparatusModel({
-					cbAddrOffset,
+					cbSecondAddrOffset,
 					cbCoEquipType,
 					apparatus_device_id: this._props.operateForm.id,
 					cbHeEquipType,
@@ -410,7 +410,7 @@ export default {
 				this.$emit("update:addNewModelDialog", false);
 			} else if (this._props.operateModelType === "edit") {
 				const {
-					cbAddrOffset,
+					cbSecondAddrOffset,
 					cbCoEquipType,
 					cbHeEquipType,
 					apparatus_model_name,
@@ -426,7 +426,7 @@ export default {
 					consumption_cycle,
 				} = this.opreateModelForm;
 				const res = await editApparatusModel({
-					cbAddrOffset,
+					cbSecondAddrOffset,
 					cbCoEquipType,
 					apparatus_model_id: this._props.activeDeviceDetail
 						.apparatus_model_auto_id,

src/views/equip-management/add-box/index.vue

@@ -2920,10 +2920,10 @@
                                 </div>
                                 <!--                <div class="form-row bg-white">-->
                                 <!--                  <el-row>-->
-                                <!--                    <el-col class="w-percent-20" v-if="Array.isArray(this.activeOperateEnd.endDeviceOption) && this.activeOperateEnd.endDeviceOption.length > 0 && this.activeOperateEnd.endDeviceOption[0].cbAddrOffset>=0">-->
+                                <!--                    <el-col class="w-percent-20" v-if="Array.isArray(this.activeOperateEnd.endDeviceOption) && this.activeOperateEnd.endDeviceOption.length > 0 && this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset>=0">-->
 
                                 <!--                      <el-form-item label="二级地址">-->
-                                <!--                        <span style="color: red">{{this.activeOperateEnd.endDeviceOption[0].cbAddrOffset}}</span>-->
+                                <!--                        <span style="color: red">{{this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset}}</span>-->
                                 <!--                        <custom-input-number class="form-input-s" :watchObj="activeOperateEnd.cbSecondAddr" v-model="activeOperateEnd.cbSecondAddr" :precision="0"></custom-input-number>-->
                                 <!--                      </el-form-item>-->
                                 <!--                    </el-col>-->
@@ -2932,7 +2932,7 @@
                                 <!--                </div>-->
                                 <div class="form-row bg-white" v-if="this.activeOperateEnd.endDeviceOption!== null">
                                     <el-row v-if="Array.isArray(this.activeOperateEnd.endDeviceOption) && this.activeOperateEnd.endDeviceOption.length > 0">
-                                        <el-col v-if="this.activeOperateEnd.endDeviceOption[0].cbAddrOffset>0">
+                                        <el-col v-if="this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset>0">
                                             <el-form-item label="二级地址">
                                                 a
 

src/views/equip-management/box-manage/index.vue

@@ -22,17 +22,20 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item>
+
 						<el-button type="primary" class="search-btn" @click="filterBoxListFnc()">搜 索</el-button>
+
 						<el-button v-if="this.showChange === true"
 								class="search-button"
 								type="warning"
 								@click="batchUpdate"
 						>批量升级网关
 						</el-button>
+
 					</el-form-item>
 				</el-form>
-				<el-button type="primary" circle class="el-icon-refresh-right refresh-button" @click="refreshList()"></el-button>
 
+				<el-button type="primary" circle class="el-icon-refresh-right refresh-button" @click="refreshList()" style="margin-right: 250px" ></el-button>
 
 				<el-button type="danger" class="add-new-button" @click="addBoxFnc()" v-if="modeShow === 'all'">新 建</el-button>
 

src/views/equip-management/edit-box/index.vue

@@ -2382,7 +2382,7 @@
 <!--                    <div v-if="this.activeOperateEnd.endDeviceOption != undefined">{{this.activeOperateEnd.endDeviceOption.length}}</div>-->
 <!--                    <div v-else>this.activeOperateEnd.endDeviceOption == undefined</div>-->
 <!--                    <div>{{this.activeOperateEnd.endDeviceOption.length}}</div>-->
-<!--                    <div>{{this.activeOperateEnd.endDeviceOption[0].cbAddrOffset}}</div>-->
+<!--                    <div>{{this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset}}</div>-->
 
 
                   </el-row>
@@ -2390,10 +2390,10 @@
 
                 <div class="form-row bg-white">
                   <el-row>
-                    <el-col class="w-percent-20" v-if="Array.isArray(this.activeOperateEnd.endDeviceOption) && this.activeOperateEnd.endDeviceOption.length > 0 && this.activeOperateEnd.endDeviceOption[0].cbAddrOffset>=0">
+                    <el-col class="w-percent-20" v-if="Array.isArray(this.activeOperateEnd.endDeviceOption) && this.activeOperateEnd.endDeviceOption.length > 0 && this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset>=0">
 
                       <el-form-item label="二级地址">
-                        <span style="color: red">{{this.activeOperateEnd.endDeviceOption[0].cbAddrOffset}}</span>
+                        <span style="color: red">{{this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset}}</span>
                         <custom-input-number class="form-input-s" :watchObj="activeOperateEnd.cbSecondAddr" v-model="activeOperateEnd.cbSecondAddr" :precision="0"></custom-input-number>
                       </el-form-item>
 
@@ -2424,7 +2424,7 @@
 <!--                    </el-col>-->
 
 
-                    <!--                    <div>{{this.activeOperateEnd.endDeviceOption[0].cbAddrOffset}}{{this.activeOperateEnd.endDeviceOption[0].cbAddrOffset>0}}</div>-->
+                    <!--                    <div>{{this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset}}{{this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset>0}}</div>-->
 
                   </el-row>
                 </div>