Переглянути джерело

Merge branch 'V0.0.6_iot' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.6_iot

jiawuxian 1 рік тому
батько
коміт
c3c4daf538

+ 17 - 1
src/views/core/reportForms/drill.vue

@@ -84,7 +84,7 @@
     </div>
 
     <div class="main-search-box" style="margin-bottom: 0;">
-      <h1 style="text-align:center;">预案演练情况表</h1>
+      <h1 style="text-align:center;">{{this.title}}</h1>
     </div>
     <el-table
       v-loading="loading"
@@ -92,6 +92,7 @@
       border
       height="616" size="small">
       <el-table-column type="index" align="center" label="序号" width="60"></el-table-column>
+      <el-table-column align="center" label="地区" prop="city"/>
       <el-table-column align="center" label="单位名称" prop="orgName"/>
       <el-table-column align="center" label="应完成数" prop="shouldFinish" width="340"/>
       <el-table-column align="center" label="已完成数" prop="finish"/>
@@ -127,6 +128,7 @@ export default {
       showSearch: true,
       deptOptions: [], //机构数组
       selectedOrgName: null,
+      title:this.getReportTitle(),
     };
   },
   created() {
@@ -153,6 +155,19 @@ export default {
         (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
       );
     },
+    getReportTitle()
+    {
+      let titleBase="预案演练情况表";
+      if(!this.queryParams)
+      {
+        titleBase+= "("+dayjs(new Date()).format("YYYY-MM")+"~"+dayjs(new Date()).format("YYYY-MM")+")";       
+      }
+      else if(this.queryParams.range)
+      {
+        titleBase+= "("+dayjs(this.queryParams.range[0]).format("YYYY-MM")+"~"+dayjs(this.queryParams.range[1]).format("YYYY-MM")+")";       
+      }
+      return titleBase;      
+    },
     changeHandler() {
       // this.getList();
     },
@@ -233,6 +248,7 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
+      this.title=this.getReportTitle();
       this.getList();
     },
     /** 重置按钮操作 */

+ 22 - 2
src/views/core/reportForms/eduTraining.vue

@@ -57,7 +57,7 @@
         </el-form-item>
 
         <el-form-item label="时间" prop="date">
-          <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date"
+          <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" @change="dateChanged"
                           align="right" type="month" placeholder="请选择查询时间">
           </el-date-picker>
         </el-form-item>
@@ -88,7 +88,7 @@
     </div>
 
     <div class="main-search-box" style="margin-bottom: 0;">
-      <h1 style="text-align:center;">教育培训情况表</h1>
+      <h1 style="text-align:center;">{{ this.title }}</h1>
     </div>
     <el-table
       v-loading="loading"
@@ -96,6 +96,7 @@
       border
       height="616" size="small">
       <el-table-column type="index" align="center" label="序号" width="60"></el-table-column>
+      <el-table-column align="center" label="地区" prop="city"/>
       <el-table-column align="center" label="单位名称" prop="orgName"/>
       <el-table-column align="center" label="应完成数" prop="shouldFinish" width="340"/>
       <el-table-column align="center" label="已完成数" prop="finish"/>
@@ -130,6 +131,7 @@ export default {
       showSearch: true,
       deptOptions: [], //机构数组
       selectedOrgName: null,
+      title:this.getReportTitle(),
     };
   },
   created() {
@@ -153,6 +155,23 @@ export default {
     changeHandler() {
       //  this.getList();
     },
+    getReportTitle()
+    {
+      let titleBase="教育培训情况表";
+      if(!this.queryParams)
+      {
+        titleBase+= "("+dayjs(new Date()).format("YYYY-MM")+")";       
+      }
+      else if(this.queryParams.date)
+      {
+        titleBase+= "("+dayjs(this.queryParams.date).format("YYYY-MM")+")";       
+      }
+      return titleBase;      
+    },
+    // dateChanged()
+    // {
+    //   this.title=this.getReportTitle();
+    // },
     changeSelect(org) {
       this.selectedOrgName = org.shortName
       // this.getList();
@@ -228,6 +247,7 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
+      this.title=this.getReportTitle();
       this.getList();
     },
     /** 重置按钮操作 */

+ 1 - 1
src/views/core/reportForms/intrusionTestReport.vue

@@ -231,7 +231,7 @@ export default {
     handleExport() {
   this.download('core/resumptionReport/intrusionTestExport', {
     ...this.queryParams
-  }, `${this.orgName+'-报警测试表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-报警测试情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

+ 1 - 1
src/views/core/reportForms/monitorAccessReport.vue

@@ -264,7 +264,7 @@ getDefaultOrg(node) {
     handleExport() {
   this.download('core/monitorAccessReport/export', {
     ...this.queryParams
-  }, `${this.orgName+'-监控调阅统计表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-监控调阅统计情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
     getList() {

+ 1 - 1
src/views/core/reportForms/resumptionReport.vue

@@ -257,7 +257,7 @@ export default {
     handleExport() {
   this.download('core/resumptionReport/export', {
     ...this.queryParams
-  }, `${this.orgName+'-履职表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-履职情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

+ 1 - 1
src/views/core/reportForms/safetyInspectReport.vue

@@ -248,7 +248,7 @@ export default {
     handleExport() {
       this.download('core/safetyInspectReport/export', {
         ...this.queryParams
-      }, `${ this.orgName + '-行社全面检查统计表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+      }, `${ this.orgName + '-行社全面检查统计情况表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
     },
 
 

+ 1 - 1
src/views/core/reportForms/selfInspectReport.vue

@@ -246,7 +246,7 @@ export default {
     handleExport() {
       this.download('core/safetyInspectReport/selfInspectExport', {
         ...this.queryParams
-      }, `${ this.orgName+'-网点负责人自查统计表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
+      }, `${ this.orgName+'-网点负责人自查统计情况表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
     },
 
 

+ 1 - 1
src/views/core/reportForms/serviceBankReport.vue

@@ -239,7 +239,7 @@ export default {
     handleExport() {
   this.download('core/resumptionReport/serviceBankExport', {
     ...this.queryParams
-  }, `${this.orgName+'-离行式自助银行巡检表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-离行式自助银行巡检情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

+ 1 - 1
src/views/core/reportForms/standbyPowerReport.vue

@@ -267,7 +267,7 @@ getDeptTree() {
     handleExport() {
   this.download('core/resumptionReport/standbyPowerExport', {
     ...this.queryParams
-  }, `${this.orgName+'-备用电源维护表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+  }, `${this.orgName+'-备用电源维护情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 

+ 7 - 3
src/views/evaluateTable/index.vue

@@ -256,7 +256,7 @@ export default {
     handleExport() {
       this.download('core/task/export', {
         ...this.queryParams
-      }, `${this.orgName+'-外包履职评价表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      }, `${this.orgName+'-外包履职评价情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
     //获取列表
     getList() {
@@ -312,6 +312,7 @@ this.orgName=res.orgName;
   }
 }
 .securityEquipmentMonitoringtable {
+  padding-block-start: 0.83em;
   background-color: #fff;
   .table-scroll {
     // table-layout:auto;
@@ -362,8 +363,11 @@ this.orgName=res.orgName;
   margin: auto;
   text-align: center;
   color: black;
-  font-size: x-large;
+  font-size: 24px;
   letter-spacing: 3px;
-  font-weight: bold;
+  font-weight: 500;
+  // margin-block-start: 0.83em;
+  margin-block-end: 0.83em;
+  padding:10px;
 }
 </style>

+ 2 - 0
src/views/iot/sensorData/index.vue

@@ -113,6 +113,8 @@
           >
             <el-table-column label="设备名称" align="center" prop="deviceName" width="220"/>
             <el-table-column label="设备类型" align="center" prop="deviceType"/>
+            <el-table-column label="地区" align="center" prop="firstOrgName" width="220"/>
+            <el-table-column label="行社名称" align="center" prop="secondOrgName" width="220"/>
             <el-table-column label="所属机构" align="center" prop="orgName" width="220"/>
             <el-table-column label="告警状态" align="center" prop="stateText" width="220"/>
             <el-table-column label="最近一次上报时间" align="center" prop="updateTime" width="220"/>

+ 130 - 22
vue.config.js

@@ -1,30 +1,138 @@
-
+'use strict'
+const path = require('path')
 const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
-const { defineConfig } = require('@vue/cli-service')
-const { sassTrue } = require('sass')
-module.exports = defineConfig({
-  configureWebpack: {
-    plugins: [new NodePolyfillPlugin()],
-  },
+
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+
+const CompressionPlugin = require('compression-webpack-plugin')
+
+const name = process.env.VUE_APP_TITLE // 网页标题
+
+const port = process.env.port || process.env.npm_config_port || 9527 // 端口
+
+// vue.config.js 配置说明
+//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
+// 这里只列一部分,具体配置参考文档
+module.exports = {
+  // 部署生产环境和开发环境下的URL。
+  // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
+  publicPath:"./",
+
+  // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
+  outputDir: 'web',
+  // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
+  assetsDir: 'static',
+  // 是否开启eslint保存检测,有效值:ture | false | 'error'
+  lintOnSave: false,
+  // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  // webpack-dev-server 相关配置
   devServer: {
-    port: 8081, // 端口
-    open: false, // 启动后打开浏览器
-    client: {
-      overlay: false
+    //host: '0.0.0.0',
+    client:{
+      overlay:false
     },
-    /*本地开发请求代理*/
+    port: port,
+    open: false,
     proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
       '/dev-api': {
-         // target: "http://47.92.229.224:8080",
-        // target: "http://10.87.21.103:8080",
-        target: "http://10.87.11.105:8080",
-        // target: "http://10.87.21.107:9002",
-        // ws:true,
-        changOrigin:true,
-        pathRewrite:{
-          '^/dev-api':'/'
+        target: process.env.VUE_APP_BASE_API,
+        changeOrigin: true,
+        pathRewrite: {
+          '/dev-api' : ''
         }
       },
-    }
+    },
+  },
+  configureWebpack: {
+    name: name,
+    resolve: {
+      alias: {
+        '@': resolve('src')
+      }
+    },
+    plugins: [
+      new NodePolyfillPlugin(),
+      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+      new CompressionPlugin({
+        cache: false,                   // 不启用文件缓存
+        test: /\.(js|css|html)?$/i,     // 压缩文件格式
+        filename: '[path].gz[query]',   // 压缩后的文件名
+        algorithm: 'gzip',              // 使用gzip压缩
+        minRatio: 0.8                   // 压缩率小于1才会压缩
+      })
+    ],
   },
-})
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+    config.optimization.minimizer('terser').tap((args) => {
+      args[0].terserOptions.compress.drop_console = true
+      return args
+    })
+    // set svg-sprite-loader
+    config.module
+      .rule('svg')
+      .exclude.add(resolve('src/assets/icons'))
+      .end()
+    config.module
+      .rule('icons')
+      .test(/\.svg$/)
+      .include.add(resolve('src/assets/icons'))
+      .end()
+      .use('svg-sprite-loader')
+      .loader('svg-sprite-loader')
+      .options({
+        symbolId: 'icon-[name]'
+      })
+      .end()
+
+    config
+      .when(process.env.NODE_ENV !== 'development',
+        config => {
+          config
+            .plugin('ScriptExtHtmlWebpackPlugin')
+            .after('html')
+            .use('script-ext-html-webpack-plugin', [{
+            // `runtime` must same as runtimeChunk name. default is `runtime`
+              inline: /runtime\..*\.js$/
+            }])
+            .end()
+          config
+            .optimization.splitChunks({
+              chunks: 'all',
+              cacheGroups: {
+                libs: {
+                  name: 'chunk-libs',
+                  test: /[\\/]node_modules[\\/]/,
+                  priority: 10,
+                  chunks: 'initial' // only package third parties that are initially dependent
+                },
+                elementUI: {
+                  name: 'chunk-elementUI', // split elementUI into a single package
+                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                },
+                commons: {
+                  name: 'chunk-commons',
+                  test: resolve('src/components'), // can customize your rules
+                  minChunks: 3, //  minimum common number
+                  priority: 5,
+                  reuseExistingChunk: true
+                }
+              }
+            })
+          config.optimization.runtimeChunk('single'),
+          {
+             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+             to: './' //到根目录下
+          }
+        }
+      )
+  }
+}