diff --git a/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue b/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue
index 4a5b282..c8f8dd1 100644
--- a/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue
+++ b/src/views/ems/dzjk/clpz/xftg/AddTemplate.vue
@@ -262,28 +262,6 @@ export default {
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        //校验时间选择范围是否冲突
-        let status = true
-        this.tableData.forEach((outer, outerIndex) => {
-          const {startTime, endTime} = outer
-          const outerStart = parseInt(startTime), outerEnd = parseInt(endTime)
-          if (outerStart > outerEnd) {
-            status = false
-          } else {
-            this.tableData.forEach((inner, innerIndex) => {
-              if (innerIndex !== outerIndex) {
-                const {startTime: innerStartTime, endTime: innerEndTime} = inner
-                const innerStart = parseInt(innerStartTime), innerEnd = parseInt(innerEndTime)
-                if ((innerStart < outerStart && innerEnd > outerEnd) || !((innerStart < outerStart && innerEnd <= outerStart) || (innerStart >= outerEnd && innerEnd > outerEnd))) {
-                  status = false
-                }
-              }
-            })
-          }
-        })
-        if (!status) {
-          return this.$message.error('时间选择范围冲突');
-        }
         const {templateName, sdcLimit, sdcDown, sdcUp} = this.formData
         const {siteId, updateStrategyId} = this.$home
         const {tableData} = this
diff --git a/src/views/ems/site/sblb/AddDevice.vue b/src/views/ems/site/sblb/AddDevice.vue
index 0f84776..b3c6f0d 100644
--- a/src/views/ems/site/sblb/AddDevice.vue
+++ b/src/views/ems/site/sblb/AddDevice.vue
@@ -1,90 +1,136 @@
 <template>
   <el-dialog :visible.sync="dialogTableVisible" :close-on-press-escape="false" :close-on-click-modal="false"
-             :show-close="false" destroy-on-close lock-scroll append-to-body width="600px" class="ems-dialog"
+             :show-close="false" destroy-on-close lock-scroll append-to-body width="800px" class="ems-dialog"
              :title="mode === 'add'?'新增设备':`编辑设备` ">
-    <el-form v-loading="loading>0" ref="addTempForm" :model="formData" :rules="rules" size="medium" label-width="140px">
-      <el-form-item label="站点" prop="siteId">
-        <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
-          <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
-                     :key="index+'siteOptions'"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="设备id" prop="deviceId">
-        <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="设备名称" prop="deviceName">
-        <el-input v-model="formData.deviceName" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="设备描述" prop="description">
-        <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
-                  :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="工作状态" prop="communicationStatus">
-        <el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
-          <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions"
-                     :key="key+'communicationStatusOptions'"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="设备类型" prop="deviceType">
-        <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
-          <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
-                     :key="key+'deviceTypeOptions'"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="设备类别" prop="deviceCategory">
-        <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
-          <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
-                     :key="index+'deviceCategoryList'"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
-        <el-select v-model="formData.parentId"
-                   :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'"
-                   :style="{width: '100%'}">
-          <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
-                     :key="index+'parentDeviceList'"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
-        <el-input v-model="formData.ipAddress" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="TCP设备的端口号" prop="ipPort" v-if="formData.deviceType === 'TCP'">
-        <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
-        <el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="串口路径" prop="serialPort">
-        <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="波特率" prop="baudRate">
-        <el-input v-model="formData.baudRate" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="数据位" prop="dataBits">
-        <el-input v-model="formData.dataBits" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="停止位" prop="stopBits">
-        <el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="校验位" prop="parity">
-        <el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
-        </el-input>
-      </el-form-item>
-      <el-form-item label="图片" prop="pictureUrl">
-        <image-upload :limit="1" :drag="false" @input="uploadImage" :value="formData.pictureUrl"/>
-      </el-form-item>
+    <div v-loading="loading>0">
+      <el-form v-loading="loading>0" ref="addTempForm" inline :model="formData" :rules="rules" size="medium"
+               label-width="120px" class="device-form">
+        <el-form-item label="站点" prop="siteId">
+          <el-select v-model="formData.siteId" placeholder="请选择" :style="{width: '100%'}" @change="changeType">
+            <el-option :label="item.siteName" :value="item.siteId" v-for="(item,index) in siteList"
+                       :key="index+'siteOptions'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备id" prop="deviceId">
+          <el-input v-model="formData.deviceId" placeholder="请输入" maxlength="60" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="formData.deviceName" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="设备描述" prop="description">
+          <el-input v-model="formData.description" type="textarea" placeholder="请输入" clearable
+                    :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="工作状态" prop="communicationStatus">
+          <el-select v-model="formData.communicationStatus" placeholder="请选择" :style="{width: '100%'}">
+            <el-option :label="value" :value="key" v-for="(value,key) in communicationStatusOptions"
+                       :key="key+'communicationStatusOptions'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="formData.deviceType" placeholder="请选择" :style="{width: '100%'}">
+            <el-option :label="value" :value="key" v-for="(value,key) in deviceTypeOptions"
+                       :key="key+'deviceTypeOptions'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备类别" prop="deviceCategory">
+          <el-select v-model="formData.deviceCategory" placeholder="请选择" :style="{width: '100%'}"
+                     @change="changeType">
+            <el-option :label="item.name" :value="item.code" v-for="(item,index) in deviceCategoryList"
+                       :key="index+'deviceCategoryList'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上级设备" prop="parentId" v-if="dccDeviceCategoryList.includes(formData.deviceCategory)">
+          <el-select v-model="formData.parentId"
+                     :placeholder="parentDeviceList.length === 0 && !formData.siteId ? '请先选择站点' : '请选择'"
+                     :style="{width: '100%'}">
+            <el-option :label="item.deviceName" :value="item.id" v-for="(item,index) in parentDeviceList"
+                       :key="index+'parentDeviceList'"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="TCP设备的ip地址" prop="ipAddress" v-if="formData.deviceType === 'TCP'">
+          <el-input v-model="formData.ipAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="TCP设备的端口号" prop="ipPort" v-if="formData.deviceType === 'TCP'">
+          <el-input v-model="formData.ipPort" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="从站地址" prop="slaveId" v-if="formData.deviceType === 'TCP'">
+          <el-input v-model="formData.slaveId" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="串口路径" prop="serialPort">
+          <el-input v-model="formData.serialPort" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="波特率" prop="baudRate">
+          <el-input v-model="formData.baudRate" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="数据位" prop="dataBits">
+          <el-input v-model="formData.dataBits" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="停止位" prop="stopBits">
+          <el-input v-model="formData.stopBits" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="校验位" prop="parity">
+          <el-input v-model="formData.parity" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="图片" prop="pictureUrl">
+          <image-upload :limit="1" :drag="false" @input="uploadImage" :value="formData.pictureUrl"/>
+        </el-form-item>
 
-    </el-form>
+      </el-form>
+      <!--      pcs配置-->
+      <el-form v-if="isPcs" ref="pcsSettingForm" inline :model="pcsSetting" size="medium"
+               label-width="120px" class="device-form" :rules="pcsSettingRules">
+        <div>PCS配置</div>
+        <el-form-item label="开关机地址" prop="pointAddress">
+          <el-input v-model="pcsSetting.pointAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="功率地址" prop="powerAddress">
+          <el-input v-model="pcsSetting.powerAddress" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="开机指令" prop="startCommand">
+          <el-input v-model="pcsSetting.startCommand" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="开机目标功率" prop="startPower">
+          <el-input v-model="pcsSetting.startPower" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="关机指令" prop="stopCommand">
+          <el-input v-model="pcsSetting.stopCommand" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="关机目标功率" prop="stopPower">
+          <el-input v-model="pcsSetting.stopPower" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="电池簇数" prop="clusterNum">
+          <el-input v-model="pcsSetting.clusterNum" placeholder="请输入" clearable :style="{width: '100%'}">
+          </el-input>
+        </el-form-item>
+        <br>
+        <template v-for="index in parseInt(pcsSetting.clusterNum) || 0">
+          <el-form-item :label="'电池簇'+(index)+'地址'"
+                        prop="clusterPointAddress">
+            <el-input v-model="pcsSetting.clusterPointAddress[index-1]" placeholder="请输入" clearable
+                      :style="{width: '100%'}">
+            </el-input>
+          </el-form-item>
+        </template>
+      </el-form>
+    </div>
     <div slot="footer">
       <el-button @click="closeDialog">取消</el-button>
       <el-button type="primary" @click="saveDialog">确定</el-button>
@@ -124,6 +170,13 @@ export default {
         callback();
       }
     }
+    const validateNumber = (rule, value, callback) => {
+      if (value !== '' && !/^[0-9]+$/.test(value)) {
+        callback(new Error('只能输入数字!'));
+      } else {
+        callback();
+      }
+    }
     return {
       loading: 0,
       dccDeviceCategoryList: ['CLUSTER', 'BATTERY'],//需要展示上级设备的设备类型
@@ -151,6 +204,17 @@ export default {
         pictureUrl: '',//设备图片
         slaveId: '',//从站地址
       },
+      pcsSetting: {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
+      },
       rules: {
         siteId: [
           {required: true, message: '请选择站点', trigger: ['blur', 'change']}
@@ -183,7 +247,7 @@ export default {
           {validator: validateText, trigger: 'blur'}
         ],
         slaveId: [
-          {validator: validateText, trigger: 'blur'}
+          {validator: validateNumber, trigger: 'blur'}
         ],
         serialPort: [
           {validator: validateText, trigger: 'blur'}
@@ -204,13 +268,47 @@ export default {
         //   { required: true, message: '请上传图片', trigger: ['blur', 'change']}
         // ],
       },
+      pcsSettingRules: {
+        pointAddress: [
+          {required: true, message: '请输入开关机地址', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        powerAddress: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        startCommand: [
+          {required: true, message: '请输入开机指令', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        startPower: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        stopCommand: [
+          {required: true, message: '请输入关机指令', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ],
+        stopPower: [
+          {validator: validateText, trigger: 'blur'}
+        ],
+        clusterNum: [
+          {required: true, message: '请输入电池簇数', trigger: 'blur'},
+          {validator: validateNumber, trigger: 'blur'}
+        ],
+        clusterPointAddress: [
+          {required: true, message: '请输入电池簇地址', trigger: 'blur'},
+          {validator: validateText, trigger: 'blur'}
+        ]
+      }
     }
   },
   computed: {
     ...mapState({
       communicationStatusOptions: state => state?.ems?.communicationStatusOptions || {},
       deviceTypeOptions: state => state?.ems?.deviceTypeOptions || {}
-    })
+    }),
+    isPcs() {
+      return this.formData.deviceCategory === 'PCS'
+    }
   },
   watch: {
     dialogTableVisible: {
@@ -228,7 +326,14 @@ export default {
         if ((newVal || newVal === 0) && this.mode !== 'add') {
           this.loading += 1
           getDeviceDetailInfo(newVal).then(response => {
-            this.formData = JSON.parse(JSON.stringify(response?.data || {}));
+            const {pcsSetting, ...data} = JSON.parse(JSON.stringify(response?.data || {}))
+            this.formData = data;
+            if (pcsSetting && JSON.stringify(pcsSetting) !== '{}') {
+              this.pcsSetting = JSON.parse(JSON.stringify({
+                ...pcsSetting,
+                clusterPointAddress: JSON.parse(pcsSetting.clusterPointAddress || [])
+              }));
+            }
             if (this.dccDeviceCategoryList.includes(this.formData.deviceCategory)) {
               this.getParentDeviceList(true)
             }
@@ -280,91 +385,107 @@ export default {
         this.loading = this.loading - 1
       })
     },
+    saveData() {
+      this.loading += 1
+      const {
+        id = '',
+        siteId = '',//站点ID
+        deviceId = '',//设备id
+        deviceName = '',//设备名称
+        description = '',//设备描述
+        communicationStatus = '',//工作状态
+        deviceType = '',//设备类型
+        deviceCategory = '',//设备类别
+        parentId = '',//上级设备id
+        ipAddress = '',//TCP设备的ip地址
+        ipPort = "",//TCP端口号
+        serialPort = '',//串口路径
+        baudRate = '',//波特率
+        dataBits = '',//数据位
+        stopBits = '',//停止位
+        parity = '',//校验位
+        pictureUrl = '',//设备图片
+        slaveId = '',//从站地址
+      } = this.formData;
+      const {
+        deviceSettingId,
+        powerAddress,
+        pointAddress,
+        startCommand,
+        stopCommand,
+        startPower,
+        stopPower,
+        clusterNum,
+        clusterPointAddress
+      } = this.pcsSetting
+      let params = {
+        siteId,
+        deviceId,
+        deviceName,
+        description,
+        communicationStatus,
+        deviceType,
+        deviceCategory,
+        parentId,
+        ipAddress,
+        ipPort,
+        serialPort,
+        baudRate,
+        dataBits,
+        stopBits,
+        parity,
+        pictureUrl,
+        slaveId,
+      }
+      if (this.isPcs) {
+        params.pcsSetting = {
+          powerAddress,
+          pointAddress,
+          startCommand,
+          stopCommand,
+          startPower,
+          stopPower,
+          clusterNum,
+          clusterPointAddress: JSON.stringify(!clusterNum ? [] : (clusterPointAddress || []).slice(0, clusterNum))
+        }
+      }
+      if (this.mode === 'add') {
+        addDevice(params).then(response => {
+          if (response.code === 200) {
+            //新增成功
+            // 关闭弹窗 更新表格
+            this.$emit('update')
+            this.closeDialog()
+          }
+        }).finally(() => {
+          this.loading -= 1
+        })
+      } else {
+        params.id = id
+        params.pcsSetting && (params.pcsSetting.deviceSettingId = deviceSettingId)
+        updateDevice(params).then(response => {
+          if (response.code === 200) {
+            //新增成功
+            // 关闭弹窗 更新表格
+            this.$emit('update')
+            this.closeDialog()
+          }
+        }).finally(() => {
+          this.loading -= 1
+        })
+      }
+    },
     saveDialog() {
       this.$refs.addTempForm.validate(valid => {
         if (!valid) return
-        this.loading += 1
-        const {
-          id = '',
-          siteId = '',//站点ID
-          deviceId = '',//设备id
-          deviceName = '',//设备名称
-          description = '',//设备描述
-          communicationStatus = '',//工作状态
-          deviceType = '',//设备类型
-          deviceCategory = '',//设备类别
-          parentId = '',//上级设备id
-          ipAddress = '',//TCP设备的ip地址
-          ipPort = "",//TCP端口号
-          serialPort = '',//串口路径
-          baudRate = '',//波特率
-          dataBits = '',//数据位
-          stopBits = '',//停止位
-          parity = '',//校验位
-          pictureUrl = '',//设备图片
-          slaveId = '',//从站地址
-        } = this.formData;
-        if (this.mode === 'add') {
-          addDevice({
-            siteId,
-            deviceId,
-            deviceName,
-            description,
-            communicationStatus,
-            deviceType,
-            deviceCategory,
-            parentId,
-            ipAddress,
-            ipPort,
-            serialPort,
-            baudRate,
-            dataBits,
-            stopBits,
-            parity,
-            pictureUrl,
-            slaveId
-          }).then(response => {
-            if (response.code === 200) {
-              //新增成功
-              // 关闭弹窗 更新表格
-              this.$emit('update')
-              this.closeDialog()
-            }
-          }).finally(() => {
-            this.loading -= 1
+        if (this.isPcs) {
+          this.$refs.pcsSettingForm.validate(pcsValidate => {
+            if (!pcsValidate) return
+            this.saveData()
           })
         } else {
-          updateDevice({
-            id,
-            siteId,
-            deviceId,
-            deviceName,
-            description,
-            communicationStatus,
-            deviceType,
-            deviceCategory,
-            parentId,
-            ipAddress,
-            ipPort,
-            serialPort,
-            baudRate,
-            dataBits,
-            stopBits,
-            parity,
-            pictureUrl,
-            slaveId
-          }).then(response => {
-            if (response.code === 200) {
-              //新增成功
-              // 关闭弹窗 更新表格
-              this.$emit('update')
-              this.closeDialog()
-            }
-          }).finally(() => {
-            this.loading -= 1
-          })
+          this.saveData()
         }
-
       })
     },
     closeDialog() {
@@ -390,12 +511,34 @@ export default {
         pictureUrl: '',//设备图片
         slaveId: '',//从站地址
       }
+      this.pcsSetting = {
+        deviceSettingId: '',
+        powerAddress: '',//功率地址
+        pointAddress: "",//开关机地址
+        startCommand: "",//开机指令
+        stopCommand: "",//关机指令
+        startPower: '',//开机目标功率
+        stopPower: '',//关机目标功率
+        clusterNum: '',//电池簇数
+        clusterPointAddress: []//电池簇地址
+      }
       this.$refs.addTempForm.resetFields()
+      this.$refs?.pcsSettingForm?.resetFields()
       this.dialogTableVisible = false
     }
   }
 }
 
 </script>
-<style scoped>
+<style scoped lang="scss">
+.device-form {
+  ::v-deep .el-form-item--medium .el-form-item__content {
+    width: 260px;
+  }
+
+  .el-form-item {
+    width: 50%;
+    margin-right: 0;
+  }
+}
 </style>