Browse Source

全部图标修改

hsshuxian 11 months ago
parent
commit
b2f4a61881
32 changed files with 148 additions and 270 deletions
  1. 4 7
      ems-ui/src/views/adapter/subsystem/index.vue
  2. 3 8
      ems-ui/src/views/alarm/alarm-info/index.vue
  3. 4 7
      ems-ui/src/views/alarm/index.vue
  4. 3 8
      ems-ui/src/views/analysis/power/consume.vue
  5. 3 8
      ems-ui/src/views/analysis/power/save.vue
  6. 3 8
      ems-ui/src/views/analysis/power/store.vue
  7. 5 14
      ems-ui/src/views/basecfg/area/index.vue
  8. 5 4
      ems-ui/src/views/basecfg/building/index.vue
  9. 6 14
      ems-ui/src/views/basecfg/cacfg/index.vue
  10. 5 16
      ems-ui/src/views/basecfg/device/index.vue
  11. 3 3
      ems-ui/src/views/basecfg/emsfacs/index.vue
  12. 5 4
      ems-ui/src/views/basecfg/facstype/index.vue
  13. 4 14
      ems-ui/src/views/basecfg/flowrel/index.vue
  14. 4 3
      ems-ui/src/views/basecfg/meterdevc/index.vue
  15. 4 4
      ems-ui/src/views/basecfg/powerbox/index.vue
  16. 21 18
      ems-ui/src/views/basecfg/price/index.vue
  17. 8 7
      ems-ui/src/views/basecfg/tag/index.vue
  18. 3 3
      ems-ui/src/views/basecfg/zoning/index.vue
  19. 3 7
      ems-ui/src/views/ca/emission.vue
  20. 6 8
      ems-ui/src/views/devmgr/el/index.vue
  21. 5 2
      ems-ui/src/views/devmgr/meterRead/index.vue
  22. 6 5
      ems-ui/src/views/mgr/powerstore.vue
  23. 4 14
      ems-ui/src/views/mgr/poweruse.vue
  24. 3 8
      ems-ui/src/views/mgr/strategy.vue
  25. 4 14
      ems-ui/src/views/monitor/job/index.vue
  26. 2 0
      ems-ui/src/views/monitor/job/log.vue
  27. 2 7
      ems-ui/src/views/monitor/online/index.vue
  28. 3 8
      ems-ui/src/views/prediction/ca.vue
  29. 4 8
      ems-ui/src/views/prediction/consume.vue
  30. 3 8
      ems-ui/src/views/prediction/prod.vue
  31. 7 23
      ems-ui/src/views/task/ManualInspection.vue
  32. 3 8
      ems-ui/src/views/task/report/index.vue

+ 4 - 7
ems-ui/src/views/adapter/subsystem/index.vue

@@ -78,13 +78,10 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems:subsystem:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:subsystem:remove']"
-          >删除</el-button>
+
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:subsystem:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/alarm/alarm-info/index.vue

@@ -172,14 +172,9 @@
               v-hasPermi="['ems:alarm-info:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:alarm-info:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:alarm-info:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 4 - 7
ems-ui/src/views/alarm/index.vue

@@ -115,6 +115,7 @@
       </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"
@@ -122,13 +123,9 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems:alarm-strategy:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:alarm-strategy:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:alarm-strategy:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/analysis/power/consume.vue

@@ -106,14 +106,9 @@
               v-hasPermi="['ems:loadIndex:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:loadIndex:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:loadIndex:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/analysis/power/save.vue

@@ -121,14 +121,9 @@
               v-hasPermi="['ems:elecStoreH:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:elecStoreH:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:elecStoreH:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/analysis/power/store.vue

@@ -121,14 +121,9 @@
               v-hasPermi="['ems:elecStoreH:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:elecStoreH:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:elecStoreH:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 5 - 14
ems-ui/src/views/basecfg/area/index.vue

@@ -84,20 +84,11 @@
       </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:servicearea:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['basecfg:servicearea:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:servicearea:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:servicearea:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 5 - 4
ems-ui/src/views/basecfg/building/index.vue

@@ -55,10 +55,11 @@
           </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:building:edit']">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['basecfg:building:remove']">删除</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:building:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:building:remove']">
+                删除</el-button>
+
             </template>
           </el-table-column>
         </el-table>

+ 6 - 14
ems-ui/src/views/basecfg/cacfg/index.vue

@@ -59,20 +59,12 @@
       <el-table-column label="数据版本" align="center" prop="version" />
       <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:emissionFactor:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['basecfg:emissionFactor:remove']"
-          >删除</el-button>
+
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:emissionFactor:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:emissionFactor:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 5 - 16
ems-ui/src/views/basecfg/device/index.vue

@@ -114,22 +114,11 @@
           <el-table-column label="所属子系统" align="center" prop="subsystemName"/>
           <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:device:edit']"
-              >修改
-              </el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['ems:device:remove']"
-              >删除
-              </el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:device:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:device:remove']">
+                删除</el-button>
+
             </template>
           </el-table-column>
         </el-table>

+ 3 - 3
ems-ui/src/views/basecfg/emsfacs/index.vue

@@ -74,11 +74,11 @@
           </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" @click="handleDetail(scope.row)" v-hasPermi="['basecfg:emsfacs:edit']">
+              <el-button size="mini" type="text" icon="el-icon-info" @click="handleDetail(scope.row)" v-hasPermi="['basecfg:emsfacs:edit']">
                 详情</el-button>
-              <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:emsfacs:edit']">
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:emsfacs:edit']">
                 修改</el-button>
-              <el-button size="mini" type="text" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:emsfacs:remove']">
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:emsfacs:remove']">
                 删除</el-button>
             </template>
           </el-table-column>

+ 5 - 4
ems-ui/src/views/basecfg/facstype/index.vue

@@ -28,10 +28,11 @@
       <el-table-column label="数据版本" align="center" prop="version" />
       <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:facstype:edit']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['basecfg:facstype:remove']">删除</el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:facstype:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:facstype:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 4 - 14
ems-ui/src/views/basecfg/flowrel/index.vue

@@ -94,20 +94,10 @@
       <el-table-column label="能流动作" align="center" prop="actionType" :formatter="getActionType"/>
       <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:flowrel:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['basecfg:flowrel:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:flowrel:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:flowrel:remove']">
+            删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 4 - 3
ems-ui/src/views/basecfg/meterdevc/index.vue

@@ -73,10 +73,11 @@
           </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="['ems:device:edit']">修改
-              </el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ems:device:remove']">
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:device:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:device:remove']">
                 删除</el-button>
+
             </template>
           </el-table-column>
         </el-table>

+ 4 - 4
ems-ui/src/views/basecfg/powerbox/index.vue

@@ -51,10 +51,10 @@
       <el-table-column label="安装位置" align="center" prop="location" />
       <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:box:edit']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ems:box:remove']">删除
-          </el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:box:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:box:remove']">
+            删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 21 - 18
ems-ui/src/views/basecfg/price/index.vue

@@ -21,11 +21,11 @@
           </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="handleAttrUpdate(scope.row)"
-                v-hasPermi="['basecfg:price:edit']">修改
-              </el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleAttrDelete(scope.row)"
-                v-hasPermi="['basecfg:price:remove']">删除</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleAttrUpdate(scope.row)" v-hasPermi="['basecfg:price:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleAttrDelete(scope.row)" v-hasPermi="['basecfg:price:remove']">
+                删除</el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -88,10 +88,11 @@
           </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="handleGwPriceUpdate(scope.row)"
-                v-hasPermi="['basecfg:price:edit']">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleGwPriceDelete(scope.row)"
-                v-hasPermi="['basecfg:price:remove']">删除</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleGwPriceUpdate(scope.row)" v-hasPermi="['basecfg:price:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleGwPriceDelete(scope.row)" v-hasPermi="['basecfg:price:remove']">
+                删除</el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -157,8 +158,9 @@
           <el-table-column label="地方补贴" align="center" prop="localSubsidy" />
           <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="handlePvPriceUpdate(scope.row)"
-                v-hasPermi="['basecfg:price:edit']">修改</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handlePvPriceUpdate(scope.row)" v-hasPermi="['basecfg:price:edit']">
+                修改</el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -210,12 +212,13 @@
           <el-table-column label="优先级" align="center" prop="priority" />
           <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-view" v-if="scope.row.editFlag==0" @click="handleStrategyDetail(scope.row)">
+              <el-button size="mini" type="text" icon="el-icon-info"  v-if="scope.row.editFlag==0" @click="handleStrategyDetail(scope.row)" v-hasPermi="['basecfg:price:edit']">
                 查看</el-button>
-              <el-button size="mini" type="text" icon="el-icon-edit" v-else @click="handleStrategyUpdate(scope.row)"
-                v-hasPermi="['basecfg:price:edit']">修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleStrategyDelete(scope.row)"
-                v-hasPermi="['basecfg:price:del']" :disabled="scope.row.editFlag==0">删除</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit"  v-else @click="handleStrategyUpdate(scope.row)" v-hasPermi="['basecfg:price:edit']">
+                修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleStrategyDelete(scope.row)" v-hasPermi="['basecfg:price:remove']" :disabled="scope.row.editFlag==0">
+                删除</el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -326,8 +329,8 @@
           <el-table-column label="水费说明" align="center" prop="waterComputeDesc" show-overflow-tooltip />
           <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="handleChargingUpdate(scope.row)"
-                v-hasPermi="['basecfg:price:edit']">修改</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleChargingUpdate(scope.row)" v-hasPermi="['basecfg:price:edit']">
+                修改</el-button>
               <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleChargingDelete(scope.row)"
                 v-hasPermi="['basecfg:price:del']">删除</el-button> -->
             </template>

+ 8 - 7
ems-ui/src/views/basecfg/tag/index.vue

@@ -92,13 +92,14 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems:tag:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:tag:remove']"
-          >删除</el-button>
+          <el-button size="mini"
+                     type="text"
+                     icon="el-icon-delete"
+                     class="deleteBtn"
+                     @click="handleDelete(scope.row)"
+                     v-hasPermi="['basecfg:tag:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

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

@@ -72,10 +72,10 @@
           </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']">
+              <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:zoning:edit']">
                 修改</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['basecfg:zoning:remove']">删除</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:zoning:remove']">
+                删除</el-button>
             </template>
           </el-table-column>
         </el-table>

+ 3 - 7
ems-ui/src/views/ca/emission.vue

@@ -105,13 +105,9 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems:caMeterD:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:caMeterD:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:caMeterD:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 6 - 8
ems-ui/src/views/devmgr/el/index.vue

@@ -127,13 +127,9 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['ems:rbook:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:rbook:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:rbook:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -353,9 +349,10 @@ export default {
         listFacs(this.queryParams).then(response => {
           //总条数
           this.total = response.total
+          console.log("设施所有信息的条数!!!",this.total)
           this.AllCode = [];
           //循环输出
-          for (let i = 0; i <=this.total ; i++) {
+          for (let i = 0; i <this.total ; i++) {
             this.AllCode.push({ value:response.rows[i].facsCode, label: response.rows[i].facsCode}); // 添加到数组
           }
           this.loading = false
@@ -365,6 +362,7 @@ export default {
         this.loading = true
         listDevRecursionByArea(this.queryParams).then(response => {
           this.total = response.total
+          console.log("设备所有信息的条数!!!",this.total)
           this.AllCode = [];
           //循环输出
           for (let i = 0; i <this.total ; i++) {

+ 5 - 2
ems-ui/src/views/devmgr/meterRead/index.vue

@@ -46,8 +46,11 @@
           </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" @click="handleRecord(scope.row)">填报</el-button>
-              <el-button size="mini" type="text" @click="handleViewRec(scope.row)">查看</el-button>
+              <el-button size="mini" type="text" icon="el-icon-info" @click="handleRecord(scope.row)">
+                填报</el-button>
+              <el-button size="mini" type="text"  icon="el-icon-document" @click="handleViewRec(scope.row)">
+                查看</el-button>
+
             </template>
           </el-table-column>
         </el-table>

+ 6 - 5
ems-ui/src/views/mgr/powerstore.vue

@@ -51,11 +51,12 @@
       <el-table-column label="放电电量" align="center" prop="dischargeElecQuantity" />
       <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:elecStoreH:edit']">修改
-          </el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ems:elecStoreH:remove']">
-            删除
-          </el-button>
+
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems:elecStoreH:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:elecStoreH:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 4 - 14
ems-ui/src/views/mgr/poweruse.vue

@@ -87,20 +87,10 @@
       <el-table-column label="用电量" 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']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems:h:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems:h:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:h:remove']">
+            删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/mgr/strategy.vue

@@ -151,14 +151,9 @@
               v-hasPermi="['ems:energyStrategy:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:energyStrategy:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:energyStrategy:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 4 - 14
ems-ui/src/views/monitor/job/index.vue

@@ -114,20 +114,10 @@
       </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="['monitor:job:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['monitor:job:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['monitor:job:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['monitor:job:remove']">
+            删除</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">

+ 2 - 0
ems-ui/src/views/monitor/job/log.vue

@@ -124,6 +124,8 @@
       </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-info" @click="handleDetail(scope.row)" v-hasPermi="['monitor:job:query']">
+            详情</el-button>
           <el-button
             size="mini"
             type="text"

+ 2 - 7
ems-ui/src/views/monitor/online/index.vue

@@ -43,13 +43,8 @@
       </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-delete"
-            @click="handleForceLogout(scope.row)"
-            v-hasPermi="['monitor:online:forceLogout']"
-          >强退</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleForceLogout(scope.row)" v-hasPermi="['monitor:online:forceLogout']">
+            强退</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/prediction/ca.vue

@@ -101,14 +101,9 @@
               v-hasPermi="['ems:forecastCa:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:forecastCa:remove']"
-          >删除
-          </el-button>
+
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:forecastCa:remove']">
+            删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 4 - 8
ems-ui/src/views/prediction/consume.vue

@@ -125,14 +125,10 @@
               v-hasPermi="['ems:forecastConsume:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:forecastConsume:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:forecastConsume:remove']">
+            删除</el-button>
+
+
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/prediction/prod.vue

@@ -121,14 +121,9 @@
               v-hasPermi="['ems:predictionProd:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:predictionProd:remove']"
-          >删除
-          </el-button>
+
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:predictionProd:remove']">
+            删除</el-button>
         </template>
       </el-table-column>
     </el-table>

+ 7 - 23
ems-ui/src/views/task/ManualInspection.vue

@@ -138,29 +138,13 @@
       <el-table-column label="对象名称" align="center" prop="objName" />
       <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:inspection-task:edit']"
-          >修改
-          </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              @click="handleInspection(scope.row)"
-              v-hasPermi="['ems:inspection-task:edit']"
-          >巡检
-          </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:inspection-task:remove']"
-          >删除
-          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-info" @click="handleInspection(scope.row)" v-hasPermi="['ems:inspection-task:edit']">
+            巡检</el-button>
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems:inspection-task:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:emsfacs:remove']">
+            删除</el-button>
+
         </template>
       </el-table-column>
     </el-table>

+ 3 - 8
ems-ui/src/views/task/report/index.vue

@@ -114,14 +114,9 @@
               v-hasPermi="['ems:inspection-report:edit']"
           >修改
           </el-button>
-          <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['ems:inspection-report:remove']"
-          >删除
-          </el-button>
+
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['ems:inspection-report:remove']">
+            删除</el-button>
         </template>
       </el-table-column>
     </el-table>