vue2-client 1.2.109 → 1.2.112

package/vue.config.js

@@ -1,163 +1,163 @@
-const path = require('path')
-const webpack = require('webpack')
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
-const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-const productionGzipExtensions = ['js', 'css']
-const isProd = process.env.NODE_ENV === 'production'
-
-// const assetsCDN = {
-//   // webpack build externals
-//   externals: {
-//     vue: 'Vue',
-//     'vue-router': 'VueRouter',
-//     vuex: 'Vuex',
-//     axios: 'axios',
-//     nprogress: 'NProgress',
-//     clipboard: 'ClipboardJS',
-//     '@antv/data-set': 'DataSet',
-//     'js-cookie': 'Cookies'
-//   },
-//   css: [
-//   ],
-//   js: [
-//     '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
-//     '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
-//     '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
-//     '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
-//     '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
-//     '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
-//     '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
-//     '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
-//   ]
-// }
-
-const server = 'http://121.36.106.17:8400'
-const local = 'http://localhost:8445/webmeter'
-// const local = 'http://123.60.214.109:8405/webmeter'
-
-module.exports = {
-  devServer: {
-    // development server port 8000
-    port: 8001,
-    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    proxy: {
-      '/rs': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/image': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webapps': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/webmeterapi/foreignaidUseGasSumCountData': {
-        // pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: 'http://61.134.55.234:8405/',
-        changeOrigin: true
-      },
-      '/webmeterapi/getEmpTree': {
-        // pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: 'http://123.60.214.109:8406/',
-        changeOrigin: true
-      },
-      '/webmeterapi': {
-        pathRewrite: { '^/webmeterapi': '/rs/logic' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeteruploadapi': {
-        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
-        target: local,
-        changeOrigin: true
-      },
-      '/webmeterresourceapi': {
-        pathRewrite: { '^/webmeterresourceapi': '/rs/resource' },
-        target: local,
-        changeOrigin: true
-      },
-      '/resource': {
-        pathRewrite: { '^/resource': '/' },
-        target: 'http://127.0.0.1:4789',
-        changeOrigin: true
-      }
-    }
-  },
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'less',
-      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
-    }
-  },
-  configureWebpack: config => {
-    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
-    config.performance = {
-      hints: false
-    }
-    config.plugins.push(
-      new ThemeColorReplacer({
-        fileName: 'css/theme-colors-[contenthash:8].css',
-        matchColors: getThemeColors(),
-        injectCss: true,
-        resolveCss
-      })
-    )
-    // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    // 生产环境下将资源压缩成gzip格式
-    if (isProd) {
-      // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
-    }
-    // if prod, add externals
-    // if (isProd) {
-    //   config.externals = assetsCDN.externals
-    // }
-  },
-  chainWebpack: config => {
-    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
-    if (isProd) {
-      config.plugin('optimize-css')
-        .tap(args => {
-          args[0].cssnanoOptions.preset[1].colormin = false
-          return args
-        })
-    }
-    // 生产环境下使用CDN
-    // if (isProd) {
-    //   config.plugin('html')
-    //     .tap(args => {
-    //       args[0].cdn = assetsCDN
-    //     return args
-    //   })
-    // }
-    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
-  },
-  css: {
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          modifyVars: modifyVars(),
-          javascriptEnabled: true
-        }
-      }
-    }
-  },
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  outputDir: 'dist',
-  assetsDir: 'static',
-  productionSourceMap: false
-}
+const path = require('path')
+const webpack = require('webpack')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
+const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+const productionGzipExtensions = ['js', 'css']
+const isProd = process.env.NODE_ENV === 'production'
+
+// const assetsCDN = {
+//   // webpack build externals
+//   externals: {
+//     vue: 'Vue',
+//     'vue-router': 'VueRouter',
+//     vuex: 'Vuex',
+//     axios: 'axios',
+//     nprogress: 'NProgress',
+//     clipboard: 'ClipboardJS',
+//     '@antv/data-set': 'DataSet',
+//     'js-cookie': 'Cookies'
+//   },
+//   css: [
+//   ],
+//   js: [
+//     '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js',
+//     '//cdn.jsdelivr.net/npm/vue-router@3.3.4/dist/vue-router.min.js',
+//     '//cdn.jsdelivr.net/npm/vuex@3.4.0/dist/vuex.min.js',
+//     '//cdn.jsdelivr.net/npm/axios@0.19.2/dist/axios.min.js',
+//     '//cdn.jsdelivr.net/npm/nprogress@0.2.0/nprogress.min.js',
+//     '//cdn.jsdelivr.net/npm/clipboard@2.0.6/dist/clipboard.min.js',
+//     '//cdn.jsdelivr.net/npm/@antv/data-set@0.11.4/build/data-set.min.js',
+//     '//cdn.jsdelivr.net/npm/js-cookie@2.2.1/src/js.cookie.min.js'
+//   ]
+// }
+
+const server = 'http://121.36.106.17:8400'
+const local = 'http://localhost:8445/webmeter'
+// const local = 'http://123.60.214.109:8405/webmeter'
+
+module.exports = {
+  devServer: {
+    // development server port 8000
+    port: 8001,
+    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
+    proxy: {
+      '/rs': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/image': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webapps': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/webmeterapi/foreignaidUseGasSumCountData': {
+        // pathRewrite: { '^/webmeterapi': '/rs/logic' },
+        target: 'http://61.134.55.234:8405/',
+        changeOrigin: true
+      },
+      '/webmeterapi/getEmpTree': {
+        // pathRewrite: { '^/webmeterapi': '/rs/logic' },
+        target: 'http://123.60.214.109:8406/',
+        changeOrigin: true
+      },
+      '/webmeterapi': {
+        pathRewrite: { '^/webmeterapi': '/rs/logic' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmeteruploadapi': {
+        pathRewrite: { '^/webmeteruploadapi': '/rs/file' },
+        target: local,
+        changeOrigin: true
+      },
+      '/webmeterresourceapi': {
+        pathRewrite: { '^/webmeterresourceapi': '/rs/resource' },
+        target: local,
+        changeOrigin: true
+      },
+      '/resource': {
+        pathRewrite: { '^/resource': '/' },
+        target: 'http://127.0.0.1:4789',
+        changeOrigin: true
+      }
+    }
+  },
+  pluginOptions: {
+    'style-resources-loader': {
+      preProcessor: 'less',
+      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
+    }
+  },
+  configureWebpack: config => {
+    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
+    config.performance = {
+      hints: false
+    }
+    config.plugins.push(
+      new ThemeColorReplacer({
+        fileName: 'css/theme-colors-[contenthash:8].css',
+        matchColors: getThemeColors(),
+        injectCss: true,
+        resolveCss
+      })
+    )
+    // Ignore all locale files of moment.js
+    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    // 生产环境下将资源压缩成gzip格式
+    if (isProd) {
+      // add `CompressionWebpack` plugin to webpack plugins
+      config.plugins.push(new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8
+      }))
+    }
+    // if prod, add externals
+    // if (isProd) {
+    //   config.externals = assetsCDN.externals
+    // }
+  },
+  chainWebpack: config => {
+    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
+    if (isProd) {
+      config.plugin('optimize-css')
+        .tap(args => {
+          args[0].cssnanoOptions.preset[1].colormin = false
+          return args
+        })
+    }
+    // 生产环境下使用CDN
+    // if (isProd) {
+    //   config.plugin('html')
+    //     .tap(args => {
+    //       args[0].cdn = assetsCDN
+    //     return args
+    //   })
+    // }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          modifyVars: modifyVars(),
+          javascriptEnabled: true
+        }
+      }
+    }
+  },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH,
+  outputDir: 'dist',
+  assetsDir: 'static',
+  productionSourceMap: false
+}

package/src/base-client/components/common/ScrollList/SrcollList.vue

@@ -1,113 +0,0 @@
-<template>
-  <a-list
-    :data-source="model.rows"
-    :bordered="bordered"
-    v-infinite-scroll="handleInfiniteOnLoad"
-    class="srcoll-list-infinite-container"
-    :infinite-scroll-disabled="busy"
-    :infinite-scroll-distance="distance"
-  >
-    <a-list-item slot="renderItem" class="srcoll_list_li" slot-scope="item,index" @click="selectItem(index,item)">
-      <slot :item="item" :index="index" >
-      </slot>
-    </a-list-item>
-    <div v-if="loading && !busy" class="srcoll-list-loading-container">
-      <a-spin />
-    </div>
-  </a-list>
-</template>
-
-<script>
-  import infiniteScroll from 'vue-infinite-scroll'
-  import { post } from '@vue2-client/services/api/restTools'
-
-  export default {
-    name: 'SrcollList1',
-    directives: { infiniteScroll },
-    props: {
-      'busy': { // 是否执行回调
-        type: Boolean,
-        default: false
-      },
-      'distance': { // 距底部多少像素触发回调
-        type: Number,
-        default: 1
-      },
-      'bordered': { // 是否显示列表边框
-        type: Boolean,
-        default: true
-      },
-      'model': {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    data () {
-      return {
-        selectRow: {},
-        loading: false
-      }
-    },
-    mounted () {
-    },
-    methods: {
-      selectItem (index, item) {
-        this.$emit('selectItem', index, item)
-      },
-      handleInfiniteOnLoad () {
-        this.loading = true
-        if (this.model.pageNo < this.model.totalPage || this.model.pageNo == 0) {
-          this.model.pageNo = this.model.pageNo + 1
-          post(this.model.url, { data: this.model }).then((res) => {
-            this.model.rows = this.model.rows.concat(res.data).map((item, index) => ({ ...item, index }))
-            this.loading = false
-            this.model.totalPage = res.totalPage
-            this.model.totalCount = res.totalCount
-          })
-        } else {
-          this.loading = false
-        }
-      },
-      search () {
-        this.model.pageNo = 0
-        this.model.rows = []
-        this.handleInfiniteOnLoad()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .srcoll-list-infinite-container {
-    border-radius: 4px;
-    height: 100%;
-    overflow-y: scroll;
-  }
-  /*滚动条样式*/
-  .srcoll-list-infinite-container::-webkit-scrollbar {
-    width: 4px;
-    /*height: 4px;*/
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    background: rgba(0,0,0,0.2);
-  }
-  .srcoll-list-infinite-container::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
-    border-radius: 0;
-    background: rgba(0,0,0,0.1);
-
-  }
-  .srcoll-list-loading-container {
-    position: absolute;
-    bottom: 10%;
-    width: 100%;
-    text-align: center;
-  }
-  .srcoll_list_li:hover{
-    background-color: rgb(203,234,241);
-  }
-</style>

package/src/base-client/components/common/ScrollList/index.js

@@ -1,3 +0,0 @@
-import SrcollList from './SrcollList'
-
-export default SrcollList

package/src/base-client/components/iot/DataAnalysisView/DataAnalysisView.vue

@@ -1,244 +0,0 @@
-<template>
-  <a-row type="flex">
-    <baidu-map
-      :mapStyle="mapStyle"
-      class="bm-view"
-      :center="'西安'"
-      :scroll-wheel-zoom="true"
-      :zoom="zoom"
-      @ready="handler"
-      @click="searchClick"
-      ak="YOUR_APP_KEY">
-      <bm-view style="width: 100%; height:100%; flex: 1"></bm-view>
-      <bm-control :offset="{width: '10px', height: '10px'}">
-        <bm-auto-complete :sugStyle="{zIndex: 1}">
-          <a-input v-model="keyword" type="text" placeholder="地区信息搜索" style="width: 150px;height: 50px" /> <!-- 这里指代一个自定义搜索框组件 -->
-        </bm-auto-complete>
-      </bm-control>
-      <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
-      <bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true"></bm-geolocation>
-      <bm-local-search :keyword="keyword" :panel="false" :auto-viewport="true" zoom="12.8" style="display: none" ></bm-local-search>
-    </baidu-map>
-  </a-row>
-</template>
-
-<script>
-    import { BaiduMap, BmView, BmNavigation, BMCityList, BmGeolocation, BmControl, BmLocalSearch } from 'vue-baidu-map'
-    export default {
-        components: {
-            BaiduMap,
-            BmNavigation,
-            BmView,
-            BMCityList,
-            BmGeolocation,
-            BmControl,
-            BmLocalSearch
-        },
-        data () {
-            return {
-              keyword: '',
-                center: {
-                    lng: 12131693.03,
-                    lat: 4063684.53
-                },
-                zoom: 17,
-                address: {
-                  propprovince: '', // 省
-                  propcity: '', // 市
-                  propcounty: '', // 县
-                  propaddress: '' // 详细地址
-                },
-              mapStyle: {
-                styleJson: [
-                  {
-                    featureType: 'water',
-                    elementType: 'all',
-                    stylers: {
-                      color: '#021019'
-                    }
-                  },
-                  {
-                    featureType: 'highway',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'highway',
-                    elementType: 'geometry.stroke',
-                    stylers: {
-                      color: '#147a92'
-                    }
-                  },
-                  {
-                    featureType: 'arterial',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'arterial',
-                    elementType: 'geometry.stroke',
-                    stylers: {
-                      color: '#0b3d51'
-                    }
-                  },
-                  {
-                    featureType: 'local',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'land',
-                    elementType: 'all',
-                    stylers: {
-                      color: '#08304b'
-                    }
-                  },
-                  {
-                    featureType: 'railway',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'railway',
-                    elementType: 'geometry.stroke',
-                    stylers: {
-                      color: '#08304b'
-                    }
-                  },
-                  {
-                    featureType: 'subway',
-                    elementType: 'geometry',
-                    stylers: {
-                      lightness: -70
-                    }
-                  },
-                  {
-                    featureType: 'building',
-                    elementType: 'geometry.fill',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.text.fill',
-                    stylers: {
-                      color: '#857f7f'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.text.stroke',
-                    stylers: {
-                      color: '#000000'
-                    }
-                  },
-                  {
-                    featureType: 'building',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#022338'
-                    }
-                  },
-                  {
-                    featureType: 'green',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#062032'
-                    }
-                  },
-                  {
-                    featureType: 'boundary',
-                    elementType: 'all',
-                    stylers: {
-                      color: '#1e1c1c'
-                    }
-                  },
-                  {
-                    featureType: 'manmade',
-                    elementType: 'geometry',
-                    stylers: {
-                      color: '#022338'
-                    }
-                  },
-                  {
-                    featureType: 'poi',
-                    elementType: 'all',
-                    stylers: {
-                      visibility: 'off'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.icon',
-                    stylers: {
-                      visibility: 'off'
-                    }
-                  },
-                  {
-                    featureType: 'all',
-                    elementType: 'labels.text.fill',
-                    stylers: {
-                      color: '#2da0c6',
-                      visibility: 'on'
-                    }
-                  }
-                ]
-              }
-            }
-        },
-        methods: {
-            searchClick (e) {
-                const _this = this
-                this.longitude = e.point.lng// 经度
-                this.latitude = e.point.lat// 维度
-                this.center.lng = _this.longitude // 中心点
-                this.center.lat = _this.latitude// 中心点
-                // eslint-disable-next-line no-undef
-                const geocoder = new BMap.Geocoder() // 创建地址解析器的实例
-                geocoder.getLocation(e.point, function (rs) {
-                    console.log(rs)
-                    _this.address.propprovince = rs.addressComponents.province // 省
-                    _this.address.propcity = rs.addressComponents.city // 市
-                    _this.address.propcounty = rs.addressComponents.district // 县
-                    _this.address.propaddress = rs.address// 详细地址
-                })
-                console.log('geocoder', _this.address)
-                this.$emit('togShow', _this.address)
-            },
-
-            handler ({ BMap, map }) {
-                console.log(BMap, map)
-                this.center.lng = 116.404
-                this.center.lat = 39.915
-                this.zoom = 15
-            }
-        },
-      watch: {
-        'keyword' (val) {
-          console.log(val)
-        }
-      }
-    }
-</script>
-
-<style>
-    .bm-view {
-        width: 100%;
-        height:500px;
-    }
-    .BMap_cpyCtrl {
-        display: none;
-    }
-    .anchorBL {
-        display: none;
-    }
-</style>