openatc-components 0.0.2 → 0.0.3

package/build/package.dev.config.js

@@ -1,14 +1,96 @@
 const webpack = require('webpack')
 const merge = require('webpack-merge')
+const path = require('path')
+const config = require('../config')
+const utils = require('./utils')
+const vueLoaderConfig = require('./vue-loader.conf')
 const baseWebpackConfig = require('./package.config')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const extractScss = new ExtractTextPlugin('/kissui.min.css')
 
+function resolve(dir) {
+  return path.join(__dirname, '..', dir)
+}
+const createLintingRule = () => ({
+  test: /\.(js|vue)$/,
+  loader: 'eslint-loader',
+  enforce: 'pre',
+  include: [resolve('src'), resolve('test')],
+  options: {
+    formatter: require('eslint-friendly-formatter'),
+    emitWarning: !config.dev.showEslintErrorsInOverlay
+  }
+})
+
 module.exports = merge(baseWebpackConfig, {
   output: {
     filename: '[name].js'
   },
   module: {
+    rules: [
+      ...(config.dev.useEslint ? [createLintingRule()] : []),
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: vueLoaderConfig
+      },
+    {
+      test: /\.js$/,
+      loader: 'babel-loader',
+      include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'),
+        resolve('../src/lib')
+      ]
+    },
+    {
+      test: /\.svg$/,
+      loader: 'svg-sprite-loader',
+      include: [resolve('src/icons')],
+      options: {
+        symbolId: 'icon-[name]'
+      }
+    },
+    {
+      test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+      loader: 'url-loader',
+      exclude: [resolve('src/icons')],
+      options: {
+        limit: 10000,
+        name: utils.assetsPath('img/[name].[hash:7].[ext]')
+      }
+    },
+    {
+      test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+      loader: 'url-loader',
+      options: {
+        limit: 10000,
+        name: utils.assetsPath('media/[name].[hash:7].[ext]')
+      }
+    },
+    {
+      test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+      loader: 'url-loader',
+      options: {
+        limit: 10000,
+        name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+      }
+    },
+    {
+      test: /\.css$/,
+      use: [
+        //'sass-loader',
+        'css-loader',
+        //'autoprefixer-loader'
+      ]
+    },
+    {
+      test: /\.scss$/,
+      use: [
+        'style-loader',
+        'css-loader',
+        'sass-loader'
+      ]
+    },
+  ],
     loaders: [{
       test: /\.scss$/i,
       loader: extractScss.extract(['css-loader', 'sass-loader'])

package/build/package.prod.config.js

@@ -1,17 +1,99 @@
 const webpack = require('webpack')
 const merge = require('webpack-merge')
+const path = require('path')
+const utils = require('./utils')
+const vueLoaderConfig = require('./vue-loader.conf')
 const config = require('../config')
 const baseWebpackConfig = require('./package.config')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const extractScss = new ExtractTextPlugin('/kissui.min.css')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+
+function resolve(dir) {
+  return path.join(__dirname, '..', dir)
+}
+const createLintingRule = () => ({
+  test: /\.(js|vue)$/,
+  loader: 'eslint-loader',
+  enforce: 'pre',
+  include: [resolve('src'), resolve('test')],
+  options: {
+    formatter: require('eslint-friendly-formatter'),
+    emitWarning: !config.dev.showEslintErrorsInOverlay
+  }
+})
 
 module.exports = merge(baseWebpackConfig, {
   output: {
     filename: '[name].min.js'
   },
   module: {
+    rules: [
+      ...(config.dev.useEslint ? [createLintingRule()] : []),
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: vueLoaderConfig
+      },
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'),
+          resolve('../src/lib')
+        ]
+      },
+      {
+        test: /\.svg$/,
+        loader: 'svg-sprite-loader',
+        include: [resolve('src/icons')],
+        options: {
+          symbolId: 'icon-[name]'
+        }
+      },
+      {
+        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+        loader: 'url-loader',
+        exclude: [resolve('src/icons')],
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('img/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('media/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.css$/,
+        use: [
+          //'sass-loader',
+          'css-loader',
+          //'autoprefixer-loader'
+        ]
+      },
+      {
+        test: /\.scss$/,
+        use: [
+          'style-loader',
+          'css-loader',
+          'sass-loader'
+        ]
+      },
+    ],
     loaders: [{
       test: /\.scss$/,
       loader: extractScss.extract(['css-loader', 'sass-loader'])
@@ -30,7 +112,23 @@ module.exports = merge(baseWebpackConfig, {
       'window.jQuery': 'jquery'
     }),
     // new webpack.optimize.OccurrenceOrderPlugin(),
-    new webpack.optimize.UglifyJsPlugin({
+    // new webpack.optimize.UglifyJsPlugin({
+    //   uglifyOptions: {
+    //     ie8: false,
+    //     output: {
+    //       comments: false,
+    //       beautify: false
+    //     },
+    //     mangle: {
+    //       keep_fnames: true
+    //     },
+    //     compress: {
+    //       warnings: false,
+    //       drop_console: true
+    //     }
+    //   }
+    // }),
+    new UglifyJsPlugin({
       uglifyOptions: {
         ie8: false,
         output: {
@@ -44,7 +142,9 @@ module.exports = merge(baseWebpackConfig, {
           warnings: false,
           drop_console: true
         }
-      }
+      },
+      sourceMap: config.build.productionSourceMap,
+      parallel: true
     }),
     extractScss,
     new OptimizeCSSPlugin({

package/build/webpack.base.conf.js

@@ -54,8 +54,12 @@ module.exports = {
         include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
       },
       {
-        test: /\.scss$/,
-        loaders: ['style', 'css', 'sass']
+        test: /\.svg$/,
+        loader: 'svg-sprite-loader',
+        include: [resolve('src/icons')],
+        options: {
+          symbolId: 'icon-[name]'
+        }
       },
       {
         test: /\.less$/,
@@ -64,8 +68,9 @@ module.exports = {
       {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         loader: 'url-loader',
+        exclude: [resolve('src/icons')],
         options: {
-          limit: 50000,
+          limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
         }
       },

package/config/dev.env.js

@@ -3,5 +3,6 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  BASE_API: '/',
 })

package/config/index.js

@@ -10,7 +10,21 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+      '/': {
+        // target:  'http://192.168.13.103:8012/openatc',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
+        // target:  'http://192.168.14.2:8012/openatc',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
+        // target:  'https://dolphin-test.kedacom.com/openatc',
+        // target:  'http://192.168.13.105:11003/openatc',
+        target:  'http://192.168.13.103:10003',
+        // target:  'http://192.168.13.103:9999',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
+        // target:  'http://192.168.13.103:9999/kissapi',//'http://172.16.239.139:8080/',//设置你调用的接口域名和端口号
+        changeOrigin: true,     //跨域
+        pathRewrite: {
+          '^/': '/'//这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替 比如我要调用'http://10.1.5.11:8080/xxx/duty?time=2017-07-07 14:57:22'，直接写‘/api/xxx/duty?time=2017-07-07 14:57:22’即可
+        }
+      }
+    },
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
@@ -26,7 +40,7 @@ module.exports = {
     useEslint: true,
     // If true, eslint errors and warnings will also be shown in the error overlay
     // in the browser.
-    showEslintErrorsInOverlay: false,
+    showEslintErrorsInOverlay: true,
 
     /**
      * Source Maps
@@ -38,9 +52,9 @@ module.exports = {
     // If you have problems debugging vue-files in devtools,
     // set this to false - it *may* help
     // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
+    cacheBusting: false,
 
-    cssSourceMap: true
+    cssSourceMap: false
   },
 
   build: {
@@ -49,7 +63,7 @@ module.exports = {
 
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: './',
     assetsPublicPath: './',
 
     /**

package/config/prod.env.js

@@ -1,4 +1,5 @@
 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  BASE_API: '/',
 }

package/index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>kissui</title>
+    <title>openatc-components</title>
   </head>
   <body>
     <div id="app"></div>

package/package/kisscomps/components/CommonKanban/CommonKanban.vue

@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+<template>
+  <div class="common-board-column">
+    <div class="common-board-column-header">
+      {{headerText}}
+    </div>
+    <div class="common-board-table-header">
+      <div class="common-titlecolumn phase">{{this.$t('openatccomponents.overview.phase')}}</div>
+      <div class="common-titlecolumn mode">
+        <slot name="kanbantitle"></slot>
+      </div>
+    </div>
+    <!-- 开启拖拽调整顺序 -->
+    <draggable v-if="Draggable" class="common-board-column-content" v-model="list" @end="end">
+      <div class="common-board-item" v-for="element in list" :key="element.id">
+        <div class="common-contentcolumn phase">
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{element.name}}</div>
+              <div class="common-phase-description">
+                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+              </div>
+            </el-tooltip>
+        </div>
+        <div class="common-contentcolumn mode">
+          <slot name="kanbancontent" :element="element"></slot>
+        </div>
+      </div>
+    </draggable>
+    <!-- 关闭拖拽调整顺序 -->
+    <div v-if="!Draggable" class="common-board-column-content">
+      <div class="common-board-item" v-for="element in list" :key="element.id">
+        <div class="common-contentcolumn phase">
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{element.name}}</div>
+              <div class="common-phase-description">
+                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+              </div>
+            </el-tooltip>
+        </div>
+        <div class="common-contentcolumn mode">
+          <slot name="kanbancontent" :element="element"></slot>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
+import draggable from 'vuedraggable'
+
+export default {
+  name: 'common-kanban',
+  components: {
+    draggable,
+    xdrdirselector
+  },
+  props: {
+    headerText: {
+      type: String
+    },
+    list: {
+      type: Array,
+      default () {
+        return []
+      }
+    },
+    ISActiveMask: {
+      type: Boolean,
+      default: true
+    },
+    // 当phase的描述为空时，显示的图形颜色。
+    MaskColor: {
+      type: String,
+      default: '#000000'
+    },
+    Draggable: { // 是否开启拖动调整顺序
+      type: Boolean,
+      default: true
+    }
+  },
+  methods: {
+    end () {
+      // 拖动结束后，向父组件发送重新排序后的数据
+      this.$emit('handleSort', this.list)
+    }
+  }
+}
+</script>

package/package/kisscomps/components/CommonKanban/index.js

@@ -0,0 +1,2 @@
+import CommonKanban from './CommonKanban.vue'
+export default CommonKanban

package/package/kisscomps/components/FaultDetailModal/FaultDetailModal.vue

@@ -0,0 +1,170 @@
+/**
+ * Copyright (c) 2020 kedacom
+ * OpenATC is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * http://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ **/
+<template>
+  <div class="dev-fault-detail">
+    <el-dialog
+      :title="$t(`openatccomponents.faultrecord.faultDetail`)"
+      :visible.sync="dialogFormVisible"
+      width="60%"
+      :append-to-body="true"
+      :close-on-click-modal="false">
+    <div class="content">
+      <el-table
+        :data="faultList"
+        style="width: 100%"
+        :height="600"
+        :default-sort = "{prop: 'm_unFaultOccurTime', order: 'descending'}"
+       >
+        <el-table-column
+          prop="m_unFaultOccurTime"
+          :label="$t('openatccomponents.faultrecord.faultOccurtime')"
+          sortable
+          width="200">
+        </el-table-column>
+        <el-table-column
+          prop="m_byFaultBoardType"
+          :formatter="formatterBoardType"
+          :label="$t('openatccomponents.faultrecord.boardCardType')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_wFaultType"
+          :formatter="m_wFaultTypes"
+          :label="$t('openatccomponents.faultrecord.faultMaintype')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_wSubFaultType"
+          :formatter="m_wSubFaultType"
+          :label="$t('openatccomponents.faultrecord.faultSubtype')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_byFaultDescValue"
+          :formatter="m_byFaultDescValue"
+          :label="$t('openatccomponents.faultrecord.faultValue')"
+          sortable>
+        </el-table-column>
+        <el-table-column
+          prop="m_byFaultLevel"
+          :formatter="m_byFaultLevel"
+          :label="$t('openatccomponents.faultrecord.faultGrade')"
+          sortable
+          width="120">
+        </el-table-column>
+        <el-table-column
+          prop="enumerate"
+          :label="$t('openatccomponents.faultrecord.enumerate')"
+          align="center">
+          <template slot-scope="scope">
+            <el-tag v-show="scope.row.enumerate" :type="scope.row.enumerate === '1'?'info':scope.row.enumerate === '2'?'success':scope.row.enumerate === '0'?'':''">{{formatterEnumerate(scope.row)}}</el-tag>
+          </template>
+          </el-table-column>
+        <el-table-column :label="$t('openatccomponents.faultrecord.operation')" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEnumerateCheck(scope.row, '2')">{{$t('openatccomponents.button.confirm')}}</el-button>
+          <el-button type="text" @click="handleEnumerateCheck(scope.row, '1')">{{$t('openatccomponents.button.ignore')}}</el-button>
+        </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {enumerateCheck, GetAllFaultRange} from '../../../api/fault.js'
+import { getMessageByCode } from '../../../utils/responseMessage.js'
+import { formatFaultDescValue, formatBoardType, formatEnumerate, formatSubFaultType, formatFaultLevel, formatFaultTypes } from '../../../utils/fault.js'
+export default {
+  name: 'fault-detail-modal',
+  props: {
+    childTitle: {
+      type: String
+    },
+    agentId: {
+      type: String
+    }
+  },
+  data () {
+    return {
+      dialogFormVisible: false,
+      deviceInfo: {},
+      faultList: []
+    }
+  },
+  methods: {
+    getFaultById () {
+      let param = {
+        agentId: this.agentId,
+        isCurrentFault: true
+      }
+      GetAllFaultRange(param).then(res => {
+        if (res.data.success !== true) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.faultList = res.data.data.content
+      })
+    },
+    onViewFaultClick () {
+      this.dialogFormVisible = !this.dialogFormVisible
+      this.getFaultById()
+    },
+    formatterBoardType (row) {
+      return formatBoardType(row)
+    },
+    m_byFaultDescValue (row) {
+      return formatFaultDescValue(row)
+    },
+    m_wSubFaultType (row) {
+      return formatSubFaultType(row)
+    },
+    m_byFaultLevel (row) {
+      return formatFaultLevel(row)
+    },
+    m_wFaultTypes (row) {
+      return formatFaultTypes(row)
+    },
+    handleEnumerateCheck (row, enumerate) {
+      enumerateCheck(row.agentid, row.m_wFaultID, enumerate).then(res => {
+        if (!res.data.success) {
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale))
+          return
+        }
+        this.dialogFormVisible = false
+        this.$message({
+          message: this.$t('openatccomponents.common.operationsuccess'),
+          type: 'success',
+          duration: 1 * 1000,
+          onClose: () => {
+            this.getFaultById()
+            this.$emit('refreshFault')
+          }
+        })
+      })
+    },
+    formatterEnumerate (row) {
+      return formatEnumerate(row)
+    }
+  }
+}
+</script>
+
+<style lang="scss" rel="stylesheet/scss">
+.dev-update .el-dialog__body {
+  padding: 30px 72px 30px 0;
+}
+.el-dialog__footer {
+  padding: 10px 72px 38px 0;
+}
+</style>

package/package/kisscomps/components/FaultDetailModal/index.js

@@ -0,0 +1,2 @@
+import FaultDetailModal from './FaultDetailModal.vue'
+export default FaultDetailModal