Browse Source

新bug修复

ming 3 years ago
parent
commit
da32725095

+ 2 - 2
public/static/config.js

@@ -1,9 +1,9 @@
 // api 请求路径
 var PLATFROM_CONFIG = {};
 // PLATFROM_CONFIG.baseUrl = "http://172.16.120.104:8010/" //杨强本地
-// PLATFROM_CONFIG.baseUrl = "http://172.16.1.196:8010/"  //超博本地
+PLATFROM_CONFIG.baseUrl = "http://172.16.1.196:8010/" //超博本地
 
-PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上
+// PLATFROM_CONFIG.baseUrl = "https://qhome.usky.cn/fivapi/" //线上
 PLATFROM_CONFIG.images = "https://qhome.usky.cn/file/" //线上图片
 PLATFROM_CONFIG.fileUrl = "https://qhome.usky.cn/file/" //xlsx文件访问路径
 

+ 4 - 1
src/views/alarmManage/index.vue

@@ -70,6 +70,7 @@
               width:
                 (scope.row.totalGrade / allMaxData.totalNumMax) * 100 + '%',
             }"
+             style="min-width:27px!important"
             @click="goAlarmTotal(0, scope.row.siteName, scope.row.siteId)"
           >
             {{ scope.row.totalGrade }}
@@ -85,6 +86,7 @@
               width:
                 (scope.row.oneGrade / allMaxData.oneAlarmingMax) * 100 + '%',
             }"
+             style="min-width:27px!important"
             @click="goAlarmTotal(1, scope.row.siteName, scope.row.siteId)"
           >
             {{ scope.row.oneGrade }}
@@ -98,8 +100,9 @@
             :class="{ transparent: scope.row.twoGrade == 0 }"
             :style="{
               width:
-                (scope.row.twoGrade / allMaxData.twoAlarmingMax) * 100 + '%',
+                (scope.row.twoGrade / allMaxData.twoAlarmingMax) * 100 + '%'
             }"
+            style="min-width:27px!important"
             @click="goAlarmTotal(2, scope.row.siteName, scope.row.siteId)"
           >
             {{ scope.row.twoGrade }}

+ 1 - 1
src/views/deviceManage/powerEquip/communicateEquip/index.vue

@@ -113,7 +113,7 @@
           prop="statusTime"
           label="最后通信时间"
           align="center"
-          width=""
+          min-width="160px"
         ></el-table-column>
         <el-table-column
           prop="offlineDuration"

+ 16 - 15
src/views/planOutage/index.vue

@@ -64,24 +64,24 @@
       <el-table-column
         prop="siteName"
         label="站点名称"
-        width=""
+          min-width="160px"
       ></el-table-column>
       <el-table-column
         prop="startTime"
         label="开始停电时间"
-        width=""
+        min-width="155px"
       ></el-table-column>
       <el-table-column
         prop="endTime"
         label="结束停电时间"
-        width=""
+        min-width="155px"
       ></el-table-column>
       <el-table-column
         prop="createTime"
         label="提交时间"
-        width=""
+        min-width="155px"
       ></el-table-column>
-      <el-table-column prop="creator" label="提交人" width=""></el-table-column>
+      <el-table-column prop="creator" label="提交人"  min-width="110px"></el-table-column>
       <el-table-column prop="type" label="状态" width="">
         <template #default="scope">
           <span
@@ -311,18 +311,19 @@ export default defineComponent({
       return 'background:#FAFAFA;'
     }
     //处理状态状态值变色
-    const cellStyle = (row, column, rowIndex, columnIndex) => {
-      column, rowIndex, columnIndex
-      // console.log('rowIndex', row, column, rowIndex, columnIndex)
-      // console.log(row.row.status)
-      // console.log(row)
-      if (row.column.status == '未执行') {
-        return 'color:#FF747B'
-      }
-      if (row.column.label == '已执行') {
-        return 'color:#8DCF6E'
+  
+
+     const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
+      row, column, rowIndex
+      // console.log(row, column, rowIndex)
+    
+      if (columnIndex) {
+        // return `text-align:left;cursor:pointer;`
+      } else {
+        return ''
       }
     }
+
      //导出
     const DataReportExport = () => {
       store.commit('TimeAll_function', dateTime.value)

+ 1 - 1
src/views/stationManage/index.vue

@@ -60,7 +60,7 @@
             <span v-else>{{ scope.row.siteCount }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="挂载设备数量" width="350">
+        <el-table-column label="挂载设备数量" >
           <template #default="scope">
             <span>{{ scope.row.deviceCount }}</span>
           </template>

+ 3 - 3
src/views/systemManage/userManage/index.vue

@@ -65,13 +65,13 @@
       </el-table-column> -->
       <el-table-column prop="nickName" label="用户名"></el-table-column>
       <el-table-column prop="userName" label="账号"></el-table-column>
-      <el-table-column prop="sex" label="性别">
+      <el-table-column prop="sex" label="性别" width="100">
         <template #default="scope">
           <span>{{ scope.row.sex == 1 ? '男' : '女' }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="phonenumber" label="手机号码"></el-table-column>
-      <el-table-column prop="createTime" label="创建时间"></el-table-column>
+      <el-table-column prop="phonenumber" label="手机号码" min-width="120"></el-table-column>
+      <el-table-column prop="createTime" label="创建时间" min-width="160"></el-table-column>
       <!-- <el-table-column
         prop="roles.roleName"
         label="角色名称"