diff --git a/src/api/monitor.js b/src/api/monitor.js
index adaf23c..8fc6d6d 100644
--- a/src/api/monitor.js
+++ b/src/api/monitor.js
@@ -102,6 +102,20 @@ export function deviceCode(data) {
     data,
   });
 }
+
+export function energyStorage(data) {
+  return request({
+    url:
+      '/device/energyStorage?deviceId=' +
+      data.deviceCode +
+      '&page=' +
+      data.page +
+      '&size=' +
+      data.size,
+    method: 'get',
+    data,
+  });
+}
 //传感器数据 可读
 export function sensorsOfWrite(data) {
   return request({
diff --git a/src/views/iot/ywry/index.vue b/src/views/iot/ywry/index.vue
index 3224223..6fcf610 100644
--- a/src/views/iot/ywry/index.vue
+++ b/src/views/iot/ywry/index.vue
@@ -239,7 +239,11 @@ export default {
       productAttribute(code).then(res => {
         this.dialogqrcodeVisible = true;
         this.codeId = row.billNo;
-        this.codeUrl = 'http://sm.lidinghb.com?materialCode=' + code;
+        this.codeUrl =
+          'http://sm.lidinghb.com?materialCode=' +
+          code +
+          '&billNo=' +
+          row.billNo;
         this.qrinfoData = res.data;
       });
     },
diff --git a/src/views/iot/ywry/qcode.vue b/src/views/iot/ywry/qcode.vue
index 6add361..665cd81 100644
--- a/src/views/iot/ywry/qcode.vue
+++ b/src/views/iot/ywry/qcode.vue
@@ -93,7 +93,7 @@ onMounted(() => {
 <style scoped>
 @media print {
   @page {
-    size: 60mm 40mm;
+    size: 90mm 60mm;
     margin: 0;
     padding: 0;
   }
@@ -104,14 +104,10 @@ onMounted(() => {
     margin: 0;
     padding: 0;
   }
-  img {
-    width: 61mm;
-    height: 39mm;
-  }
 
   .container {
-    width: 60mm;
-    height: 40mm;
+    width: 90mm;
+    height: 60mm;
     position: relative;
     .equipment {
       position: absolute;
@@ -123,31 +119,31 @@ onMounted(() => {
     }
     .date {
       position: absolute;
-      top: 47px;
-      left: 18mm;
+      top: 71px;
+      left: 25mm;
 
-      font-size: 6pt;
+      font-size: 9pt;
       font-weight: 500;
       color: #000;
     }
     img {
-      width: 61mm;
-      height: 39mm;
+      width: 85mm;
+      height: 58mm;
     }
 
     .qrcodeimg {
-      width: 12mm;
-      height: 12mm;
+      width: 17mm;
+      height: 17mm;
       position: absolute;
-      bottom: 20px;
-      right: 3mm;
+      bottom: 33px;
+      right: 10mm;
     }
 
     .qrcodeSn {
       position: absolute;
-      bottom: 13px;
-      right: 4mm;
-      font-size: 4pt;
+      bottom: 22px;
+      right: 11mm;
+      font-size: 6pt;
       color: #000;
       font-weight: bold;
     }
diff --git a/src/views/server/siteDetails/energy.vue b/src/views/server/siteDetails/energy.vue
new file mode 100644
index 0000000..e5e7eee
--- /dev/null
+++ b/src/views/server/siteDetails/energy.vue
@@ -0,0 +1,123 @@
+<template>
+  <el-table
+    v-loading="listLoading"
+    :data="sensorData"
+    border
+    stripe
+    style="width: 100%"
+  >
+    <el-table-column
+      prop="name"
+      label="传感器名称"
+      align="center"
+    ></el-table-column>
+    <el-table-column
+      prop="dataKey"
+      label="传输id"
+      align="center"
+    ></el-table-column>
+    <el-table-column prop="dataValue" label="值" align="center">
+      <template #default="{ row }">
+        <el-tag type="success">{{ row.dataValue }}</el-tag>
+      </template>
+    </el-table-column>
+    <el-table-column prop="unit" label="单位" align="center"></el-table-column>
+    <el-table-column label="操作" align="center">
+      <template #default="{ row }">
+        <el-button
+          v-if="row.readWrite == '读写' && isBtnPerm('/deviceSensor/write')"
+          type="text"
+          @click="distribute(row)"
+        >
+          下发指令
+        </el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    :background="background"
+    :current-page="queryForm.page"
+    :layout="layout"
+    :page-size="queryForm.size"
+    :total="total"
+    style="text-align: right"
+    @current-change="handleCurrentChange"
+    @size-change="handleSizeChange"
+  ></el-pagination>
+  <distribute ref="distribute"></distribute>
+</template>
+
+<script>
+import { energyStorage } from '@/api/monitor';
+import distribute from '@/views/server/siteDetails/distribute';
+export default {
+  components: {
+    distribute,
+  },
+  data() {
+    return {
+      sensorData: [],
+      lazy: true,
+      activeName: 'first',
+      layout: 'prev, pager, next',
+      total: 0,
+      background: true,
+      listLoading: true,
+      elementLoadingText: '正在加载...',
+      queryForm: {
+        page: 1,
+        size: 5,
+        deviceCode: '',
+      },
+    };
+  },
+  computed: {
+    height() {
+      return 500;
+    },
+  },
+  methods: {
+    showData(row) {
+      this.queryForm.deviceCode = row.deviceCode;
+      this.fetchData();
+    },
+    async fetchData() {
+      this.listLoading = true;
+      const { data } = await energyStorage(this.queryForm);
+      this.sensorData = data.items;
+      this.total = data.total;
+      setTimeout(() => {
+        this.listLoading = false;
+      }, 500);
+    },
+    distribute(row) {
+      const dataKey = row.dataKey;
+      const deviceCode = this.queryForm.deviceCode;
+      this.$refs['distribute'].showEdit({
+        deviceCode: deviceCode,
+        dataKey: dataKey,
+        unit: row.unit,
+        convertFlag: row.convertFlag,
+      });
+    },
+    handleQuery() {
+      this.queryForm.pageNo = 1;
+      this.fetchData();
+    },
+    handleSizeChange(val) {
+      this.queryForm.pageSize = val;
+      this.fetchData();
+    },
+    handleCurrentChange(val) {
+      this.queryForm.pageNo = val;
+      this.fetchData();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.manage-button {
+  margin-bottom: 30px;
+}
+</style>
diff --git a/src/views/server/siteDetails/index.vue b/src/views/server/siteDetails/index.vue
index 870d12b..8b81260 100644
--- a/src/views/server/siteDetails/index.vue
+++ b/src/views/server/siteDetails/index.vue
@@ -111,6 +111,13 @@
                 :deviceCode="queryForm.deviceCode"
               ></only-index>
             </el-tab-pane>
+
+            <el-tab-pane label="储能信息" name="data-third">
+              <energy-index
+                ref="energy"
+                :deviceCode="queryForm.deviceCode"
+              ></energy-index>
+            </el-tab-pane>
           </el-tabs>
         </div>
       </div>
@@ -126,6 +133,7 @@ import waterIndex from './water';
 import imageIndex from './image';
 import readableIndex from './readable';
 import onlyIndex from './only';
+import energyIndex from './energy';
 import siteIndex from './site';
 export default {
   components: {
@@ -136,6 +144,7 @@ export default {
     imageIndex,
     readableIndex,
     onlyIndex,
+    energyIndex,
   },
   data() {
     return {
@@ -187,10 +196,13 @@ export default {
     },
     handleDataClick(tab, event) {
       const deviceCode = this.queryForm.deviceCode;
+      const deviceId = this.queryForm.id;
       if (tab.paneName == 'data-first') {
         this.$refs['readable'].showData({ deviceCode: deviceCode });
       } else if (tab.paneName == 'data-second') {
         this.$refs['only'].showData({ deviceCode: deviceCode });
+      } else if (tab.paneName == 'data-third') {
+        this.$refs['energy'].showData({ deviceCode: deviceId });
       }
     },
     //获取站点列表
diff --git a/src/views/server/siteDetails/site.vue b/src/views/server/siteDetails/site.vue
index 91d08b4..f0681ad 100644
--- a/src/views/server/siteDetails/site.vue
+++ b/src/views/server/siteDetails/site.vue
@@ -9,7 +9,7 @@
       全屏
     </el-button>
     <iframe
-      id="iframeId"
+      id="iframeIdSite"
       ref="iframe"
       :src="src"
       style="width: 100%; height: 495px"
@@ -78,7 +78,8 @@ export default {
     },
     dianji() {
       //设置后就是id==con_lf_top_div 的容器全屏
-      const case1 = document.getElementById('iframeId');
+      debugger;
+      const case1 = document.getElementById('iframeIdSite');
       if (this.fullscreen) {
         if (document.exitFullscreen) {
           document.exitFullscreen();
diff --git a/src/views/server/siteDetails/technology.vue b/src/views/server/siteDetails/technology.vue
index 1b5fd47..df40aa0 100644
--- a/src/views/server/siteDetails/technology.vue
+++ b/src/views/server/siteDetails/technology.vue
@@ -79,6 +79,7 @@ export default {
     },
     dianji() {
       //设置后就是id==con_lf_top_div 的容器全屏
+      debugger;
       const case1 = document.getElementById('iframeId');
       if (this.fullscreen) {
         if (document.exitFullscreen) {