Merge remote-tracking branch 'origin/master'

psdc-ui/src/views/system/cl/index.vue

@@ -64,7 +64,11 @@
           <el-checkbox :indeterminate="data.isIndeterminate" v-model="data.checkAll" @change="handleCheckAllChange">全选</el-checkbox>
           <div style="margin: 15px 0;"></div>
           <el-checkbox-group v-model="data.checkedSblb" @change="handleCheckedCitiesChange">
-            <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" >{{item.deviceName}}</el-checkbox>
+            <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" style="margin-bottom: 10px">{{item.deviceName}}
+              <el-input placeholder="进水温度" style="width: 120px ;margin: 10px"/>
+              <el-input placeholder="出水温度" style="width: 120px ;margin: 10px"/>
+              <el-input placeholder="温度" style="width: 120px ;margin: 10px"/>
+            </el-checkbox>
           </el-checkbox-group>
 <!--          <el-col :span="12">-->
 <!--            <el-form-item label="策略列表:"  >-->