浏览代码

node版本升级等等

isqianming 10 月之前
父节点
当前提交
236ffa13e1
共有 100 个文件被更改,包括 1622 次插入143 次删除
  1. 10 3
      report-ui/build/webpack.base.conf.js
  2. 17 3
      report-ui/build/webpack.prod.conf.js
  3. 44 0
      report-ui/node_modules_echarts_need/map/js/china-contour.js
  4. 44 0
      report-ui/node_modules_echarts_need/map/js/china.js
  5. 44 0
      report-ui/node_modules_echarts_need/map/js/province/anhui.js
  6. 46 0
      report-ui/node_modules_echarts_need/map/js/province/aomen.js
  7. 44 0
      report-ui/node_modules_echarts_need/map/js/province/beijing.js
  8. 19 0
      report-ui/node_modules_echarts_need/map/js/province/chongqing.js
  9. 44 0
      report-ui/node_modules_echarts_need/map/js/province/fujian.js
  10. 44 0
      report-ui/node_modules_echarts_need/map/js/province/gansu.js
  11. 44 0
      report-ui/node_modules_echarts_need/map/js/province/guangdong.js
  12. 44 0
      report-ui/node_modules_echarts_need/map/js/province/guangxi.js
  13. 44 0
      report-ui/node_modules_echarts_need/map/js/province/guizhou.js
  14. 44 0
      report-ui/node_modules_echarts_need/map/js/province/hainan.js
  15. 44 0
      report-ui/node_modules_echarts_need/map/js/province/hebei.js
  16. 44 0
      report-ui/node_modules_echarts_need/map/js/province/heilongjiang.js
  17. 44 0
      report-ui/node_modules_echarts_need/map/js/province/henan.js
  18. 44 0
      report-ui/node_modules_echarts_need/map/js/province/hubei.js
  19. 44 0
      report-ui/node_modules_echarts_need/map/js/province/hunan.js
  20. 44 0
      report-ui/node_modules_echarts_need/map/js/province/jiangsu.js
  21. 44 0
      report-ui/node_modules_echarts_need/map/js/province/jiangxi.js
  22. 44 0
      report-ui/node_modules_echarts_need/map/js/province/jilin.js
  23. 44 0
      report-ui/node_modules_echarts_need/map/js/province/liaoning.js
  24. 44 0
      report-ui/node_modules_echarts_need/map/js/province/neimenggu.js
  25. 44 0
      report-ui/node_modules_echarts_need/map/js/province/ningxia.js
  26. 44 0
      report-ui/node_modules_echarts_need/map/js/province/qinghai.js
  27. 44 0
      report-ui/node_modules_echarts_need/map/js/province/shandong.js
  28. 19 0
      report-ui/node_modules_echarts_need/map/js/province/shanghai.js
  29. 44 0
      report-ui/node_modules_echarts_need/map/js/province/shanxi.js
  30. 44 0
      report-ui/node_modules_echarts_need/map/js/province/shanxi1.js
  31. 44 0
      report-ui/node_modules_echarts_need/map/js/province/sichuan.js
  32. 19 0
      report-ui/node_modules_echarts_need/map/js/province/taiwan.js
  33. 18 0
      report-ui/node_modules_echarts_need/map/js/province/tianjin.js
  34. 44 0
      report-ui/node_modules_echarts_need/map/js/province/xianggang.js
  35. 19 0
      report-ui/node_modules_echarts_need/map/js/province/xinjiang.js
  36. 19 0
      report-ui/node_modules_echarts_need/map/js/province/xizang.js
  37. 44 0
      report-ui/node_modules_echarts_need/map/js/province/yunnan.js
  38. 44 0
      report-ui/node_modules_echarts_need/map/js/province/zhejiang.js
  39. 19 0
      report-ui/node_modules_echarts_need/map/js/world.js
  40. 0 0
      report-ui/node_modules_echarts_need/map/json/china-cities.json
  41. 0 0
      report-ui/node_modules_echarts_need/map/json/china-contour.json
  42. 0 0
      report-ui/node_modules_echarts_need/map/json/china.json
  43. 0 0
      report-ui/node_modules_echarts_need/map/json/province/anhui.json
  44. 1 0
      report-ui/node_modules_echarts_need/map/json/province/aomen.json
  45. 0 0
      report-ui/node_modules_echarts_need/map/json/province/beijing.json
  46. 0 0
      report-ui/node_modules_echarts_need/map/json/province/chongqing.json
  47. 0 0
      report-ui/node_modules_echarts_need/map/json/province/fujian.json
  48. 0 0
      report-ui/node_modules_echarts_need/map/json/province/gansu.json
  49. 0 0
      report-ui/node_modules_echarts_need/map/json/province/guangdong.json
  50. 0 0
      report-ui/node_modules_echarts_need/map/json/province/guangxi.json
  51. 0 0
      report-ui/node_modules_echarts_need/map/json/province/guizhou.json
  52. 0 0
      report-ui/node_modules_echarts_need/map/json/province/hainan.json
  53. 0 0
      report-ui/node_modules_echarts_need/map/json/province/hebei.json
  54. 0 0
      report-ui/node_modules_echarts_need/map/json/province/heilongjiang.json
  55. 0 0
      report-ui/node_modules_echarts_need/map/json/province/henan.json
  56. 0 0
      report-ui/node_modules_echarts_need/map/json/province/hubei.json
  57. 0 0
      report-ui/node_modules_echarts_need/map/json/province/hunan.json
  58. 0 0
      report-ui/node_modules_echarts_need/map/json/province/jiangsu.json
  59. 0 0
      report-ui/node_modules_echarts_need/map/json/province/jiangxi.json
  60. 0 0
      report-ui/node_modules_echarts_need/map/json/province/jilin.json
  61. 0 0
      report-ui/node_modules_echarts_need/map/json/province/liaoning.json
  62. 0 0
      report-ui/node_modules_echarts_need/map/json/province/neimenggu.json
  63. 0 0
      report-ui/node_modules_echarts_need/map/json/province/ningxia.json
  64. 0 0
      report-ui/node_modules_echarts_need/map/json/province/qinghai.json
  65. 0 0
      report-ui/node_modules_echarts_need/map/json/province/shandong.json
  66. 0 0
      report-ui/node_modules_echarts_need/map/json/province/shanghai.json
  67. 0 0
      report-ui/node_modules_echarts_need/map/json/province/shanxi.json
  68. 0 0
      report-ui/node_modules_echarts_need/map/json/province/shanxi1.json
  69. 0 0
      report-ui/node_modules_echarts_need/map/json/province/sichuan.json
  70. 0 0
      report-ui/node_modules_echarts_need/map/json/province/taiwan.json
  71. 0 0
      report-ui/node_modules_echarts_need/map/json/province/tianjin.json
  72. 0 0
      report-ui/node_modules_echarts_need/map/json/province/xianggang.json
  73. 0 0
      report-ui/node_modules_echarts_need/map/json/province/xinjiang.json
  74. 0 0
      report-ui/node_modules_echarts_need/map/json/province/xizang.json
  75. 0 0
      report-ui/node_modules_echarts_need/map/json/province/yunnan.json
  76. 0 0
      report-ui/node_modules_echarts_need/map/json/province/zhejiang.json
  77. 0 0
      report-ui/node_modules_echarts_need/map/json/world.json
  78. 2 0
      report-ui/node_modules_echarts_need/readme
  79. 24 24
      report-ui/package.json
  80. 7 7
      report-ui/src/assets/styles/screen.scss
  81. 1 1
      report-ui/src/assets/styles/screenDesigner.scss
  82. 15 15
      report-ui/src/components/AnjiPlus/anji-crud/anji-crud.vue
  83. 2 2
      report-ui/src/components/AnjiPlus/anji-crud/edit.vue
  84. 4 4
      report-ui/src/components/AnjiPlus/anji-dialog.vue
  85. 3 3
      report-ui/src/components/AnjiPlus/anji-input.vue
  86. 2 2
      report-ui/src/components/AnjiPlus/anji-upload.vue
  87. 1 1
      report-ui/src/components/MonacoEditor/index.vue
  88. 10 10
      report-ui/src/components/eachForm.vue
  89. 2 1
      report-ui/src/main.js
  90. 1 1
      report-ui/src/views/accessRole/components/RoleAuthority.vue
  91. 2 2
      report-ui/src/views/bigscreenDesigner/designer/components/colorPicker.vue
  92. 9 9
      report-ui/src/views/bigscreenDesigner/designer/components/componentLinkage.vue
  93. 11 11
      report-ui/src/views/bigscreenDesigner/designer/components/customColorComponents.vue
  94. 11 11
      report-ui/src/views/bigscreenDesigner/designer/components/customNameComponents.vue
  95. 2 2
      report-ui/src/views/bigscreenDesigner/designer/components/customUpload.vue
  96. 12 12
      report-ui/src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue
  97. 12 12
      report-ui/src/views/bigscreenDesigner/designer/components/dynamicAddTable.vue
  98. 5 5
      report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue
  99. 1 1
      report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue
  100. 1 1
      report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue

+ 10 - 3
report-ui/build/webpack.base.conf.js

@@ -22,9 +22,10 @@ module.exports = {
     publicPath: config.build.assetsPublicPath //process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
   },
   resolve: {
-    extensions: ['.js', '.vue', '.json'],
+    extensions: ['mjs', '.js', '.vue', '.json'],
     alias: {
-      '@': resolve('src')
+      '@': resolve('src'),
+      'vue$': 'vue/dist/vue.runtime.esm.js'
     }
   },
   module: {
@@ -55,6 +56,7 @@ module.exports = {
         loader: 'url-loader',
         exclude: [resolve('src/icons')],
         options: {
+          //esModule: false,
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
         }
@@ -74,7 +76,12 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
-      }
+      },
+      {
+        test: /\.mjs$/,
+        include: /node_modules/,
+        type: 'javascript/auto'
+      },
     ]
   },
   plugins: [new VueLoaderPlugin()],

+ 17 - 3
report-ui/build/webpack.prod.conf.js

@@ -97,11 +97,20 @@ const webpackConfig = merge(baseWebpackConfig, {
     // keep module.id stable when vender modules does not change
     new webpack.HashedModuleIdsPlugin(),
     // copy custom static assets
-    new CopyWebpackPlugin([{
+/*    new CopyWebpackPlugin([{
       from: path.resolve(__dirname, '../static'),
       to: config.build.assetsSubDirectory,
       ignore: ['.*']
-    }])
+    }])*/
+    new CopyWebpackPlugin({
+      patterns: [
+        {
+          from: path.resolve(__dirname, '../static'),
+          to: config.build.assetsSubDirectory,
+          ignore: ['.*']
+        }
+      ]
+    }),
   ],
   optimization: {
     splitChunks: {
@@ -126,7 +135,12 @@ const webpackConfig = merge(baseWebpackConfig, {
         uglifyOptions: {
           mangle: {
             safari10: true
-          }
+          },
+          compress: {
+            drop_debugger: true, //去掉debugger
+            drop_console: true, // 去掉console
+            pure_funcs: ['console.log', 'console.info', 'console.warn', 'console.debug'] //drop_console 设置false,需要特殊清除的
+          },
         },
         sourceMap: config.build.productionSourceMap,
         cache: true,

文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/china-contour.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/china.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/anhui.js


+ 46 - 0
report-ui/node_modules_echarts_need/map/js/province/aomen.js

@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['exports', 'echarts'], factory);
+    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
+        // CommonJS
+        factory(exports, require('echarts'));
+    } else {
+        // Browser globals
+        factory({}, root.echarts);
+    }
+}(this, function (exports, echarts) {
+    var log = function (msg) {
+        if (typeof console !== 'undefined') {
+            console && console.error && console.error(msg);
+        }
+    }
+    if (!echarts) {
+        log('ECharts is not Loaded');
+        return;
+    }
+    if (!echarts.registerMap) {
+        log('ECharts Map is not loaded')
+        return;
+    }
+    echarts.registerMap('澳门', {"type":"FeatureCollection","features":[{"id":"820001","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@LADC^umZ@DONWE@DALBBF@H@DFBBTC"],["@@P@LC@AGM@OECMBABBTCD@DDH"]],"encodeOffsets":[[[116285,22746]],[[116303,22746]]]},"properties":{"cp":[113.552965,22.207882],"name":"花地玛堂区","childNum":2}},{"id":"820002","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MK@CA@AAGDEB@NVFJG"],"encodeOffsets":[[116281,22734]]},"properties":{"cp":[113.549052,22.199175],"name":"花王堂区","childNum":1}},{"id":"820003","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@EGOB@DNLHE@C"],"encodeOffsets":[[116285,22729]]},"properties":{"cp":[113.550252,22.193791],"name":"望德堂区","childNum":1}},{"id":"820004","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ŸYMVAN@BFCBBDAFHDBBFDHIJJEFDPCHHlYJQ"],"encodeOffsets":[[116313,22707]]},"properties":{"cp":[113.55374,22.188119],"name":"大堂区","childNum":1}},{"id":"820005","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@JICGAECACGEBAAEDBFNXB@"],"encodeOffsets":[[116266,22728]]},"properties":{"cp":[113.54167,22.187778],"name":"风顺堂区","childNum":1}},{"id":"820006","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ ZNWRquZCBCC@AEA@@ADCDCAACEAGBQ@INEL"],"encodeOffsets":[[116265,22694]]},"properties":{"cp":[113.558783,22.154124],"name":"嘉模堂区","childNum":1}},{"id":"820007","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MOIAIEI@@GE@AAUCBdCFIFR@HAFBBDDBDCBC@@FB@BDDDA\\M"],"encodeOffsets":[[116316,22676]]},"properties":{"cp":[113.56925,22.136546],"name":"路凼填海区","childNum":1}},{"id":"820008","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@DKMMa_GC_COD@dVDBBF@@HJ@JFJBNPZK"],"encodeOffsets":[[116329,22670]]},"properties":{"cp":[113.559954,22.124049],"name":"圣方济各堂区","childNum":1}}],"UTF8Encoding":true});
+}));

文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/beijing.js


文件差异内容过多而无法显示
+ 19 - 0
report-ui/node_modules_echarts_need/map/js/province/chongqing.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/fujian.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/gansu.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/guangdong.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/guangxi.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/guizhou.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/hainan.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/hebei.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/heilongjiang.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/henan.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/hubei.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/hunan.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/jiangsu.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/jiangxi.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/jilin.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/liaoning.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/neimenggu.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/ningxia.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/qinghai.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/shandong.js


文件差异内容过多而无法显示
+ 19 - 0
report-ui/node_modules_echarts_need/map/js/province/shanghai.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/shanxi.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/shanxi1.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/sichuan.js


文件差异内容过多而无法显示
+ 19 - 0
report-ui/node_modules_echarts_need/map/js/province/taiwan.js


文件差异内容过多而无法显示
+ 18 - 0
report-ui/node_modules_echarts_need/map/js/province/tianjin.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/xianggang.js


文件差异内容过多而无法显示
+ 19 - 0
report-ui/node_modules_echarts_need/map/js/province/xinjiang.js


文件差异内容过多而无法显示
+ 19 - 0
report-ui/node_modules_echarts_need/map/js/province/xizang.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/yunnan.js


文件差异内容过多而无法显示
+ 44 - 0
report-ui/node_modules_echarts_need/map/js/province/zhejiang.js


文件差异内容过多而无法显示
+ 19 - 0
report-ui/node_modules_echarts_need/map/js/world.js


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/china-cities.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/china-contour.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/china.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/anhui.json


+ 1 - 0
report-ui/node_modules_echarts_need/map/json/province/aomen.json

@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"id":"820001","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@LADC^umZ@DONWE@DALBBF@H@DFBBTC"],["@@P@LC@AGM@OECMBABBTCD@DDH"]],"encodeOffsets":[[[116285,22746]],[[116303,22746]]]},"properties":{"cp":[113.552965,22.207882],"name":"花地玛堂区","childNum":2}},{"id":"820002","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MK@CA@AAGDEB@NVFJG"],"encodeOffsets":[[116281,22734]]},"properties":{"cp":[113.549052,22.199175],"name":"花王堂区","childNum":1}},{"id":"820003","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@EGOB@DNLHE@C"],"encodeOffsets":[[116285,22729]]},"properties":{"cp":[113.550252,22.193791],"name":"望德堂区","childNum":1}},{"id":"820004","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ŸYMVAN@BFCBBDAFHDBBFDHIJJEFDPCHHlYJQ"],"encodeOffsets":[[116313,22707]]},"properties":{"cp":[113.55374,22.188119],"name":"大堂区","childNum":1}},{"id":"820005","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@JICGAECACGEBAAEDBFNXB@"],"encodeOffsets":[[116266,22728]]},"properties":{"cp":[113.54167,22.187778],"name":"风顺堂区","childNum":1}},{"id":"820006","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ ZNWRquZCBCC@AEA@@ADCDCAACEAGBQ@INEL"],"encodeOffsets":[[116265,22694]]},"properties":{"cp":[113.558783,22.154124],"name":"嘉模堂区","childNum":1}},{"id":"820007","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MOIAIEI@@GE@AAUCBdCFIFR@HAFBBDDBDCBC@@FB@BDDDA\\M"],"encodeOffsets":[[116316,22676]]},"properties":{"cp":[113.56925,22.136546],"name":"路凼填海区","childNum":1}},{"id":"820008","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@DKMMa_GC_COD@dVDBBF@@HJ@JFJBNPZK"],"encodeOffsets":[[116329,22670]]},"properties":{"cp":[113.559954,22.124049],"name":"圣方济各堂区","childNum":1}}],"UTF8Encoding":true}

文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/beijing.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/chongqing.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/fujian.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/gansu.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/guangdong.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/guangxi.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/guizhou.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/hainan.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/hebei.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/heilongjiang.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/henan.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/hubei.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/hunan.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/jiangsu.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/jiangxi.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/jilin.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/liaoning.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/neimenggu.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/ningxia.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/qinghai.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/shandong.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/shanghai.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/shanxi.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/shanxi1.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/sichuan.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/taiwan.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/tianjin.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/xianggang.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/xinjiang.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/xizang.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/yunnan.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/province/zhejiang.json


文件差异内容过多而无法显示
+ 0 - 0
report-ui/node_modules_echarts_need/map/json/world.json


+ 2 - 0
report-ui/node_modules_echarts_need/readme

@@ -0,0 +1,2 @@
+执行完npm install后需要将map文件夹拷贝到node_modules/echarts/文件夹下,
+因为echarts v5.0之后的版本不在包含map文件夹

+ 24 - 24
report-ui/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "mirror-manager",
-  "version": "3.8.0",
-  "description": "mirror-manager",
-  "author": "mirror-team@anji-plus.com",
+  "name": "report-ui-manager",
+  "version": "1.0.0",
+  "description": "report-ui-manager",
+  "author": "beliefteam",
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
@@ -14,14 +14,14 @@
   "dependencies": {
     "@ckeditor/ckeditor5-build-decoupled-document": "^23.1.0",
     "@jiaminghi/data-view": "^2.10.0",
-    "@smallwei/avue": "^2.8.23",
+    "@smallwei/avue": "^2.9.13",
     "axios": "0.18.0",
     "chokidar": "^3.5.2",
     "codemirror": "^5.58.1",
     "crypto-js": "^3.1.9-1",
-    "echarts": "^4.9.0",
-    "echarts-gl": "^1.1.1",
-    "element-ui": "^2.9.2",
+    "echarts": "^5.5.1",
+    "echarts-gl": "^2.0.9",
+    "element-ui": "^2.15.14",
     "js-cookie": "2.2.0",
     "jsbarcode": "^3.11.4",
     "miment": "^0.0.9",
@@ -33,17 +33,17 @@
     "sortablejs": "^1.10.2",
     "uninstall": "0.0.0",
     "v-chart": "^1.0.0",
-    "vue": "2.6.11",
+    "vue": "^2.7.16",
     "vue-codemirror": "^4.0.6",
     "vue-color": "^2.8.1",
     "vue-drag-resize": "^1.5.4",
-    "vue-echarts": "^5.0.0-beta.0",
+    "vue-echarts": "^6.6.1",
     "vue-json-editor": "^1.4.3",
-    "vue-router": "3.0.1",
+    "vue-router": "^3.5.4",
     "vue-ruler-tool": "^1.2.4",
     "vue-superslide": "^0.1.1",
     "vuedraggable": "^2.24.1",
-    "vuex": "3.0.1"
+    "vuex": "^3.6.2"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
@@ -67,7 +67,6 @@
     "mini-css-extract-plugin": "0.4.1",
     "monaco-editor-webpack-plugin": "^4.1.1",
     "node-notifier": "5.2.1",
-    "node-sass": "^4.7.2",
     "optimize-css-assets-webpack-plugin": "5.0.0",
     "ora": "3.0.0",
     "path-to-regexp": "2.4.0",
@@ -76,21 +75,22 @@
     "postcss-loader": "2.1.6",
     "postcss-url": "7.3.2",
     "rimraf": "2.6.2",
-    "sass-loader": "7.0.3",
+    "sass": "^1.79.3",
+    "sass-loader": "^10.5.2",
     "script-ext-html-webpack-plugin": "2.0.1",
-    "semver": "5.5.0",
+    "semver": "7.3.7",
     "shelljs": "0.8.2",
-    "svg-sprite-loader": "3.8.0",
-    "svgo": "1.0.5",
-    "uglifyjs-webpack-plugin": "1.2.7",
-    "url-loader": "1.0.1",
-    "vue-loader": "15.3.0",
+    "svg-sprite-loader": "6.0.0",
+    "svgo": "2.0.0",
+    "uglifyjs-webpack-plugin": "2.0.0",
+    "url-loader": "4.0.0",
+    "vue-loader": "^15.10.2",
     "vue-style-loader": "4.1.2",
     "vue-template-compiler": "2.6.11",
-    "webpack": "4.16.5",
-    "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
-    "webpack-dev-server": "3.1.5",
+    "webpack": "4.36.0",
+    "webpack-bundle-analyzer": "4.0.0",
+    "webpack-cli": "3.3.10",
+    "webpack-dev-server": "3.3.0",
     "webpack-merge": "4.1.4"
   },
   "engines": {

+ 7 - 7
report-ui/src/assets/styles/screen.scss

@@ -226,7 +226,7 @@
     height: 100%;
   }
 
-  /deep/ .el-tabs--border-card {
+  ::v-deep .el-tabs--border-card {
     border: 0;
 
     .el-tabs__header {
@@ -416,11 +416,11 @@ li {
   padding: 5px;
 }
 
-/deep/ .vue-ruler-h {
+::v-deep .vue-ruler-h {
   opacity: 0.3;
 }
 
-/deep/ .vue-ruler-v {
+::v-deep .vue-ruler-v {
   opacity: 0.3;
 }
 
@@ -440,7 +440,7 @@ li {
       height: calc(100vh - 80px);
       text-align: center;
 
-      /deep/.el-tabs__header {
+      ::v-deep.el-tabs__header {
         width: 30%;
         margin-right: 0;
 
@@ -459,7 +459,7 @@ li {
         }
       }
 
-      /deep/.el-tabs__content {
+      ::v-deep.el-tabs__content {
         width: 70%;
       }
     }
@@ -495,7 +495,7 @@ li {
     }
   }
 
-  /deep/.el-tabs__content {
+  ::v-deep.el-tabs__content {
     padding: 0;
   }
 }
@@ -505,4 +505,4 @@ li {
 ::-webkit-scrollbar {
   width: 0;
   height: 10px;
-}
+}

+ 1 - 1
report-ui/src/assets/styles/screenDesigner.scss

@@ -28,7 +28,7 @@
       width: 300px;
     }
 
-    /deep/ .el-tabs--border-card {
+    ::v-deep .el-tabs--border-card {
       border: 0;
       .el-tabs__header {
         background: transparent;

+ 15 - 15
report-ui/src/components/AnjiPlus/anji-crud/anji-crud.vue

@@ -942,32 +942,32 @@ export default {
     position: relative;
   }
 }
-/deep/.button {
+::v-deep.button {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.08);
   border-radius: 6px;
 }
-/deep/.el-table th > .cell {
+::v-deep.el-table th > .cell {
   text-align: center;
 }
-/deep/.el-table .cell {
+::v-deep.el-table .cell {
   text-align: center;
 }
-/deep/.elTable {
+::v-deep.elTable {
   margin: 10px 0 50px;
 }
 .el-table {
   // 看这里!!!
   // 深度选择器,去除默认的padding
-  /deep/ th {
+  ::v-deep th {
     padding: 0;
     height: 36px;
   }
-  /deep/ td {
+  ::v-deep td {
     padding: 0;
     height: 36px;
   }
 }
-/deep/.el-table--striped .el-table__body tr.el-table__row--striped td {
+::v-deep.el-table--striped .el-table__body tr.el-table__row--striped td {
   background: #f9fbfd;
 }
 .screenFlex {
@@ -1029,7 +1029,7 @@ export default {
   &:hover {
     background: none !important;
   }
-  /deep/.el-button--text:hover,
+  ::v-deep.el-button--text:hover,
   .el-button--text:focus {
     color: #799ffc !important;
     background-color: #ecf5ff !important;
@@ -1048,7 +1048,7 @@ export default {
     float: right;
   }
 }
-/deep/.el-pagination.is-background .btn-prev,
+::v-deep.el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next,
 .el-pagination.is-background .el-pager li {
   margin: 0 5px;
@@ -1058,7 +1058,7 @@ export default {
   min-width: 30px;
   border-radius: 2px;
 }
-/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+::v-deep.el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: #5887fb;
   color: #ffffff;
   border-radius: 4px;
@@ -1075,26 +1075,26 @@ export default {
   margin-bottom: 14px;
   margin-right: 20px;
 }
-.el-table /deep/ .warning-row {
+.el-table ::v-deep .warning-row {
   color: red !important;
 }
-.el-table /deep/ .bgColor {
+.el-table ::v-deep .bgColor {
   background: #d9ecff;
 }
-/deep/.edit_button {
+::v-deep.edit_button {
   width: 22px;
   height: 22px;
   padding: 0;
   margin: 0;
   margin-right: 5px;
-  /deep/ i {
+  ::v-deep i {
     font-size: 30px;
   }
 }
 .el-form-item--mini.el-form-item {
   margin-bottom: 12px;
 }
-.el-table /deep/ .success-row {
+.el-table ::v-deep .success-row {
   background: #f9fbfd !important;
 }
 

+ 2 - 2
report-ui/src/components/AnjiPlus/anji-crud/edit.vue

@@ -393,7 +393,7 @@ export default {
 
 <style scoped lang="scss">
 .notfull-screen {
-  /deep/.el-dialog__body {
+  ::v-deep.el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     max-height: 60vh;
@@ -401,7 +401,7 @@ export default {
   }
 }
 .full-screen {
-  /deep/.el-dialog__body {
+  ::v-deep.el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     height: calc(100vh - 110px);

+ 4 - 4
report-ui/src/components/AnjiPlus/anji-dialog.vue

@@ -1,5 +1,5 @@
  <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: qianlishi
  * @Date: 2021-12-13 10:17:24
  * @Last Modified by:   qianlishi
@@ -158,7 +158,7 @@ export default {
 
 <style scoped lang="scss">
 .notfull-screen {
-  /deep/.el-dialog__body {
+  ::v-deep.el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     max-height: 60vh;
@@ -166,7 +166,7 @@ export default {
   }
 }
 .full-screen {
-  /deep/.el-dialog__body {
+  ::v-deep.el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     height: calc(100vh - 110px);
@@ -210,7 +210,7 @@ export default {
 .addForm {
   text-align: center;
 }
-.activeColor /deep/.el-form-item__label {
+.activeColor ::v-deep.el-form-item__label {
   color: #5887fb;
 }
 </style>

+ 3 - 3
report-ui/src/components/AnjiPlus/anji-input.vue

@@ -1,5 +1,5 @@
 <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: qianlishi
  * @Date: 2021-12-13 10:17:24
  * @Last Modified by:   qianlishi
@@ -175,10 +175,10 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-/deep/.el-input__suffix {
+::v-deep.el-input__suffix {
   padding: 0 6px;
 }
-.anji-input /deep/ .el-input__inner {
+.anji-input ::v-deep .el-input__inner {
   padding-right: 0 !important;
 }
 </style>

+ 2 - 2
report-ui/src/components/AnjiPlus/anji-upload.vue

@@ -1,5 +1,5 @@
  <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: qianlishi
  * @Date: 2021-8-4 10:17:24
  * @Last Modified by:   qianlishi
@@ -177,7 +177,7 @@ export default {
   width: 60px;
   height: 60px;
 }
-.hide_box /deep/.el-upload--picture-card {
+.hide_box ::v-deep.el-upload--picture-card {
   display: none;
 }
 .el-upload-list__item {

+ 1 - 1
report-ui/src/components/MonacoEditor/index.vue

@@ -126,7 +126,7 @@ export default {
 </script>
 
 <style scoped>
-.main /deep/ .view-lines * {
+.main ::v-deep .view-lines * {
   font-family: Consolas, "Courier New", monospace !important;
 }
 </style>

+ 10 - 10
report-ui/src/components/eachForm.vue

@@ -9,11 +9,11 @@
   <span>
     <!-- input 输入框-->
     <el-form-item :label="item.label"  v-if="item.type == 'input'" :rules="[{required:item.required}]">
-      <el-input 
-      :name="item.name" 
+      <el-input
+      :name="item.name"
       clearable
       :show-password ="item.name == 'password'?true:false"
-      :placeholder="item.placeholder" 
+      :placeholder="item.placeholder"
       v-model.trim="ConfigData[item.name]"
       @change="drivreConfigChange($event,item.name)"
       ></el-input>
@@ -45,11 +45,11 @@
     </el-form-item>
     <!-- textarea 文本框-->
     <el-form-item :label="item.label" v-if="item.type == 'textarea'" :rules="[{required:item.required}]">
-      <el-input 
+      <el-input
         type="textarea"
         clearable
         autosize
-        :placeholder="item.placeholder" 
+        :placeholder="item.placeholder"
         v-model="ConfigData[item.name]"
         @change="drivreConfigChange($event,item.name)"
       ></el-input>
@@ -168,7 +168,7 @@ export default {
       }else{
         this.$set(ConfigData,key,val);
       }
-      this.$emit('input', ConfigData) 
+      this.$emit('input', ConfigData)
       this.$emit('eachChange', ConfigData)
     },
 
@@ -186,16 +186,16 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.elForm /deep/ .el-upload--picture-card{
+.elForm ::v-deep .el-upload--picture-card{
   width: 80px;
   height: 80px;
   line-height: 83px;
 }
-.elForm /deep/ .el-upload-list__item {
+.elForm ::v-deep .el-upload-list__item {
   width: 80px;
   height: 80px;
 }
-.hide_box /deep/ .el-upload--picture-card{
+.hide_box ::v-deep .el-upload--picture-card{
   display: none;
 }
-</style>
+</style>

+ 2 - 1
report-ui/src/main.js

@@ -14,11 +14,12 @@ import router from './router'
 import store from './store'
 import * as filter from './filter'
 import mixins from '@/mixins'
-import echarts from 'echarts';
+import * as echarts from 'echarts';
 // 全局定义echarts
 import ECharts from 'vue-echarts'
 import 'echarts/lib/chart/bar'
 import 'echarts/lib/component/tooltip'
+
 //import 'echarts-liquidfill'
 // import 'echarts-gl'
 Vue.component('v-chart', ECharts)

+ 1 - 1
report-ui/src/views/accessRole/components/RoleAuthority.vue

@@ -93,7 +93,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-dialog__body {
+::v-deep.el-dialog__body {
   height: 400px;
   overflow-y: scroll;
 }

+ 2 - 2
report-ui/src/views/bigscreenDesigner/designer/components/colorPicker.vue

@@ -70,8 +70,8 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/.el-color-picker--mini,
-/deep/.el-color-picker--mini .el-color-picker__trigger {
+::v-deep.el-color-picker--mini,
+::v-deep.el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }

+ 9 - 9
report-ui/src/views/bigscreenDesigner/designer/components/componentLinkage.vue

@@ -250,25 +250,25 @@ export default {
     margin-left: 10px;
   }
 
-  /deep/.el-table,
-  /deep/.el-table__expanded-cell,
-  /deep/.el-table th,
-  /deep/.el-table tr {
+  ::v-deep.el-table,
+  ::v-deep.el-table__expanded-cell,
+  ::v-deep.el-table th,
+  ::v-deep.el-table tr {
     background-color: transparent !important;
     color: #859094 !important;
   }
-  /deep/.el-table td,
-  /deep/.el-table th.is-leaf {
+  ::v-deep.el-table td,
+  ::v-deep.el-table th.is-leaf {
     border-bottom: none;
     line-height: 26px;
   }
-  /deep/.el-table tbody tr:hover > td {
+  ::v-deep.el-table tbody tr:hover > td {
     background-color: #263445 !important;
   }
-  /deep/.el-table::before {
+  ::v-deep.el-table::before {
     height: 0;
   }
-  /deep/.el-dialog {
+  ::v-deep.el-dialog {
     background: #1b1e25;
     .el-dialog__title {
       color: #fff;

+ 11 - 11
report-ui/src/views/bigscreenDesigner/designer/components/customColorComponents.vue

@@ -156,30 +156,30 @@ export default {
     flex-direction: row;
   }
 }
-/deep/.el-table,
-/deep/.el-table__expanded-cell,
-/deep/.el-table th,
-/deep/.el-table tr {
+::v-deep.el-table,
+::v-deep.el-table__expanded-cell,
+::v-deep.el-table th,
+::v-deep.el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
 }
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
+::v-deep.el-table td,
+::v-deep.el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-/deep/.el-table tbody tr:hover > td {
+::v-deep.el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-/deep/.el-table::before {
+::v-deep.el-table::before {
   height: 0;
 }
-/deep/.el-color-picker--mini,
-/deep/.el-color-picker--mini .el-color-picker__trigger {
+::v-deep.el-color-picker--mini,
+::v-deep.el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
-/deep/.el-dialog {
+::v-deep.el-dialog {
   background: #1b1e25;
   .el-dialog__title {
     color: #fff;

+ 11 - 11
report-ui/src/views/bigscreenDesigner/designer/components/customNameComponents.vue

@@ -155,30 +155,30 @@ export default {
     flex-direction: row;
   }
 }
-/deep/.el-table,
-/deep/.el-table__expanded-cell,
-/deep/.el-table th,
-/deep/.el-table tr {
+::v-deep.el-table,
+::v-deep.el-table__expanded-cell,
+::v-deep.el-table th,
+::v-deep.el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
 }
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
+::v-deep.el-table td,
+::v-deep.el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-/deep/.el-table tbody tr:hover > td {
+::v-deep.el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-/deep/.el-table::before {
+::v-deep.el-table::before {
   height: 0;
 }
-/deep/.el-color-picker--mini,
-/deep/.el-color-picker--mini .el-color-picker__trigger {
+::v-deep.el-color-picker--mini,
+::v-deep.el-color-picker--mini .el-color-picker__trigger {
   width: 23px;
   height: 23px;
 }
-/deep/.el-dialog {
+::v-deep.el-dialog {
   background: #1b1e25;
   .el-dialog__title {
     color: #fff;

+ 2 - 2
report-ui/src/views/bigscreenDesigner/designer/components/customUpload.vue

@@ -90,8 +90,8 @@ export default {
   top: 0;
   opacity: 0;
 }
-/deep/.el-input-group__append,
-/deep/.el-input-group__prepend {
+::v-deep.el-input-group__append,
+::v-deep.el-input-group__prepend {
   padding: 0 10px !important;
   overflow: hidden;
 }

+ 12 - 12
report-ui/src/views/bigscreenDesigner/designer/components/dynamicAddRadar.vue

@@ -138,38 +138,38 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/::-webkit-scrollbar-track-piece {
+::v-deep::-webkit-scrollbar-track-piece {
   background-color: transparent;
 }
-/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
   width: 0; // 横向滚动条
   height: 8px; // 纵向滚动条 必写
 }
 // 滚动条的滑块
-/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-/deep/.el-table,
-/deep/.el-table__expanded-cell,
-/deep/.el-table th,
-/deep/.el-table tr {
+::v-deep.el-table,
+::v-deep.el-table__expanded-cell,
+::v-deep.el-table th,
+::v-deep.el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
+::v-deep.el-table td,
+::v-deep.el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-/deep/.el-table tbody tr:hover {
+::v-deep.el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-/deep/.el-table tbody tr:hover > td {
+::v-deep.el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-/deep/.el-table::before {
+::v-deep.el-table::before {
   height: 0;
 }
 .button-group .el-button {

+ 12 - 12
report-ui/src/views/bigscreenDesigner/designer/components/dynamicAddTable.vue

@@ -138,38 +138,38 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/::-webkit-scrollbar-track-piece {
+::v-deep::-webkit-scrollbar-track-piece {
   background-color: transparent;
 }
-/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar {
   width: 0; // 横向滚动条
   height: 8px; // 纵向滚动条 必写
 }
 // 滚动条的滑块
-/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
   border-radius: 5px;
   background-color: rgba(144, 146, 152, 0.3);
 }
-/deep/.el-table,
-/deep/.el-table__expanded-cell,
-/deep/.el-table th,
-/deep/.el-table tr {
+::v-deep.el-table,
+::v-deep.el-table__expanded-cell,
+::v-deep.el-table th,
+::v-deep.el-table tr {
   background-color: transparent !important;
   color: #859094 !important;
   font-size: 12px !important;
 }
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
+::v-deep.el-table td,
+::v-deep.el-table th.is-leaf {
   border-bottom: none;
   line-height: 26px;
 }
-/deep/.el-table tbody tr:hover {
+::v-deep.el-table tbody tr:hover {
   background-color: #263445 !important;
 }
-/deep/.el-table tbody tr:hover > td {
+::v-deep.el-table tbody tr:hover > td {
   background-color: #263445 !important;
 }
-/deep/.el-table::before {
+::v-deep.el-table::before {
   height: 0;
 }
 .button-group .el-button {

+ 5 - 5
report-ui/src/views/bigscreenDesigner/designer/components/dynamicForm.vue

@@ -501,10 +501,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .el-form-item {
+::v-deep .el-form-item {
   margin-bottom: 5px;
 }
-/deep/ .el-form-item__label {
+::v-deep .el-form-item__label {
   font-size: 12px;
   color: #fff;
 }
@@ -516,7 +516,7 @@ export default {
   border-top: none;
   border-bottom: none;
 }
-/deep/.el-collapse-item__header {
+::v-deep.el-collapse-item__header {
   height: 40px;
   line-height: 40px;
   background: transparent;
@@ -525,11 +525,11 @@ export default {
   font-size: 12px;
   border-color: #282e3a;
 }
-/deep/.el-collapse-item__wrap {
+::v-deep.el-collapse-item__wrap {
   background: transparent;
   border: none;
 }
-/deep/.el-collapse-item__content {
+::v-deep.el-collapse-item__content {
   padding-bottom: 0;
 }
 </style>

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <div :style="styleObj">
-    <v-chart ref="myVChart" :options="options" autoresize/>
+    <v-chart ref="myVChart" :option="options" autoresize/>
   </div>
 </template>
 

+ 1 - 1
report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarDoubleYaxisChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div :style="styleObj">
-    <v-chart ref="myVChart" :options="options" autoresize/>
+    <v-chart ref="myVChart" :option="options" autoresize/>
   </div>
 </template>
 

部分文件因为文件数量过多而无法显示