样式

ems-ui/src/views/analysis/power/consume.vue

@@ -93,9 +93,9 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="电压 " align="center" prop="voltage" />
-      <el-table-column label="电流 " align="center" prop="amperage" />
-      <el-table-column label="功率 " align="center" prop="power" />
+      <el-table-column label="电压(V)" align="center" prop="voltage" />
+      <el-table-column label="电流(A) " align="center" prop="amperage" />
+      <el-table-column label="功率(W)" align="center" prop="power" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ems-ui/src/views/analysis/power/save.vue

@@ -109,8 +109,8 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="充电电量 " align="center" prop="chargeElecQuantity" />
-      <el-table-column label="放电电量" align="center" prop="dischargeElecQuantity" />
+      <el-table-column label="充电电量(kW-h)" align="center" prop="chargeElecQuantity" />
+      <el-table-column label="放电电量(kW-h)" align="center" prop="dischargeElecQuantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ems-ui/src/views/analysis/power/store.vue

@@ -109,8 +109,8 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="充电电量 " align="center" prop="chargeElecQuantity" />
-      <el-table-column label="放电电量" align="center" prop="dischargeElecQuantity" />
+      <el-table-column label="充电电量(kW-h)" align="center" prop="chargeElecQuantity" width="130" />
+      <el-table-column label="放电电量(kW-h)" align="center" prop="dischargeElecQuantity" width="130"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -55,6 +55,27 @@
               {{formatDict(scope.row.objTag,'objTagOptions')}}
             </template>
           </el-table-column>
+
+<!--          <el-table-column label="计量标签" align="center" prop="objTag">-->
+<!--            <template slot-scope="scope">-->
+<!--                  <span-->
+<!--                    :style="{-->
+<!--                      padding: '6px 12px',-->
+<!--                      borderRadius: '4px',-->
+<!--                      display: 'inline-block',-->
+<!--                      textAlign: 'center',-->
+<!--                      cursor: 'pointer',-->
+<!--                      color: (scope.row.objTag === 0) ? '#000' : '#000',-->
+<!--                      backgroundColor: (scope.row.objTag === 0) ? '#add8e6' : (scope.row.objTag === 1) ? '#ffff99' : '',-->
+<!--                      minWidth: '70px',-->
+<!--                      height: '35px',-->
+<!--                      textAlign: 'center'-->
+<!--                    }"-->
+<!--                  >-->
+<!--             {{ formatDict(scope.row.objTag, 'objTagOptions') }}-->
+<!--                   </span>-->
+<!--          </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="设备代码" align="center" prop="deviceCode" />
           <el-table-column label="计量类别" align="center" prop="meterCls">
             <template slot-scope="scope">
@@ -340,6 +361,7 @@ export default {
         this.form = response.data
         this.open = true
         this.title = '修改计量设备'
+        console.log("更新的数据:", this.form)
       })
 
       this.objCode = row.objCode
@@ -453,7 +475,7 @@ export default {
       if (objType === 1) {
         areaTreeSelectByCode('Area', this.form.areaCode).then(response => {
           this.objCodeOptions = response.data
-          console.log("onjcodeOPtion!!!",this.objCodeOptions)
+          console.log("objcodeOPtion!!!",this.objCodeOptions)
         })
       } else if (objType === 2) {
         devTreeByFacs(this.form.areaCode).then(response => {

ems-ui/src/views/basecfg/zoning/index.vue

@@ -52,7 +52,13 @@
           <el-table-column label="分区名称" align="left" prop="zoningName" />
           <el-table-column label="分区编码" align="center" prop="zoningCode" width="200" />
           <el-table-column label="所在建筑" align="left" prop="areaPath" />
-          <el-table-column label="区块标签" align="center" prop="tagNames" />
+          <el-table-column label="区块标签" align="center">
+            <template slot-scope="scope">
+              <span v-for="tag in scope.row.tagNames" :key="tag" :style="getTagStyle(tag)" class="tag-label">
+                {{ tag }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:zoning:edit']">
@@ -174,6 +180,7 @@ export default {
     this.getEmsTag('Area')
   },
   methods: {
+
     formatDict(val, options, key = 'code', text = 'name') {
       let name = ''
       this[options].forEach(item => {
@@ -183,14 +190,26 @@ export default {
       })
       return name
     },
+    getTagStyle(tag) {
+      const styleMap = {
+        '公共区域': 'background-color: rgb(255,255,125); color: rgb(109,109,150); padding: 4px 8px; border-radius: 4px; width: 80px; height: 30px; margin: 4px 8px 4px 0; display: inline-block; vertical-align: top;',
+        '商户区域': 'background-color: rgb(206,206,255); color: rgb(109,109,150); padding: 4px 8px; border-radius: 4px; width: 80px; height: 30px; margin: 4px 8px 4px 0; display: inline-block; vertical-align: top;',
+        '热点区域': 'background-color: rgb(203,255,99); color: rgb(109,109,150); padding: 4px 8px; border-radius: 4px; width: 80px; height: 30px; margin: 4px 8px 4px 0; display: inline-block; vertical-align: top;'
+      };
+      return styleMap[tag] || 'background-color: #FFFFFF; color: #000000; padding: 4px 8px; border-radius: 4px; width: 80px; height: 30px; margin: 4px 8px 4px 0; display: inline-block; vertical-align: top;';
+    },
     /** 查询建筑区域划分列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
       listZoning(this.queryParams).then(response => {
-        this.zoningList = response.rows
-        this.total = response.total
-        this.loading = false
-      })
+        this.zoningList = response.rows.map(item => {
+          // 将 tagNames 字符串转换为数组
+          item.tagNames = item.tagNames.split(',').map(tag => tag.trim());
+          return item;
+        });
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     /** 查询区域树结构 */
     getAreaTree(tier) {
@@ -320,3 +339,4 @@ export default {
   }
 }
 </script>
+

ems-ui/src/views/ca/emission.vue

@@ -17,7 +17,7 @@
           placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="碳排放量 " prop="caEmissionQuantity">
+      <el-form-item label="碳排放量" prop="caEmissionQuantity">
         <el-input
           v-model="queryParams.caEmissionQuantity"
           placeholder="请输入碳排放量 "
@@ -94,8 +94,8 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="碳排放量 " align="center" prop="caEmissionQuantity" />
-      <el-table-column label="碳汇量" align="center" prop="caSinkQuantity" />
+      <el-table-column label="碳排放量(kg)" align="center" prop="caEmissionQuantity" />
+      <el-table-column label="碳汇量(kg)" align="center" prop="caSinkQuantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ems-ui/src/views/devmgr/state/index.vue

@@ -59,9 +59,29 @@
           <el-table-column label="归属设施" align="center" prop="refFacsName"/>
           <el-table-column label="设备类型" align="center" prop="deviceTypeName"/>
           <el-table-column label="子系统" align="center" prop="subsystemName"/>
+<!--          <el-table-column label="设备状态" align="center" prop="deviceStatus">-->
+<!--            <template slot-scope="scope">-->
+<!--              <dict-tag :options="dict.type.sys_device_stat" :value="scope.row.deviceStatus"/>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="设备状态" align="center" prop="deviceStatus">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_device_stat" :value="scope.row.deviceStatus"/>
+                <span
+                  :style="{
+                        padding: '6px 12px',
+                        borderRadius: '4px',
+                        display: 'inline-block',
+                        textAlign: 'center',
+                        cursor: 'pointer',
+                        color: getDeviceStatusTextColor(scope.row.deviceStatus),
+                        backgroundColor: getDeviceStatusBgColor(scope.row.deviceStatus),
+                        minWidth: '70px',
+                        height: '35px',
+                        textAlign: 'center'
+                 }"
+                >
+                  {{ getDeviceStatusText(scope.row.deviceStatus) }}
+                   </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -186,6 +206,26 @@ export default {
     this.getSubsystem();
   },
   methods: {
+    getDeviceStatusText(status) {
+      const statusMap = {
+        0: '运行',
+        1: '故障',
+        2: '未运行'
+      };
+      return statusMap[status] || '';
+    },
+    getDeviceStatusTextColor(status) {
+      if (status === 0) return 'rgb(232,244,255)';
+      if (status === 1) return '#FFFFFF';
+      if (status === 2) return 'rgb(255,235,235)';
+      return '#000000'; // 默认黑色文字
+    },
+    getDeviceStatusBgColor(status) {
+      if (status === 0) return 'rgb(117,186,255)';
+      if (status === 1) return 'rgb(242,197,92)';
+      if (status === 2) return 'rgb(255,159,159)';
+      return 'transparent'; // 默认无背景色
+    },
     /** 查询能源设备列表 */
     getList() {
       this.loading = true

ems-ui/src/views/mgr/powergrid.vue

@@ -27,9 +27,9 @@
               <span>{{ getMeterTypeName(scope.row.meterType) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="单位电价" align="center" prop="meterUnitPrice" />
-          <el-table-column label="供电量" align="center" prop="useElecQuantity" />
-          <el-table-column label="供电电费" align="center" prop="useElecCost" />
+          <el-table-column label="单位电价(￥)" align="center" prop="meterUnitPrice" />
+          <el-table-column label="供电量(kW-h)" align="center" prop="useElecQuantity" />
+          <el-table-column label="供电电费(￥)" align="center" prop="useElecCost" />
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="光伏" name="second">
@@ -53,10 +53,10 @@
               <span>{{ scope.row.time }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="总发电量" align="center" prop="genElecQuantity" />
-          <el-table-column label="自用电量" align="center" prop="useElecQuantity" />
-          <el-table-column label="上网电量" align="center" prop="upElecQuantity" />
-          <el-table-column label="上网收益" align="center" prop="upElecEarn" />
+          <el-table-column label="总发电量(kW-h)" align="center" prop="genElecQuantity" />
+          <el-table-column label="自用电量(kW-h)" align="center" prop="useElecQuantity" />
+          <el-table-column label="上网电量(kW-h)" align="center" prop="upElecQuantity" />
+          <el-table-column label="上网收益(￥)" align="center" prop="upElecEarn" />
         </el-table>
       </el-tab-pane>
     </el-tabs>

ems-ui/src/views/mgr/powerstore.vue

@@ -14,8 +14,8 @@
       </el-table-column>
       <el-table-column label="时间" align="center" prop="time">
       </el-table-column>
-      <el-table-column label="充电电量 " align="center" prop="chargeElecQuantity" />
-      <el-table-column label="放电电量" align="center" prop="dischargeElecQuantity" />
+      <el-table-column label="充电电量(kW-h)" align="center" prop="chargeElecQuantity" />
+      <el-table-column label="放电电量(kW-h)" align="center" prop="dischargeElecQuantity" />
     </el-table>
   </div>
 </template>

ems-ui/src/views/mgr/poweruse.vue

@@ -84,7 +84,7 @@
         </template>
       </el-table-column>
       <el-table-column label="时间序列" align="center" prop="timeIndex" />
-      <el-table-column label="用电量" align="center" prop="elecQuantity" />
+      <el-table-column label="用电量(kW-h)" align="center" prop="elecQuantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems:h:edit']">

ems-ui/src/views/prediction/ca.vue

@@ -17,7 +17,7 @@
                         placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="碳排量（千克）" prop="caEmission">
+      <el-form-item label="碳排量" prop="caEmission">
         <el-input
             v-model="queryParams.caEmission"
             placeholder="请输入"
@@ -90,7 +90,7 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="碳排量（千克）" align="center" prop="caEmission" />
+      <el-table-column label="碳排量（kg）" align="center" prop="caEmission" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -130,7 +130,7 @@
                           placeholder="请选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="碳排量（千克）" prop="caEmission">
+        <el-form-item label="碳排量" prop="caEmission">
           <el-input v-model="form.caEmission" placeholder="请输入" />
         </el-form-item>
       </el-form>

ems-ui/src/views/prediction/consume.vue

@@ -114,7 +114,7 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="功率 " align="center" prop="elecUseQuantity" />
+      <el-table-column label="功率(W)" align="center" prop="elecUseQuantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

ems-ui/src/views/prediction/prod.vue

@@ -109,8 +109,8 @@
           <span>{{ parseTime(scope.row.date, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="发电量" align="center" prop="elecProdQuantity" />
-      <el-table-column label="功率" align="center" prop="avgPower" />
+      <el-table-column label="发电量(kW-h)" align="center" prop="elecProdQuantity" />
+      <el-table-column label="功率(W)" align="center" prop="avgPower" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button