bug修复

src/api/planOutage/index.js

@@ -37,4 +37,11 @@ export function plannedOutageUpdate(params) {
 }
 
 
-
+//停电计划-导出
+export function outagePlanListExport(params) {
+    return request({
+        url: 'wcBlackoutPlan/outagePlanListExport',
+        method: 'GET',
+        params,
+    })
+}

src/api/siteManage/watchDog.js

@@ -41,6 +41,16 @@ export function deviceNewsDel(params) {
     })
 }
 
+
+//监控设备-导出
+export function deviceAttributeExport(params) {
+    return request({
+        url: '/deviceAttribute/deviceAttributeExport',
+        method: 'GET',
+        params,
+    })
+}
+
 // export function variableListone(params) {
 //     return request({
 //         url: '/deviceAnalogVariableList/variableListone',

src/views/deviceManage/powerEquip/index.vue

@@ -210,7 +210,7 @@ export default defineComponent({
       if (deviceNumData.value.length > 0) {
         datalist.value[0].siteId = store.state.siteId
       }
-      updateTitle.value = '新增设备信息'
+      updateTitle.value = '新增'
       show.value = true
     }
     //修改 向子组件 参数传递

src/views/deviceManage/powerEquip/powerDialog/insertDialog.vue

@@ -178,7 +178,7 @@ export default defineComponent({
             form.value.qualityAnalysis == true
               ? (form.value.qualityAnalysis = '是')
               : (form.value.qualityAnalysis = '否')
-          if (props.updateTitle == '新增设备信息') {
+          if (props.updateTitle == '新增') {
             api.deviceNewsAdd(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({

src/views/deviceManage/powerEquip/videoEquip/index.vue

@@ -33,14 +33,14 @@
         >
           搜索
         </el-button>
-        <el-button
+        <!-- <el-button
           class="search-button"
           icon="el-icon-plus"
           type="success"
           @click="Insert()"
         >
           新增
-        </el-button>
+        </el-button> -->
       </div>
 
       <!-- <div class="videoRight">

src/views/planOutage/index.vue

@@ -47,7 +47,7 @@
       </div>
 
       <div class="right">
-        <el-button type="primary">导出</el-button>
+        <el-button type="primary"  @click="DataReportExport()">导出</el-button>
       </div>
     </div>
     <!-- 筛选end -->
@@ -60,7 +60,7 @@
       :header-cell-style="headClass"
       :cell-style="cellStyle"
     >
-      <el-table-column type="index" label="序号" width=""></el-table-column>
+      <el-table-column type="index" label="序号" width="50px"></el-table-column>
       <el-table-column
         prop="siteName"
         label="站点名称"
@@ -322,6 +322,28 @@ export default defineComponent({
       if (row.column.label == '已执行') {
         return 'color:#8DCF6E'
       }
+    }
+     //导出
+    const DataReportExport = () => {
+      store.commit('TimeAll_function', dateTime.value)
+      const time = store.state.Time_Data
+      api
+        .outagePlanListExport({
+           type: region.value,
+          startTime: time[0]?time[0]:'',
+          endTime: time[1]?time[1]:'',
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            ElMessage.success({
+              message: '导出成功',
+              type: 'success',
+            })
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
     }
     return {
       cellStyle,
@@ -354,6 +376,8 @@ export default defineComponent({
       dialogTitle,
       input,
       region,
+
+      DataReportExport
     }
   },
 })

src/views/siteManage/variableList/index.vue

@@ -13,7 +13,7 @@
           </el-button>
         </div>
 
-        <div style="margin-top: 20px">
+        <div style="margin-top: 15px">
           <el-button @click="Select(1)" :type="select == 1 ? 'primary' : ''">
             模拟量
           </el-button>
@@ -77,25 +77,25 @@
       <el-table-column
         type="index"
         label="序号"
-        width=""
+        width="80px"
         sortable
       ></el-table-column>
       <el-table-column
         prop="variableName"
         label="变量名"
-        width=""
+        width="150px"
         sortable
       ></el-table-column>
       <el-table-column
         prop="variableCoding"
         label="变量编号"
-        width=""
+          width="150px"
         sortable
       ></el-table-column>
       <el-table-column
         prop="monitorDeviceName"
         label="监控设备"
-        width=""
+          width="150px"
       ></el-table-column>
       <el-table-column
         prop="deviceName"

src/views/siteManage/watchDog/index.vue

@@ -6,8 +6,22 @@
       <!-- <el-button icon="el-icon-plus" type="success" @click="addItem()">新增</el-button > -->
 
       <div>
-        <el-button type="primary">导入</el-button>
-        <el-button type="primary">导出</el-button>
+        <el-upload
+          class="upload-demo"
+          :action="fileUrl + '/deviceAttribute/deviceAttributeImport'"
+          :on-progress="handleProgress"
+          :on-success="handleUpAvatar"
+          multiple
+          :limit="1"
+          :headers="{
+            accessToken: [accessToken],
+          }"
+          :file-list="fileList"
+          style="margin-right:10px;display:inline-block"
+        >
+          <el-button size="small" type="primary">导入</el-button>
+        </el-upload>
+        <el-button type="primary"  @click="DataReportExport()">导出</el-button>
       </div>
     </div>
     <!-- 筛选end -->
@@ -145,6 +159,7 @@
 </template>
 
 <script>
+import { useStore } from 'vuex'
 import { defineComponent, ref, reactive, onMounted,watch } from 'vue'
 import * as api from '@/api/siteManage/watchDog.js'
 import { ElMessage } from 'element-plus'
@@ -156,6 +171,12 @@ export default defineComponent({
   components: { DialogComponent, Clone },
   props:[ 'siteId'],
   setup(props, { emit }) {
+    const store = useStore()
+    store
+    const fileUrl = ref(window.PLATFROM_CONFIG.baseUrl)
+    const fileList = ref([])
+    const accessToken = ref(store.state.user.accessToken)
+
     const total = ref(0)
     const pageSize = ref(15)
     const currentPage = ref(1)
@@ -249,6 +270,36 @@ export default defineComponent({
     const cancelEvent = () => {
       console.log('cancel!')
     }
+
+     const handleProgress = (file, fileList) => {
+      file
+      if (
+        !(
+          fileList.raw.type ===
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
+          fileList.raw.type === 'application/vnd.ms-excel'
+        )
+      ) {
+        ElMessage({
+          message: '上传文件只能是 xls 和 xlsx 格式!',
+          type: 'error',
+        })
+        return false
+      } else {
+        return true
+      }
+    }
+
+    const handleUpAvatar = (res, file) => {
+      console.log(res, file)
+      fileList.value = []
+      ElMessage.success({
+        message: '导入成功',
+        type: 'success',
+      })
+      deviceNewsList()
+    }
+
     //监听变化
     watch(
       () => props.siteId,
@@ -281,6 +332,25 @@ export default defineComponent({
       currentPage.value = val
       deviceNewsList()
     }
+
+    //导出
+    const DataReportExport = () => {
+      api
+        .deviceAttributeExport({
+           siteId:props.siteId,
+        })
+        .then((requset) => {
+          if (requset.status === 'SUCCESS') {
+            window.location.href = window.PLATFROM_CONFIG.fileUrl + requset.data
+            ElMessage.success({
+              message: '导出成功',
+              type: 'success',
+            })
+          } else {
+            ElMessage.error(requset.msg)
+          }
+        })
+    }
     return {
       tableData,
       showDialog,
@@ -310,6 +380,14 @@ export default defineComponent({
       cancelEvent,
       handleSizeChange,
       handleCurrentChange,
+
+      DataReportExport,
+
+      fileList,
+      fileUrl,
+      accessToken,
+      handleProgress,
+      handleUpAvatar,
     }
   },
 })

src/views/stationManage/index.vue

@@ -48,7 +48,7 @@
           label="台区地址"
           width=""
         ></el-table-column>
-        <el-table-column prop="siteCount" label="点位数量" width="">
+        <el-table-column prop="siteCount" label="站点数量" width="">
           <template #default="scope">
             <span
               @click="goSiteList(scope.row)"

src/views/stationManage/siteList.vue

@@ -21,56 +21,61 @@
         label="站点名称"
         width=""
       ></el-table-column>
-      <el-table-column prop="stationStatus" label="状态" width="">
+      <!-- <el-table-column prop="stationStatus" label="状态" width="">
         <template #default="scope">
           <el-avatar
             class="status"
             :class="[scope.row.deviceStatusr == '离线' ? 'offline' : 'online']"
           ></el-avatar>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        prop="deviceName"
-        label="设备名称"
+        prop="siteAddress"
+        label="站点位置"
         width=""
       ></el-table-column>
       <el-table-column
-        prop="monitoringEquipmentNo"
-        label="监控设备编号"
+        prop="userName"
+        label="联系人"
         width=""
       >
         <template #default="scope">
           <span>
             {{
-              scope.row.monitoringEquipmentNo
-                ? scope.row.monitoringEquipmentNo
+              scope.row.userName
+                ? scope.row.userName
                 : '--'
             }}
           </span>
         </template>
       </el-table-column>
       <el-table-column
-        prop="ratedVoltage"
-        label="额定电压"
+        prop="phone"
+        label="手机号码"
         width=""
       ></el-table-column>
       <el-table-column
-        prop="ratedCurrent"
-        label="额定电流"
+        prop="installedCapacity"
+        label="装机容量"
         width=""
       ></el-table-column>
       <el-table-column
-        prop="currentLoadRate"
-        label="电流负载率门限"
+        prop="rheologicalChange"
+        label="流变变比"
         width=""
       ></el-table-column>
-      <el-table-column fixed="right" label="操作" width="250">
+      <el-table-column
+        prop="routeName"
+        label="线路名称"
+        width=""
+      ></el-table-column>
+      <!-- <el-table-column fixed="right" label="操作" width="250">
         <template #default="scope">
           <el-button @click="handleClick(scope.row)" type="text" size="small">
             查看
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- 表格end -->
   </div>
@@ -99,12 +104,12 @@ export default defineComponent({
 
     //自定义列样式
     const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
-      row, column, rowIndex
-      if (columnIndex === 1) {
-        return `color:#04F21C`
-      } else {
-        return ''
-      }
+      row, column, rowIndex,columnIndex
+      // if (columnIndex === 1) {
+      //   return `color:#04F21C`
+      // } else {
+      //   return ''
+      // }
     }
 
     //查看