1.1 0911验收bug

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

@@ -240,7 +240,7 @@ export default {
 	data() {
 		return {
 			opreateModelForm: {
-				cbSecondAddrOffset: 0,
+				cbSecondAddrOffset: "",
 				cbCoEquipType: "对流",
 				apparatus_device_id: 0,
 				cbHeEquipType: "辐射",
@@ -287,7 +287,7 @@ export default {
 				if (this._props.operateModelType === "edit") {
 					if (n !== EndControlType) {
 						this.opreateModelForm = {
-							cbSecondAddrOffset: 0,
+							cbSecondAddrOffset: "",
 							cbCoEquipType: "",
 							apparatus_device_id: 0,
 							cbHeEquipType: "",
@@ -304,7 +304,7 @@ export default {
 						};
 					} else {
 						this.opreateModelForm = {
-							cbSecondAddrOffset: 0,
+							cbSecondAddrOffset: "",
 							cbCoEquipType: "对流",
 							apparatus_device_id: 0,
 							cbHeEquipType: "辐射",
@@ -330,7 +330,7 @@ export default {
 				if (this._props.operateModelType !== "create") {
 					console.log(n);
 					this.opreateModelForm = {
-						cbSecondAddrOffset: n.cbSecondAddrOffset || 0,
+						cbSecondAddrOffset: n.cbSecondAddrOffset || "",
 						cbCoEquipType: n.cbCoEquipType || "",
 						cbHeEquipType: n.cbHeEquipType || "",
 						apparatus_model_name: n.apparatus_model_name || "",

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

@@ -2909,7 +2909,7 @@
                                             </el-form-item>
                                         </el-col>
                                         <el-col class="w-percent-20">
-                                            <el-form-item label="地址xxx">
+                                            <el-form-item label="地址">
                                                 <custom-input-number class="form-input-s"
                                                                      :watchObj="activeOperateEnd.cbMainComAdd"
                                                                      v-model="activeOperateEnd.cbMainComAdd"
@@ -2934,15 +2934,15 @@
                                     <el-row v-if="Array.isArray(this.activeOperateEnd.endDeviceOption) && this.activeOperateEnd.endDeviceOption.length > 0">
                                         <el-col v-if="this.activeOperateEnd.endDeviceOption[0].cbSecondAddrOffset>0">
                                             <el-form-item label="二级地址">
-                                                a
 
-                                                <custom-input-number class="form-input-s"
+
+                                                <el-input class="form-input-s"
                                                                      :watchObj="activeOperateEnd.cbSecondAddr"
                                                                      v-model="activeOperateEnd.cbSecondAddr"
-                                                                     :precision="0"></custom-input-number>
+                                                                     :precision="0"></el-input>
 
                                                 <!--                        {{this.activeOperateEnd}}-->
-                                                b
+
                                             </el-form-item>
                                         </el-col>
                                     </el-row>

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

@@ -2375,7 +2375,7 @@
                       </el-form-item>
                     </el-col>
                     <el-col class="w-percent-20">
-                      <el-form-item label="地址1111">
+                      <el-form-item label="地址">
                         <custom-input-number class="form-input-s" :watchObj="activeOperateEnd.cbMainComAdd" v-model="activeOperateEnd.cbMainComAdd" :precision="0"></custom-input-number>
                       </el-form-item>
                     </el-col>
@@ -2394,12 +2394,17 @@
 
                       <el-form-item label="二级地址">
                         <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-input class="form-input-s" type="" :watchObj="activeOperateEnd.cbSecondAddr" v-model="activeOperateEnd.cbSecondAddr" :precision="0"></el-input>
                       </el-form-item>
 
 
 
                     </el-col>
+                    <el-col v-else>
+                      <el-form-item label="二级地址偏移量==0">
+「{{this.activeOperateEnd.endDeviceOption}}
+                      </el-form-item>
+                    </el-col>
 <!--                    <el-col>-->
 <!--                      <el-form-item label="制冷装置控制">-->
 <!--                        <custom-input-number class="form-input-s" :watchObj="activeOperateEnd.cbCoEquipCtrl" v-model="activeOperateEnd.cbCoEquipCtrl" :precision="0"></custom-input-number>-->
@@ -6140,7 +6145,8 @@ export default {
         cbMainComInitAdd: -65534,
         cbMainComChan: -65534,
         cbMainComAdd: -65534,
-        cbSecondAddr: -65534,
+        cbSecondAddr: "",
+        cbSecondAddrOffset:"",
         cbCoEquipCtrl:0,
         cbHeEquipCtrl:0,
 

src/views/oa-management/consumble-watch/index.vue

@@ -202,11 +202,11 @@
 				</el-table-column>
 				<el-table-column
 					label="消耗算法"
-					prop="consumption_algorithm_id"
+					prop="consumption_algorithm"
           align="center"
           width="80"
 				>
-          <span>自定义</span>
+<!--          <span>自定义</span>-->
         </el-table-column>
 
 				<el-table-column

src/views/oa-management/consumble-watch/operate-consumble/index.vue

@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="盒子名称">
-        a{{boxOptions}}b
+<!--        a{{boxOptions}}b-->
         <el-select v-model="operateConsumbleForm.box_id" placeholder="">
           <el-option
             v-for="(item, index) in boxOptions"
@@ -71,12 +71,14 @@
           </el-select>
         </template>
       </el-form-item>
-      <el-form-item label="耗材归属">
+<!--      v-if="type=='edit' && operateConsumbleForm.consumption_algorithm_id==5" disabled=""-->
+      <el-form-item label="耗材归属" >
+        {{type=='edit'}}{{operateConsumbleForm.consumption_algorithm_id==5}}
         <el-select
           v-model="operateConsumbleForm.ascription"
           placeholder="请选择"
         >
-          <el-option
+          <el-option :disabled="item.disabled"
             v-for="item in ascriptionOption"
             :label="item.label"
             :value="item.value"
@@ -91,13 +93,14 @@
             @visible-change="consumptionAlgorithmListFnc"
             placeholder="请选择"
           >
-            <el-option
+            <el-option :disabled="item.disabled"
               v-for="(item, index) in consumptionAlgorithmOption"
               :label="item.consumption_algorithm"
               :value="item.id"
               :key="+new Date() + index"
             ></el-option>
           </el-select>
+
         </template>
       </el-form-item>
       <el-form-item label="使用率" v-if="type === 'edit'">
@@ -250,6 +253,11 @@ export default {
         {
           label: "盒子",
           value: "盒子"
+        },
+        {
+          label: "新风设备",
+          value: "新风设备",
+          disabled: true
         }
       ],
       activeBoxDetailSelf: {}
@@ -351,6 +359,19 @@ export default {
       });
       if (res.code === 200) {
         this.consumptionAlgorithmOption = res.result.data;
+        for(var _t = 0; _t <= this.consumptionAlgorithmOption.length; _t ++){
+          console.log("this.consumptionAlgorithmOption[_t] is",this.consumptionAlgorithmOption[_t])
+          if (this.consumptionAlgorithmOption[_t]!== undefined){
+            // console.log('this.consumptionAlgorithmOption[_t].id=',this.consumptionAlgorithmOption[_t].id)
+            if (this.consumptionAlgorithmOption[_t].id==5){
+              this.consumptionAlgorithmOption[_t].disabled = true
+            }else{
+              this.consumptionAlgorithmOption[_t].disabled = false
+            }
+          }
+
+        }
+        console.log('///////this.consumptionAlgorithmOption=',this.consumptionAlgorithmOption)
       }
     },
     async consumptionTypeListFnc() {

src/views/oa-management/consumption-algorithm/index.vue

@@ -7,8 +7,10 @@
       <el-table-column prop="consumption_algorithm" label="算法"></el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="warning" @click="editButton(scope.row)">编辑</el-button>
-          <el-button type="danger" @click="deleteButton(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.consumption_algorithm==='跟随设备'" disabled type="warning" @click="editButton(scope.row)">编辑</el-button>
+          <el-button v-else type="warning" @click="editButton(scope.row)">编辑</el-button>
+          <el-button type="danger" v-if="scope.row.consumption_algorithm==='跟随设备'" disabled @click="deleteButton(scope.row)">删除</el-button>
+          <el-button type="danger" v-else @click="deleteButton(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -152,4 +154,4 @@ export default {
 </script>
 <style lang='scss' scoped>
 @import './index.scss';
-</style>
+</style>