联调bug修复

.history/vue.config_20211018102819.js

@@ -1,193 +0,0 @@
-/**
- * @author chuzhixin 1204505056@qq.com
- * @description vue.config.js全局配置
- */
-const path = require('path')
-const {
-  /* baseURL, */
-  publicPath,
-  assetsDir,
-  outputDir,
-  lintOnSave,
-  transpileDependencies,
-  title,
-  abbreviation,
-  devPort,
-  providePlugin,
-  build7z,
-  donation,
-} = require('./src/config')
-const { webpackBarName, webpackBanner, donationConsole } = require('vab-config')
-
-if (donation) donationConsole()
-const { version, author } = require('./package.json')
-const Webpack = require('webpack')
-const WebpackBar = require('webpackbar')
-const FileManagerPlugin = require('filemanager-webpack-plugin')
-const dayjs = require('dayjs')
-const date = dayjs().format('YYYY_M_D')
-const time = dayjs().format('YYYY-M-D HH:mm:ss')
-process.env.VUE_APP_TITLE = title || '欢迎使用用电后台管理平台!'
-process.env.VUE_APP_AUTHOR = author || 'chuzhixin'
-process.env.VUE_APP_UPDATE_TIME = time
-process.env.VUE_APP_VERSION = version
-
-const resolve = (dir) => {
-  return path.join(__dirname, dir)
-}
-
-const mockServer = () => {
-  if (process.env.NODE_ENV === 'development') {
-    return require('./mock/mockServer.js')
-  } else {
-    return ''
-  }
-}
-
-module.exports = {
-  publicPath,
-  assetsDir,
-  outputDir,
-  lintOnSave,
-  transpileDependencies,
-  css: {
-    loaderOptions: {
-      sass: {
-        data: `
-        @import "@/assets/css/index.scss";
-        @import "@/assets/css/global.scss";
-        `
-      }
-    }
-  },
-  devServer: {
-    hot: true,
-    port: devPort,
-    open: true,
-    noInfo: false,
-    overlay: {
-      warnings: true,
-      errors: true,
-    },
-    // 注释掉的地方是前端配置代理访问后端的示例
-    // proxy: {
-    //   [baseURL]: {
-    //     target: `http://你的后端接口地址`,
-    //     ws: true,
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       ["^/" + baseURL]: "",
-    //     },
-    //   },
-    // },
-    after: mockServer(),
-  },
-  configureWebpack() {
-    return {
-      resolve: {
-        alias: {
-          '@': resolve('src'),
-          '*': resolve(''),
-        },
-      },
-      plugins: [
-        new Webpack.ProvidePlugin(providePlugin),
-        new WebpackBar({
-          name: webpackBarName,
-        }),
-      ],
-    }
-  },
-  chainWebpack(config) {
-    config.resolve.symlinks(true)
-    config.module
-      .rule('svg')
-      .exclude.add(resolve('src/icons'))
-      .end()
-    config.module
-      .rule('icons')
-      .test(/\.svg$/)
-      .include.add(resolve('src/icons'))
-      .end()
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
-      .options({
-        symbolId: 'icon-[name]'
-      })
-      .end()
-
-    config.when(process.env.NODE_ENV === 'development', (config) => {
-      config.devtool('source-map')
-    })
-
-    config.when(process.env.NODE_ENV !== 'development', (config) => {
-      config.performance.set('hints', false)
-      config.devtool('none')
-      config.optimization.splitChunks({
-        chunks: 'all',
-        cacheGroups: {
-          libs: {
-            name: 'vue-admin-beautiful-libs',
-            test: /[\\/]node_modules[\\/]/,
-            priority: 10,
-            chunks: 'initial',
-          },
-        },
-      })
-      config
-        .plugin('banner')
-        .use(Webpack.BannerPlugin, [`${webpackBanner}${time}`])
-        .end()
-      config.module
-        .rule('images')
-        .use('image-webpack-loader')
-        .loader('image-webpack-loader')
-        .options({
-          bypassOnDebug: true,
-        })
-        .end()
-    })
-
-    if (build7z) {
-      config.when(process.env.NODE_ENV === 'production', (config) => {
-        config
-          .plugin('fileManager')
-          .use(FileManagerPlugin, [
-            {
-              onEnd: {
-                delete: [`./${outputDir}/video`, `./${outputDir}/data`],
-                archive: [
-                  {
-                    source: `./${outputDir}`,
-                    destination: `./${outputDir}/${abbreviation}_${outputDir}_${date}.7z`,
-                  },
-                ],
-              },
-            },
-          ])
-          .end()
-      })
-    }
-  },
-  runtimeCompiler: true,
-  productionSourceMap: false,
-  css: {
-    requireModuleExtension: true,
-    sourceMap: true,
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          javascriptEnabled: true,
-          modifyVars: {
-            'vab-color-blue': '#1890ff',
-            'vab-margin': '20px',
-            'vab-padding': '20px',
-            'vab-header-height': '54px',
-            'vab-breadcrumb-height': '37px',
-            'vab-public-height': 'calc(100vh - 130px)',
-          },
-        },
-      },
-    },
-  },
-}

.history/vue.config_20211020085506.js

@@ -1,189 +0,0 @@
-/**
- * @author chuzhixin 1204505056@qq.com
- * @description vue.config.js全局配置
- */
-const path = require('path')
-const {
-    /* baseURL, */
-    publicPath,
-    assetsDir,
-    outputDir,
-    lintOnSave,
-    transpileDependencies,
-    title,
-    abbreviation,
-    devPort,
-    providePlugin,
-    build7z,
-    donation,
-} = require('./src/config')
-const { webpackBarName, webpackBanner, donationConsole } = require('vab-config')
-
-if (donation) donationConsole()
-const { version, author } = require('./package.json')
-const Webpack = require('webpack')
-const WebpackBar = require('webpackbar')
-const FileManagerPlugin = require('filemanager-webpack-plugin')
-const dayjs = require('dayjs')
-const date = dayjs().format('YYYY_M_D')
-const time = dayjs().format('YYYY-M-D HH:mm:ss')
-process.env.VUE_APP_TITLE = title || '欢迎使用用电后台管理平台!'
-process.env.VUE_APP_AUTHOR = author || 'chuzhixin'
-process.env.VUE_APP_UPDATE_TIME = time
-process.env.VUE_APP_VERSION = version
-
-const resolve = (dir) => {
-    return path.join(__dirname, dir)
-}
-
-const mockServer = () => {
-    if (process.env.NODE_ENV === 'development') {
-        return require('./mock/mockServer.js')
-    } else {
-        return ''
-    }
-}
-
-module.exports = {
-    publicPath,
-    assetsDir,
-    outputDir,
-    lintOnSave,
-    transpileDependencies,
-    css: {
-        loaderOptions: {
-            sass: {
-                data: `
-        @import "@/assets/css/index.scss";
-        @import "@/assets/css/global.scss";
-        `
-            }
-        }
-    },
-    devServer: {
-        hot: true,
-        port: devPort,
-        open: true,
-        noInfo: false,
-        overlay: {
-            warnings: true,
-            errors: true,
-        },
-        // 注释掉的地方是前端配置代理访问后端的示例
-        // proxy: {
-        //   [baseURL]: {
-        //     target: `http://你的后端接口地址`,
-        //     ws: true,
-        //     changeOrigin: true,
-        //     pathRewrite: {
-        //       ["^/" + baseURL]: "",
-        //     },
-        //   },
-        // },
-        after: mockServer(),
-    },
-    configureWebpack() {
-        return {
-            resolve: {
-                alias: {
-                    '@': resolve('src'),
-                    '*': resolve(''),
-                },
-            },
-            plugins: [
-                new Webpack.ProvidePlugin(providePlugin),
-                new WebpackBar({
-                    name: webpackBarName,
-                }),
-            ],
-        }
-    },
-    chainWebpack(config) {
-        config.resolve.symlinks(true)
-        config.module
-            .rule('svg')
-            .exclude.add(resolve('src/icons'))
-            .end()
-        config.module
-            .rule('icons')
-            .test(/\.svg$/)
-            .include.add(resolve('src/icons'))
-            .end()
-            .use('svg-sprite-loader')
-            .loader('svg-sprite-loader')
-            .options({
-                symbolId: 'icon-[name]'
-            })
-            .end()
-
-        config.when(process.env.NODE_ENV === 'development', (config) => {
-            config.devtool('source-map')
-        })
-
-        config.when(process.env.NODE_ENV !== 'development', (config) => {
-            config.performance.set('hints', false)
-            config.devtool('none')
-            config.optimization.splitChunks({
-                chunks: 'all',
-                cacheGroups: {
-                    libs: {
-                        name: 'vue-admin-beautiful-libs',
-                        test: /[\\/]node_modules[\\/]/,
-                        priority: 10,
-                        chunks: 'initial',
-                    },
-                },
-            })
-            config
-                .plugin('banner')
-                .use(Webpack.BannerPlugin, [`${webpackBanner}${time}`])
-                .end()
-            config.module
-                .rule('images')
-                .use('image-webpack-loader')
-                .loader('image-webpack-loader')
-                .options({
-                    bypassOnDebug: true,
-                })
-                .end()
-        })
-
-        if (build7z) {
-            config.when(process.env.NODE_ENV === 'production', (config) => {
-                config
-                    .plugin('fileManager')
-                    .use(FileManagerPlugin, [{
-                        onEnd: {
-                            delete: [`./${outputDir}/video`, `./${outputDir}/data`],
-                            archive: [{
-                                source: `./${outputDir}`,
-                                destination: `./${outputDir}/${abbreviation}_${outputDir}_${date}.7z`,
-                            }, ],
-                        },
-                    }, ])
-                    .end()
-            })
-        }
-    },
-    runtimeCompiler: true,
-    productionSourceMap: false,
-    css: {
-        requireModuleExtension: true,
-        sourceMap: true,
-        loaderOptions: {
-            less: {
-                lessOptions: {
-                    javascriptEnabled: true,
-                    modifyVars: {
-                        'vab-color-blue': '#1890ff',
-                        'vab-margin': '20px',
-                        'vab-padding': '20px',
-                        'vab-header-height': '54px',
-                        'vab-breadcrumb-height': '37px',
-                        'vab-public-height': 'calc(100vh - 130px)',
-                    },
-                },
-            },
-        },
-    },
-}

src/api/siteManage/camera.js

@@ -35,9 +35,9 @@ export function correspondDeviceDel(params) {
 }
 
 //站点管理-摄像头-导出
-export function deviceAttributeExport(params) {
+export function deviceExport(params) {
     return request({
-        url: '/deviceAttribute/deviceAttributeExport',
+        url: '/device/deviceExport',
         method: 'GET',
         params,
     })

src/router/index.js

@@ -264,27 +264,27 @@ export const asyncRoutes = [
     /**
      * monthReport 月度报告
      */
-    {
-        path: '/monthReport',
-        redirect: '/monthReport',
-        meta: { title: '月度报告', icon: 'monthReport', },
-        component: Layout,
-        children: [{
-                meta: { title: '月度报告', icon: 'monthReport', },
-                path: '/monthReport',
-                component: () =>
-                    import ('@/views/monthReport/index'),
-                hidden: true
-            },
-            {
-                meta: { title: '月报模板', icon: 'reportModel', },
-                path: '/reportModel',
-                component: () =>
-                    import ('@/views/monthReport/reportModel'),
-                hidden: true
-            }
-        ]
-    },
+    // {
+    //     path: '/monthReport',
+    //     redirect: '/monthReport',
+    //     meta: { title: '月度报告', icon: 'monthReport', },
+    //     component: Layout,
+    //     children: [{
+    //             meta: { title: '月度报告', icon: 'monthReport', },
+    //             path: '/monthReport',
+    //             component: () =>
+    //                 import ('@/views/monthReport/index'),
+    //             hidden: true
+    //         },
+    //         {
+    //             meta: { title: '月报模板', icon: 'reportModel', },
+    //             path: '/reportModel',
+    //             component: () =>
+    //                 import ('@/views/monthReport/reportModel'),
+    //             hidden: true
+    //         }
+    //     ]
+    // },
 
 
     {
@@ -309,42 +309,42 @@ export const asyncRoutes = [
      * patrolContent 巡检内容
      * checkEntries 检查条目
      */
-    {
-        meta: { title: '巡检管理', icon: 'patrolManage', },
-        path: '/patrolManage',
-        component: Layout,
-        redirect: '/patrolManage/patrolPlan',
-        name: 'patrolManage',
-        children: [{
-                meta: { title: '巡检计划', icon: 'patrolPlan' },
-                path: 'patrolPlan',
-                name: 'patrolPlan',
-                component: () =>
-                    import ('@/views/patrolManage/patrolPlan/index.vue'),
-            },
-            {
-                meta: { title: '巡检记录', icon: 'patrolRecord' },
-                path: 'patrolRecord',
-                name: 'patrolRecord',
-                component: () =>
-                    import ('@/views/patrolManage/patrolRecord/index.vue'),
-            },
-            {
-                meta: { title: '巡检内容', icon: '巡检内容' },
-                path: 'patrolContent',
-                name: 'patrolContent',
-                component: () =>
-                    import ('@/views/patrolManage/patrolContent/index.vue'),
-            },
-            {
-                meta: { title: '检查条目', icon: '检查条目' },
-                path: 'checkEntries',
-                name: 'checkEntries',
-                component: () =>
-                    import ('@/views/patrolManage/checkEntries/index.vue'),
-            },
-        ]
-    },
+    // {
+    //     meta: { title: '巡检管理', icon: 'patrolManage', },
+    //     path: '/patrolManage',
+    //     component: Layout,
+    //     redirect: '/patrolManage/patrolPlan',
+    //     name: 'patrolManage',
+    //     children: [{
+    //             meta: { title: '巡检计划', icon: 'patrolPlan' },
+    //             path: 'patrolPlan',
+    //             name: 'patrolPlan',
+    //             component: () =>
+    //                 import ('@/views/patrolManage/patrolPlan/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '巡检记录', icon: 'patrolRecord' },
+    //             path: 'patrolRecord',
+    //             name: 'patrolRecord',
+    //             component: () =>
+    //                 import ('@/views/patrolManage/patrolRecord/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '巡检内容', icon: '巡检内容' },
+    //             path: 'patrolContent',
+    //             name: 'patrolContent',
+    //             component: () =>
+    //                 import ('@/views/patrolManage/patrolContent/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '检查条目', icon: '检查条目' },
+    //             path: 'checkEntries',
+    //             name: 'checkEntries',
+    //             component: () =>
+    //                 import ('@/views/patrolManage/checkEntries/index.vue'),
+    //         },
+    //     ]
+    // },
 
 
     /**
@@ -355,45 +355,45 @@ export const asyncRoutes = [
      * operStatistics 运维统计
      * workStatistics 工作量统计
      */
-    {
-        meta: { title: '运维管理', icon: 'operManage', },
-        path: '/operManage',
-        component: Layout,
-        redirect: '/operManage/siteAchives',
-        name: 'operManage',
-        children: [{
-                meta: { title: '现场档案', icon: 'siteAchives', },
-                path: 'siteAchives',
-                component: () =>
-                    import ('@/views/operManage/siteAchives/index.vue'),
-            },
-            {
-                meta: { title: '缺陷管理', icon: 'defectManage', },
-                path: 'defectManage',
-                component: () =>
-                    import ('@/views/operManage/defectManage/index.vue'),
-            },
-            {
-                meta: { title: '工单管理', icon: 'workManage', },
-                path: 'workManage',
-                component: () =>
-                    import ('@/views/operManage/workManage/index.vue'),
-            },
-            {
-                meta: { title: '运维统计', icon: 'operStatistics', },
-                path: 'operStatistics',
-                component: () =>
-                    import ('@/views/operManage/operStatistics/index.vue'),
-            },
-            {
-                meta: { title: '工作量统计', icon: 'workStatistics', },
-                path: 'workStatistics',
-                component: () =>
-                    import ('@/views/operManage/workStatistics/index.vue'),
-            },
+    // {
+    //     meta: { title: '运维管理', icon: 'operManage', },
+    //     path: '/operManage',
+    //     component: Layout,
+    //     redirect: '/operManage/siteAchives',
+    //     name: 'operManage',
+    //     children: [{
+    //             meta: { title: '现场档案', icon: 'siteAchives', },
+    //             path: 'siteAchives',
+    //             component: () =>
+    //                 import ('@/views/operManage/siteAchives/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '缺陷管理', icon: 'defectManage', },
+    //             path: 'defectManage',
+    //             component: () =>
+    //                 import ('@/views/operManage/defectManage/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '工单管理', icon: 'workManage', },
+    //             path: 'workManage',
+    //             component: () =>
+    //                 import ('@/views/operManage/workManage/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '运维统计', icon: 'operStatistics', },
+    //             path: 'operStatistics',
+    //             component: () =>
+    //                 import ('@/views/operManage/operStatistics/index.vue'),
+    //         },
+    //         {
+    //             meta: { title: '工作量统计', icon: 'workStatistics', },
+    //             path: 'workStatistics',
+    //             component: () =>
+    //                 import ('@/views/operManage/workStatistics/index.vue'),
+    //         },
 
-        ]
-    },
+    //     ]
+    // },
 
     /** 
      * systemManage 系统管理

src/views/alarmManage/index.vue

@@ -196,7 +196,7 @@ export default defineComponent({
 
     //查看
     const handleClick = (row) => {
-      alert('查看对应站点（页面跳转）')
+      // alert('查看对应站点（页面跳转）')
       console.log(row)
     }
 

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

@@ -2,6 +2,19 @@
   <div class="communicate">
     <div class="comTop">
       <div class="comTopLeft">
+         选择站点:
+                <el-select 
+                  v-model="store.state.siteId"
+                  placeholder="请选择"
+                  style="width: 150px;margin-right:20px"
+                >
+                  <el-option
+                    v-for="site in store.state.siteList"
+                    :key="site"
+                    :label="site.siteName"
+                    :value="site.id"
+                  ></el-option>
+                </el-select>
         <el-input
           placeholder="搜索设备或编号"
           v-model="filterText"
@@ -415,6 +428,7 @@ export default defineComponent({
       accessToken,
       handleProgress,
       handleUpAvatar,
+      store
     }
   },
 })

src/views/deviceManage/powerEquip/index.vue

@@ -17,6 +17,21 @@
               >
                 返回
               </el-button>
+             
+                <!-- 选择站点:
+                <el-select 
+                  v-model="store.state.siteId"
+                  placeholder="请选择"
+                  style="width: 150px;margin-right:20px"
+                >
+                  <el-option
+                    v-for="site in store.state.siteList"
+                    :key="site"
+                    :label="site.siteName"
+                    :value="site.id"
+                  ></el-option>
+                </el-select> -->
+              
               <span class="firstTopLeftTitle">
                 {{ deviceNumData.length != '' ? '设备或编号' : '名称或地址' }}:
               </span>
@@ -299,6 +314,7 @@ export default defineComponent({
       updateTitle,
       goBack,
       headClass,
+      store,
 
       total,
       pageSize,

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

@@ -2,30 +2,45 @@
   <div class="video">
     <div class="videoTop">
       <div class="videoTopLeft">
+        选择站点:
+        <el-select
+          v-model="store.state.siteId"
+          placeholder="请选择"
+          style="width: 150px; margin-right: 20px"
+        >
+          <el-option
+            v-for="site in store.state.siteList"
+            :key="site"
+            :label="site.siteName"
+            :value="site.id"
+          ></el-option>
+        </el-select>
         <el-input
           placeholder="搜索设备或编号"
           v-model="filterText"
           class="videoTopLeftInput"
-        
         >
           <!-- <template #suffix>
             <i class="el-icon-search el-input__icon"></i>
           </template> -->
         </el-input>
+
         <el-button
           type="primary"
-            icon="el-icon-search"
-            class="search-button"
+          icon="el-icon-search"
+          class="search-button"
           @click="videoMonitoringDeviceList()"
-          >搜索</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">
@@ -61,50 +76,50 @@
         </el-table-column>
 
         <el-table-column
-        prop="deviceName"
-        label="名称"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="deviceCode"
-        label="编号"
-        align="center"
-        width=""
-      ></el-table-column>
+          prop="deviceName"
+          label="名称"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="deviceCode"
+          label="编号"
+          align="center"
+          width=""
+        ></el-table-column>
 
-      <el-table-column
-        prop="floor"
-        label="楼层"
-        align="center"
-        width="60"
-      ></el-table-column>
-      <el-table-column
-        prop="deviceAddress"
-        label="设备安装位置"
-        align="center"
-        width=""
-      ></el-table-column>
-      <el-table-column prop="deviceType" label="设备类型" align="center">
-        <template #default="scope">
-          {{ scope.row.deviceType == '2' ? '视频监控设备' : '其他' }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="installTime"
-        label="安装时间"
-        align="center"
-        width="200"
-      ></el-table-column>
-      <el-table-column
-        prop="creator"
-        label="创建人"
-        align="center"
-      ></el-table-column>
-      <el-table-column
-        prop="sim"
-        label="sim卡号"
-        align="center"
-      ></el-table-column>
+        <el-table-column
+          prop="floor"
+          label="楼层"
+          align="center"
+          width="60"
+        ></el-table-column>
+        <el-table-column
+          prop="deviceAddress"
+          label="设备安装位置"
+          align="center"
+          width=""
+        ></el-table-column>
+        <el-table-column prop="deviceType" label="设备类型" align="center">
+          <template #default="scope">
+            {{ scope.row.deviceType == '2' ? '视频监控设备' : '其他' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="installTime"
+          label="安装时间"
+          align="center"
+          width="200"
+        ></el-table-column>
+        <el-table-column
+          prop="creator"
+          label="创建人"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sim"
+          label="sim卡号"
+          align="center"
+        ></el-table-column>
         <el-table-column label="视频画面" align="center" width="150">
           <template #default="scope" style="text-align: center">
             <el-button
@@ -131,14 +146,13 @@
         ></el-pagination>
       </div>
 
-       <!--视频弹框组件开始-----------------------start-->
-    <check-video
-      :dialogTitle="dialogTitle"
-      @closeDialog="closeDialog"
-      :flag="showDialog"
-    ></check-video>
-    <!--视频弹框组件结束-----------------------end-->
-
+      <!--视频弹框组件开始-----------------------start-->
+      <check-video
+        :dialogTitle="dialogTitle"
+        @closeDialog="closeDialog"
+        :flag="showDialog"
+      ></check-video>
+      <!--视频弹框组件结束-----------------------end-->
     </div>
 
     <div></div>
@@ -146,31 +160,29 @@
 </template>
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref,onMounted } from 'vue'
+import { defineComponent, ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import * as api from '@/api/deviceManage/videoEquip.js'
 import checkVideo from './checkVideo'
 
 export default defineComponent({
   name: 'powerEquip',
-  components: {checkVideo},
+  components: { checkVideo },
   props: {
     Height: String,
   },
   setup() {
-     const store = useStore()
+    const store = useStore()
 
-      const dialogTitle = ref('')
-       const showDialog = ref(false)
+    const dialogTitle = ref('')
+    const showDialog = ref(false)
 
-     const total = ref(0)
+    const total = ref(0)
     const pageSize = ref(15)
     const currentPage = ref(1)
     const filterText = ref('')
     const activeName = 'powerEquip'
-    const tableData = ref([
-     
-    ])
+    const tableData = ref([])
 
     //查看视频画面
     const LookUp = (ind, row) => {
@@ -179,7 +191,7 @@ export default defineComponent({
       dialogTitle.value = '查看视频'
       showDialog.value = true
     }
-   const handleSizeChange = (val) => {
+    const handleSizeChange = (val) => {
       pageSize.value = val
       videoMonitoringDeviceList()
     }
@@ -198,16 +210,15 @@ export default defineComponent({
       // videoMonitoringDeviceList()
     }
 
-
-     //视频列表
+    //视频列表
     function videoMonitoringDeviceList() {
       api
         .videoMonitoringDeviceList({
           siteId: store.state.siteId,
           size: pageSize.value,
           current: currentPage.value,
-          deviceType:2,
-          deviceName:filterText.value
+          deviceType: 2,
+          deviceName: filterText.value,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -218,7 +229,7 @@ export default defineComponent({
           }
         })
     }
-     onMounted(() => {
+    onMounted(() => {
       videoMonitoringDeviceList()
     })
 
@@ -235,7 +246,8 @@ export default defineComponent({
       currentPage,
       closeDialog,
       dialogTitle,
-      showDialog
+      showDialog,
+      store,
     }
   },
 })

src/views/planOutage/index.vue

@@ -265,8 +265,8 @@ export default defineComponent({
           size: pageSize.value,
           current: currentPage.value,
           type: region.value,
-          startTime: time[0],
-          endTime: time[1],
+          startTime: time[0]?time[0]:'',
+          endTime: time[1]?time[1]:'',
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {

src/views/powerQuality/harmonicReport/index.vue

@@ -4,7 +4,7 @@
     <div class="filter-container">
       <div class="left">
         <div>
-          <div class="filter-item">
+          <!-- <div class="filter-item">
             选择站点:
             <el-select
               v-model="store.state.siteId"
@@ -18,7 +18,7 @@
                 :value="site.id"
               ></el-option>
             </el-select>
-          </div>
+          </div> -->
 
           <div class="filter-item">
             选择设备:
@@ -34,7 +34,7 @@
                 :label="device.deviceName"
                 :value="device.deviceCode"
               ></el-option>
-              <el-option label="设备1" value="DA00021026"></el-option>
+              <!-- <el-option label="设备1" value="DA00021026"></el-option> -->
             </el-select>
           </div>
 
@@ -163,6 +163,22 @@ export default defineComponent({
       },
     ])
 
+    function deviceSelect() {
+      api.deviceListOne({ siteId: store.state.siteId }).then((requset) => {
+        if (requset.status === 'SUCCESS') {
+          console.log(111)
+          deviceList.value = requset.data
+          deviceCode.value = requset.data[0]?requset.data[0].deviceCode:''
+
+           listTabsChange('dayValue')
+        } else {
+          ElMessage.error(requset.msg)
+        }
+      })
+    }
+
+    
+
     const listTabsChange = (value) => {
       value == 'dayValue'
         ? (dateType.value = 'date')
@@ -191,6 +207,7 @@ export default defineComponent({
 
       api.rtRealScore(list).then((requset) => {
         if (requset.status === 'SUCCESS') {
+          
           tableList.value = requset.data
           curveComList.value[0].data = []
           curveComList.value[0].dateList = []
@@ -212,20 +229,11 @@ export default defineComponent({
       })
     }
 
-    function deviceSelect() {
-      api.deviceListOne({ siteId: store.state.siteId }).then((requset) => {
-        if (requset.status === 'SUCCESS') {
-          deviceList.value = requset.data
-          deviceCode.value = requset.data[0]?requset.data[0].deviceCode:''
-        } else {
-          ElMessage.error(requset.msg)
-        }
-      })
-    }
+    
 
     onMounted(() => {
       deviceSelect()
-      listTabsChange('dayValue')
+     
     })
     return {
       listTabsChange,

src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -139,6 +139,8 @@ export default defineComponent({
             console.log(requset.data)
             deviceList.value = requset.data
             deviceCode.value = requset.data[0]?requset.data[0].deviceCode:''
+
+             rtRealScore()
           } else {
             ElMessage.error(requset.msg)
           }
@@ -180,7 +182,7 @@ export default defineComponent({
     onMounted(() => {
       deviceSelect()
 
-      rtRealScore()
+     
     })
     return {
       store,

src/views/siteManage/camera/dialogComponent.vue

@@ -156,7 +156,7 @@ export default defineComponent({
     const submitForm = () => {
       formInfo.value.validate((valid) => {
         if (valid) {
-          form.value.siteId =18
+          // form.value.siteId =18
            
           if (props.dialogTitle === '新增') {
             api.correspondDeviceAdd(form.value).then((requset) => {

src/views/siteManage/camera/index.vue

@@ -14,7 +14,7 @@
       <div class="right">
         <el-upload
           class="upload-demo"
-          :action="fileUrl + '/deviceAttribute/deviceAttributeImport'"
+          :action="fileUrl + '/device/deviceImport'"
           :on-progress="handleProgress"
           :on-success="handleUpAvatar"
           multiple
@@ -382,7 +382,7 @@ export default defineComponent({
      //导出
     const DataReportExport = () => {
       api
-        .deviceAttributeExport({
+        .deviceExport({
            siteId: props.siteId,
         })
         .then((requset) => {

src/views/systemManage/rolePermission/roleInfoCom/index.vue

@@ -3,7 +3,7 @@
 
      <div style="text-align:right;margin-bottom:20px">
       <!-- <el-button type="success" >新增</el-button> -->
-      <el-button type="primary" >保存</el-button>
+      <!-- <el-button type="primary" >保存</el-button>   -->
     </div>
     
     

src/views/systemManage/userManage/dialogComponent.vue

@@ -152,8 +152,9 @@ export default defineComponent({
 
       formInfo.value.validate((valid) => {
         if (valid) {
+           form.value.roleIds=[form.value.roleId];   //roleIds 传给后台
           if (props.dialogTitle === '新增') {
-             form.value.roleIds=[form.value.roleId];
+            
             api.userAdd(form.value).then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({

src/views/systemManage/userManage/index.vue

@@ -249,7 +249,8 @@ export default defineComponent({
         phonenumber:row.phonenumber,
         password:row.password,
         createTime:row.createTime,
-        roleId:row.roleId
+        roleId:row.roleId,
+        userId:row.userId
       }
 
       dialogTitle.value = '编辑'