Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

public/config.js

+var CONFIG = {}
+
+// 页面 title 前缀
+CONFIG.TITLE = '轨道交通后台管理系统'
+
+// 网络请求公用地址
+
+CONFIG.requestPath = 'http://localhost:8046'
+
+// CONFIG.requestPath = 'http://10.20.72.33:8046'
+
+// 文件上传
+CONFIG.urlPath = 'http://10.20.72.33/'
+
+// BIM
+CONFIG.bimPath = 'http://10.20.2.98:8066/'

public/index.html

@@ -11,6 +11,14 @@
   <!-- <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script> -->
 
     <title>城市轨道交通安防系统</title>
+    <script>
+      //禁用所有控制台输出
+      // var console={};
+      // console.log=function(){};
+      // console.warn=function(){};
+      // console.error=function(){};
+    </script>
+    <script src="./config.js"></script>
     <style>
       html, body, #app {
         height: 100%;
@@ -18,7 +26,7 @@
         padding: 0px;
       }
       #app{
-        /* background: url('./image/bg@2x.png') no-repeat fixed center; */
+        /* background: url('./image/bg2x.png') no-repeat fixed center; */
         background-color: #ccc;
       }
       .d2-app-loading-group {

src/App - 副本.vue

-<template>
-  <div id="app">
-    <router-view />
-
-  </div>
-</template>
-
-<script>
-import util from '@/libs/util.js'
-import util from '@/libs/util.js'
-export default {
-  name: 'app',
-  data () {
-    return {
-      LogTimeout: null
-    }
-  },
-  mounted () {
-    //let token = util.cookies.get('token')
-    //this.initWebSocket()
-    // this.setTimeout()
-
-  },
-  destroyed: function () {
-    this.websocketclose()
-  },
-  methods: {
-    //初始化weosocket
-    initWebSocket () {
-      if (typeof WebSocket === 'undefined') {
-        alert('您的浏览器不支持WebSocket')
-        return false
-      }
-      // websocket地址
-      const wsuri = this.$http.adornUrl('').slice(5)
-      const webpath =
-        'ws:' + wsuri.substring(0, wsuri.indexOf(':')) + ':8091/websocket/1001'
-      this.websock = new WebSocket(webpath)
-      this.websock.onopen = this.websocketonopen
-      this.websock.onmessage = this.websocketonmessage
-      this.websock.onerror = this.websocketonerror
-      this.websock.onclose = this.websocketclose
-
-      // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
-      window.onbeforeunload = this.onbeforeunload
-    },
-    //连接成功
-    websocketonopen () {
-      console.log('WebSocket连接成功')
-    },
-    //接收后端返回的数据
-    websocketonmessage (e) {
-      console.log(e + '*****')
-      let dataJson = e.data
-      console.log(dataJson + '*****')
-      // 在这里使用后端返回的数据，对数据进行处理渲染
-    },
-    //连接建立失败重连
-    websocketonerror (e) {
-      console.log(`连接失败的信息：`, e)
-      this.initWebSocket() // 连接失败后尝试重新连接
-    },
-    //关闭连接
-    websocketclose (e) {
-      console.log('断开连接', e)
-    },
-    //设置定时器
-    setTimeout () {
-      if (this.LogTimeout) {
-        this.closeTimeout()
-      }
-      this.LogTimeout = setInterval(this.getDateList, 5000)
-    },
-    // 关闭定时器
-    closeTimeout () {
-      if (this.LogTimeout) {
-        clearInterval(this.LogTimeout)
-      }
-    },
-    getDateList () {
-      console.log('开始定时循环')
-      if (util.cookies.get('token') && util.cookies.get('token') != undefined) {
-        this.$http({
-          url: this.$http.adornUrlAlarm('/alarmsInfo/queryList'),
-          method: 'post',
-          params: this.$http.adornParams({
-            status: 1,
-            stationId: localStorage.getItem('stationId')
-          })
-        }).then(data => {
-          if (data && data.code === 0) {
-            this.dataList = data.list
-
-            console.log('报警弹框')
-            for (var i = 0; i < data.list.length; i++) {
-              if (i === 4) {
-                break
-              }
-              this.$toast({
-                tip: 'tip' + (i + 1),
-                id: data.list[i].id,
-                stationName: '', //站点名
-                tierName: data.list[i].tierName, //站层名
-                resourceName: data.list[i].resourceName, //资源点名
-                occurrenceSite: data.list[i].occurrenceSite, //发生地点
-                level: data.list[i].eventLevel, // 等级
-                times: data.list[i].occurrenceTime, //时间
-                type: data.list[i].eventName, // 类型
-                // explain: data.list[i].explain, //说明
-                // url: data.list[i].url, //图片地址
-                duration: '4900',
-                router: this.$router
-              })
-            }
-            // this.closeTimeout()
-          }
-        })
-      }
-    }
-  }
-}
-</script>
-<style lang="scss">
-@import "~@/assets/style/public-class.scss";
-.d2-layout-header-aside-group
-  .d2-layout-header-aside-content
-  .d2-theme-container
-  .d2-theme-container-main
-  .d2-theme-container-main-body
-  .container-component
-  .d2-container-full
-  .d2-container-full__body {
-  margin-bottom: 50px;
-}
-
-//-- 公共样式--//
-//  page页背景色
-.d2-container-full__body {
-  background-color: #b9c9e3 !important;
-}
-
-// 状态-点
-// .danger,
-// .success,
-// .warning {
-//   width: 5px;
-//   height: 5px;
-//   border-radius: 100%;
-//   background: #ff3723;
-//   display: inline-block;
-//   vertical-align: middle;
-// }
-// .success {
-//   background: #42cd00;
-// }
-// .warning {
-//   background: #ffa101;
-// }
-
-// 弹出框
-.el-dialog__title {
-  line-height: 24px;
-  font-size: 18px;
-  color: #303133;
-  padding-left: 10px;
-}
-.el-dialog__header {
-  border-top: 3px solid #21acfc;
-  padding: 14px 20px 10px !important;
-  background-color: #edeef1;
-  border-bottom: 1px solid #e9e9e9;
-}
-
-// 自定义===============
-// 标题加粗
-.title-bold {
-  font-weight: bold;
-  font-size: 17px;
-}
-// 标题左侧颜色
-.title-left-color {
-  border-left: 5px solid #21acfc;
-  padding-left: 10px;
-}
-
-.treeCard .el-card__header {
-  height: 42px;
-  line-height: 42px;
-  background: #e1edf4;
-  padding: 0 0 0 10px !important;
-}
-.tableCard .el-card__header {
-  height: 42px;
-  line-height: 42px;
-  background: #edeef1;
-  padding: 0 0 0 10px !important;
-}
-
-.tableHeader .el-table__header-wrapper {
-  height: 42px;
-  line-height: 42px;
-  background: #edeef1;
-  padding: 0 0 0 0 !important;
-  transform: translateY(0px);
-}
-.tableHeader .has-gutter {
-  transform: translateY(-12px);
-}
-
-// .elTree{
-// background:#f4f4f4!important;
-// }
-
-// 二级菜单
-.monitor_menu {
-  .menu_item {
-    width: 120px;
-    height: 46px;
-    line-height: 46px;
-    text-align: center;
-    color: #ccc;
-    box-shadow: 0px 0 2px #000 !important;
-    background-image: linear-gradient(to top, #335274, #4d759a) !important;
-    text-shadow: 0px 2px 1px rgba(0, 0, 0, 0.3) !important;
-  }
-  .is-active {
-    color: #fff !important;
-    background: linear-gradient(
-      0deg,
-      rgba(33, 172, 252, 1),
-      rgba(48, 136, 193, 1)
-    ) !important;
-  }
-  ul {
-    a:nth-child(1) {
-      li {
-        border-radius: 9px 0 0 9px !important;
-      }
-    }
-    a:last-child {
-      li {
-        border-radius: 0 9px 9px 0 !important;
-      }
-    }
-  }
-}
-
-//-- 公共样式--//
-</style>

src/assets/style/theme/d2/setting.scss

@@ -4,6 +4,17 @@ $theme-name: 'd2';
 $theme-bg-color: #ebf1f6;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, 0);
+// 主题头部背景颜色
+$theme-bg-color-header: #32a5ea;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: #2d3a4b;
+$theme-font-color-mfooter: #FFFFFF;
+//主体el-button背景色
+$theme-bg-color-el-button:  #32a5ea;
+$theme-font-color-el-button: #FFFFFF;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: #32a5ea;
+$theme-font-color-el-button-active: #FFFFFF;
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);
@@ -25,17 +36,17 @@ $theme-menu-item-color-hover: #293849;
 $theme-menu-item-background-color-hover: #ecf5ff;
 
 // 顶栏上的文字颜色
-$theme-header-item-color: $color-text-normal;
+$theme-header-item-color: rgba(#fff,.7);
 $theme-header-item-background-color: transparent;
 // 顶栏上的项目在 hover 时
-$theme-header-item-color-hover: #2f74ff;
-$theme-header-item-background-color-hover: rgba(#FFF, .5);
+$theme-header-item-color-hover: rgba(#fff,.7);
+$theme-header-item-background-color-hover:transparent;
 // 顶栏上的项目在 focus 时
-$theme-header-item-color-focus: #2f74ff;
-$theme-header-item-background-color-focus: rgba(#FFF, .5);
+$theme-header-item-color-focus: rgba(#fff,.7);
+$theme-header-item-background-color-focus: transparent;
 // 顶栏上的项目在 active 时
-$theme-header-item-color-active: #2f74ff;
-$theme-header-item-background-color-active: rgba(#FFF, .5);
+$theme-header-item-color-active: rgba(#fff,.9);
+$theme-header-item-background-color-active: transparent;
 
 // 侧边栏上的文字颜色
 $theme-aside-item-color: $color-text-normal;

src/assets/style/theme/line/setting.scss

@@ -4,6 +4,17 @@ $theme-name: 'line';
 $theme-bg-color: #f8f8f9;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, 0);
+// 主题头部背景颜色
+$theme-bg-color-header: $color-text-normal;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: $color-text-normal;
+$theme-font-color-mfooter: #FFFFFF;
+//主体el-button背景色
+$theme-bg-color-el-button:  $color-text-normal;
+$theme-font-color-el-button: #FFFFFF;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: $color-text-normal;
+$theme-font-color-el-button-active: #FFFFFF;
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .8);

src/assets/style/theme/register.scss

@@ -2,10 +2,10 @@
 @import '~@/assets/style/theme/theme-base.scss';
 
 
-@import '~@/assets/style/theme/tx1/index.scss';
-@import '~@/assets/style/theme/tx2/index.scss';
+// @import '~@/assets/style/theme/tx1/index.scss';
+// @import '~@/assets/style/theme/tx2/index.scss';
 @import '~@/assets/style/theme/d2/index.scss';
-@import '~@/assets/style/theme/line/index.scss';
+// @import '~@/assets/style/theme/line/index.scss';
 @import '~@/assets/style/theme/star/index.scss';
 @import '~@/assets/style/theme/tomorrow-night-blue/index.scss';
 @import '~@/assets/style/theme/violet/index.scss';
\ No newline at end of file

src/assets/style/theme/star/setting.scss

@@ -4,6 +4,17 @@ $theme-name: 'star';
 $theme-bg-color: #EFF4F8;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, .3);
+// 主题头部背景颜色
+$theme-bg-color-header: $color-text-normal;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: #606266;
+$theme-font-color-mfooter: #FFFFFF;
+//主体el-button背景色
+$theme-bg-color-el-button:  $color-text-normal;
+$theme-font-color-el-button: #FFFFFF;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: #606266;
+$theme-font-color-el-button-active: #FFFFFF;
 
 // container组件
 $theme-container-background-color: rgba(#FFF, .9);
@@ -25,17 +36,17 @@ $theme-menu-item-color-hover: #293849;
 $theme-menu-item-background-color-hover: #ecf5ff;
 
 // 顶栏上的文字颜色
-$theme-header-item-color: #FFF;
+$theme-header-item-color: rgba(#606266,.8);
 $theme-header-item-background-color: transparent;
 // 顶栏上的项目在 hover 时
-$theme-header-item-color-hover: #FFF;
-$theme-header-item-background-color-hover: rgba(rgb(78, 97, 204), .2);
+$theme-header-item-color-hover: rgba(#FFF,.7);
+$theme-header-item-background-color-hover: transparent;
 // 顶栏上的项目在 focus 时
-$theme-header-item-color-focus: #FFF;
-$theme-header-item-background-color-focus: rgba(rgb(78, 97, 204), .2);
+$theme-header-item-color-focus: rgba(#FFF,.7);
+$theme-header-item-background-color-focus: transparent;
 // 顶栏上的项目在 active 时
-$theme-header-item-color-active: #FFF;
-$theme-header-item-background-color-active: rgba(rgb(78, 97, 204), .2);
+$theme-header-item-color-active: rgba(#FFF,.7);
+$theme-header-item-background-color-active: transparent;
 
 // 侧边栏上的文字颜色
 $theme-aside-item-color: #FFF;

src/assets/style/theme/tomorrow-night-blue/setting.scss

 // 主题名称
 $theme-name: 'tomorrow-night-blue';
 // 主题背景颜色
-$theme-bg-color: #002253;
+$theme-bg-color: #FF929A;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, 0);
+// 主题头部背景颜色
+$theme-bg-color-header: #FF929A;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: #FF929A;
+$theme-font-color-mfooter: #b52222;
+//主体el-button背景色
+$theme-bg-color-el-button:  #FF929A;
+$theme-font-color-el-button: #b52222;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: #FF929A;
+$theme-font-color-el-button-active: #b52222;
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);
@@ -28,14 +39,14 @@ $theme-menu-item-background-color-hover: #ecf5ff;
 $theme-header-item-color: #FF929A;
 $theme-header-item-background-color: transparent;
 // 顶栏上的项目在 hover 时
-$theme-header-item-color-hover: #FFEBA4;
-$theme-header-item-background-color-hover: rgba(#FFF, .05);
+$theme-header-item-color-hover: #FFB870;
+$theme-header-item-background-color-hover: transparent;
 // 顶栏上的项目在 focus 时
 $theme-header-item-color-focus: #FFB870;
-$theme-header-item-background-color-focus: rgba(#FFF, .05);
+$theme-header-item-background-color-focus:transparent;
 // 顶栏上的项目在 active 时
-$theme-header-item-color-active: #FFB870;
-$theme-header-item-background-color-active: rgba(#FFF, .05);
+$theme-header-item-color-active: #FFB870 ;
+$theme-header-item-background-color-active: transparent;
 
 // 侧边栏上的文字颜色
 $theme-aside-item-color: #FF929A;

src/assets/style/theme/tx1/setting.scss

@@ -4,6 +4,17 @@ $theme-name: 'tx1';
 $theme-bg-color: #ebf1f6;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, 0);
+// 主题头部背景颜色
+$theme-bg-color-header: #2f74ff;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: #2f74ff;
+$theme-font-color-mfooter: #FFFFFF;
+//主体el-button背景色
+$theme-bg-color-el-button:  #2f74ff;
+$theme-font-color-el-button: #FFFFFF;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: #2f74ff;
+$theme-font-color-el-button-active: #FFFFFF;
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);

src/assets/style/theme/tx2/setting.scss

@@ -4,6 +4,17 @@ $theme-name: 'tx2';
 $theme-bg-color: #ebf1f6;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, 0);
+// 主题头部背景颜色
+$theme-bg-color-header: #2f74ff;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: #2f74ff;
+$theme-font-color-mfooter: #FFFFFF;
+//主体el-button背景色
+$theme-bg-color-el-button:  #2f74ff;
+$theme-font-color-el-button: #FFFFFF;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: #2f74ff;
+$theme-font-color-el-button-active: #FFFFFF;
 
 // container组件
 $theme-container-background-color: rgba(#FFF, 1);

src/assets/style/theme/violet/setting.scss

@@ -4,6 +4,17 @@ $theme-name: 'violet';
 $theme-bg-color: #000;
 // 主题背景图片遮罩
 $theme-bg-mask: rgba(#000, 0);
+// 主题头部背景颜色
+$theme-bg-color-header: #8C40E2;
+// 主题底部背景颜色
+$theme-bg-color-mfooter: #8C40E2;
+$theme-font-color-mfooter: #FFFFFF;
+//主体el-button背景色
+$theme-bg-color-el-button:  #8C40E2;
+$theme-font-color-el-button: #FFFFFF;
+//主体el-button选中背景色
+$theme-bg-color-el-button-active: #8C40E2;
+$theme-font-color-el-button-active: #FFFFFF;
 
 // container组件
 $theme-container-background-color: #FFF;
@@ -25,17 +36,17 @@ $theme-menu-item-color-hover: #293849;
 $theme-menu-item-background-color-hover: #ecf5ff;
 
 // 顶栏上的文字颜色
-$theme-header-item-color: #FFF;
+$theme-header-item-color: rgba(#8C40E2,.7);
 $theme-header-item-background-color: transparent;
 // 顶栏上的项目在 hover 时
-$theme-header-item-color-hover: #FFF;
-$theme-header-item-background-color-hover: linear-gradient(-180deg, rgba(255,255,255,0.18) 0%, rgba(255,255,255,0.12) 100%);
+$theme-header-item-color-hover: rgba(#8C40E2,.7);
+$theme-header-item-background-color-hover: transparent;
 // 顶栏上的项目在 focus 时
-$theme-header-item-color-focus: #FFF;
-$theme-header-item-background-color-focus: linear-gradient(-180deg, rgba(255,255,255,0.18) 0%, rgba(255,255,255,0.12) 100%);
+$theme-header-item-color-focus: rgba(#8C40E2,.7);
+$theme-header-item-background-color-focus: transparent;
 // 顶栏上的项目在 active 时
-$theme-header-item-color-active: #FFF;
-$theme-header-item-background-color-active: linear-gradient(-180deg, rgba(255,255,255,0.18) 0%, rgba(255,255,255,0.12) 100%);
+$theme-header-item-color-active: rgba(#8C40E2,1);
+$theme-header-item-background-color-active: transparent;
 
 // 侧边栏上的文字颜色
 $theme-aside-item-color: #FFF;

src/components/d2-highlight/styles/androidstudio.css

 /*
 Date: 24 Fev 2015
-Author: Pedro Oliveira <kanytu@gmail . com>
+Author: Pedro Oliveira 
 */
 
 .hljs {

src/components/d2-highlight/styles/arta.css

 /*
 Date: 17.V.2011
-Author: pumbur <pumbur@pumbur.net>
+Author: pumbur 
 */
 
 .hljs {

src/components/d2-highlight/styles/dracula.css

@@ -9,8 +9,8 @@ Copyright 2015, All rights reserved
 Code licensed under the MIT license
 http://zenorocha.mit-license.org
 
-@author Éverton Ribeiro <nuxlli@gmail.com>
-@author Zeno Rocha <hi@zenorocha.com>
+@author Éverton Ribeiro
+@author Zeno Rocha 
 
 */
 

src/components/d2-highlight/styles/foundation.css

 /*
 Description: Foundation 4 docs style for highlight.js
-Author: Dan Allen <dan.j.allen@gmail.com>
+Author: Dan Allen 
 Website: http://foundation.zurb.com/docs/
 Version: 1.0
 Date: 2013-04-02

src/components/d2-highlight/styles/magula.css

 /*
 Description: Magula style for highligh.js
-Author: Ruslan Keba <rukeba@gmail.com>
+Author: Ruslan Keba 
 Website: http://rukeba.com/
 Version: 1.0
 Date: 2009-01-03

src/components/d2-highlight/styles/purebasic.css

@@ -2,7 +2,7 @@
 
 PureBASIC native IDE style ( version 1.0 - April 2016 )
 
-by Tristano Ajmone <tajmone@gmail.com>
+by Tristano Ajmone 
 
 Public Domain
 

src/components/d2-highlight/styles/school-book.css

 /*
 
-School Book style from goldblog.com.ua (c) Zaripov Yura <yur4ik7@ukr.net>
+School Book style from goldblog.com.ua (c) Zaripov Yura 
 
 */
 

src/components/d2-highlight/styles/solarized-dark.css

 /*
 
-Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull 
 
 */
 

src/components/d2-highlight/styles/solarized-light.css

 /*
 
-Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull 
 
 */
 

src/components/d2-highlight/styles/vs2015.css

 /*
  * Visual Studio 2015 dark style
- * Author: Nicolas LLOBERA <nllobera@gmail.com>
+ * Author: Nicolas LLOBERA  
  */
 
 .hljs {

src/components/d2-highlight/styles/xcode.css

 /*
 
-XCode style (c) Angel Garcia <angelgarcia.mail@gmail.com>
+XCode style (c) Angel Garcia 
 
 */
 

src/components/d2-page-cover/index.vue

@@ -9,7 +9,7 @@
     <!--<a target="blank" href="https://github.com/d2-projects/d2-admin">-->
       <!--<img-->
         <!--style="position: absolute; top: 0; right: 0; border: 0; width: 150px;"-->
-        <!--src="./image/darkblue@2x.png"-->
+        <!--src="./image/darkblue2x.png"-->
         <!--alt="Fork me on GitHub">-->
     <!--</a>-->
   </div>

src/layout/header-aside/components/bim/index.vue

+<template>
+            <div v-if='isShow' class="map_right"> 
+              <iframe :src="src" ref="iframe"></iframe>
+            </div>
+</template>
+
+<script>
+import { mapState, mapGetters, mapActions } from 'vuex'
+
+    export default {
+        data() {
+            return {
+                code:'',
+                src: window.CONFIG.bimPath,
+                
+            }
+        },
+        computed: {
+            ...mapState('d2admin/bjCode', ['resourceCode']),
+            ...mapState('d2admin/bim', ['isShow'])
+        },
+        watch: {
+            resourceCode(val) {
+            console.log('resourceCode:', val)
+            if (this.transformationSta == 2) {
+                this.sendBjMessage(val.substring(0, val.indexOf('+')))
+            }
+            }
+  },
+        mounted() {
+            this.code = this.resourceCode
+            console.log(this.isShow,'111111111111')
+
+        //   this.sendMessage()
+        },
+        methods: {
+                sendMessage(code) {
+                    console.log(111)
+                    setTimeout(() => {
+                        if (!this.$refs.iframe) {
+                        return
+                        }
+                        this.$refs.iframe.contentWindow.postMessage(
+                        {
+                            func: 'locateByCode',
+                            data: {
+                                code: code
+                            }
+                        },
+                        this.src
+                        )
+                    }, 1000)
+                    },
+                    sendBjMessage(code) {
+                        console.log('********' + code)
+                        setTimeout(() => {
+                            if (!this.$refs.iframe) {
+                            return
+                            }
+                            this.$refs.iframe.contentWindow.postMessage({
+                            func: 'alarm',
+                            data: {
+                                code: code
+                                }
+                            }, this.src)
+                        }, 1000)
+                    },
+        },  
+    }
+</script>
+
+<style lang="scss" scoped>
+
+    iframe {
+      width: 1580px;
+      height: 770px;
+      position:absolute;
+      top:50px;
+      right:0;
+      z-index:99;
+    }
+</style>
\ No newline at end of file

src/layout/header-aside/components/header-theme/components/d2-theme-list/index.vue

@@ -5,7 +5,8 @@
       <div
         slot-scope="scope"
         class="theme-preview"
-        :style="{'backgroundImage': `url(${$baseUrl}${scope.row.preview})`}">
+        :style="{'background': `${scope.row.preview}`}">
+        <!-- :style="{'backgroundImage': `url(${$baseUrl}${scope.row.preview})`}"> -->
       </div>
     </el-table-column>
     <el-table-column prop="address" align="center">

src/layout/header-aside/components/header-theme/index.vue

@@ -9,6 +9,9 @@
       <img src="../../imgs/star.png" />
     </div>  
     <el-dialog title="主题" width="600px" :visible.sync="dialogVisible" :append-to-body="true">
+      <div slot='title'>
+        <span class="title-bold">主题</span>
+      </div>
       <d2-theme-list style="margin-top: -25px;"/>
     </el-dialog>
   </div>

src/layout/header-aside/components/header-user/index.vue

@@ -109,7 +109,7 @@ export default {
       })
     },
     inputMe(e) {
-      return e.replace(/[<>！?:"：？@!,.;']/g, '')
+      return e.replace(/[<>#?:"：？@,.;']/g, '')
     },
     editPasword() {
       this.editPaswDialog = true
@@ -140,7 +140,7 @@ export default {
                   this.editPaswDialog = false
                 }
               })
-            } else { this.$message.error(data.msg) }
+            }
           })
         }
       })

src/layout/header-aside/components/menu-header/index.vue

@@ -3,7 +3,7 @@
   <div v-if="true" class="d2-theme-header-menu" ref="page"  flex="cross:center">
     <div  class="d2-theme-header-menu__content m-theme-header-menu__content" ref="content" flex-box="1"  >
       <div  class="d2-theme-header-menu__scroll" ref="scroll" flex-box="0" :style="'transform: translateX(' + currentTranslateX + 'px);'">
-        <el-menu mode="horizontal" :default-active="active" @select="handleMenuSelect" active-text-color='#cccccc'>
+        <el-menu mode="horizontal" :default-active="active" @select="handleMenuSelect" active-text-color=''>
           <template v-for="(menu, menuIndex) in header">
             <d2-layout-header-aside-menu-item class="menu-item" :menu="menu" :key="menuIndex"/>
             <!-- <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/> -->

src/main.js

@@ -106,7 +106,7 @@ new Vue({
     // this.$store.commit('d2admin/menu/headerSet', menuHeader)
     // // 初始化菜单搜索功能
     // this.$store.commit('d2admin/search/init', menuHeader)
-    const pattern = /[_`~^*|{}<>￥……*|&‘”“/#（）【】《》()——\\[\]$%+=]/ //这些字段不允许输入
+    const pattern = /[`~^*|{}<>￥……*|&‘”“/#【】《》\\[\]$%+=]/ //这些字段不允许输入
     const testMark = function (s) {
       return pattern.test(s)
     }
@@ -122,7 +122,7 @@ new Vue({
       }
       return rs
     }
-  
+
     const timeReplaceMark = function (obj) {
       if (testMark(obj.value)) {
         obj.value = replaceMark(obj.value, true)
@@ -143,15 +143,15 @@ new Vue({
       if (ev.target.type === 'text' || ev.target.type === 'textarea') {
         timeReplaceMark(ev.target)
       }
-    },true)
+    }, true)
   },
-  beforeDestroy(){
+  beforeDestroy() {
     window.removeEventListener('input', function (ev) {
       // console.log(ev);
       if (ev.target.type === 'text' || ev.target.type === 'textarea') {
         timeReplaceMark(ev.target)
       }
-    },true)
+    }, true)
   },
   mounted () {
     // 展示系统信息

src/menu/index.js

@@ -10,32 +10,10 @@ import demoElement from './modules/demo-element'
 // import demoPlayground from './modules/demo-playground'
 // 示例
 // import demoBusiness from './modules/demo-business'
-
-// 角色与权限
- import sysUser from './modules/sys-user'
-//  系统设置
-import sysSetting from './modules/sys-setting'
-
-// 系统管理
-import sysManage from './modules/sys-manage'
-// 运营管理
-import oprManage from './modules/opr-manage'
-// 财务管理
-import fnManage from './modules/fn-manage'
-// 退款管理
-import refundManage from './modules/fn-refundManage'
-// 会员管理
-import mbManage from './modules/mb-manage'
-// 竞赛管理
-import ctManage from './modules/ct-manage'
-import clubManage from './modules/ct-clubManage'
 // CRUD
 import demoD2Crud from './modules/demo-d2-crud'
 // 第三方网页
 import demoFrame from './modules/demo-frame'
-//import { newExpression } from 'babel-types'
-import newsManage from './modules/news-manage'
-import msgManage from './modules/msg-manage'
 
 // 菜单 侧边栏
 export const menuAside = [
@@ -46,29 +24,12 @@ export const menuAside = [
   // demoPlayground,// 功能
   // demoBusiness,// 事例
   demoD2Crud,
-  demoFrame,
-  mbManage, // 会员管理
-  ctManage, //竞赛管理
-  clubManage, //俱乐部管理
-  fnManage, //财务管理
-  msgManage, //消息中心
-  refundManage, //退款管理
-  oprManage, //运营管理
-  sysManage, // 系统管理
-  // sysUser,
-  sysSetting,
-  newsManage
+  demoFrame
 ]
 
 // 菜单 顶栏
 export const menuHeader = [
     { title: '首页', path: '/index' },
-    { title: '竞赛管理', path: '/ct/competition/level' },
-    { title: '会员管理', path: '/mb/member' },
-    { title: '运营管理', path: '/operation/place' },
-    { title: '资讯管理', path: '/news/list' },
-    { title: '财务管理', path: '/finance/competitionOrder/classification' },
-    { title: '消息中心', path: '/msg/manage' },
     { title: '系统管理', path: '/sys/org' }
     // { path: '/sys/setting/code', title: '代码生成', icon: 'globe' }
  ]

src/pages/access/index.vue

-<template>
-  <div>
-    <menu-component class="monitor_menu" :menuList="list" :active="active"></menu-component>
-  </div>
-</template>
-<script>
-import menuComponent from '../components/menu-component'
-import { mapState } from 'vuex'
-export default {
-  data() {
-    return {
-        list: [],
-        active: ''
-    }
-  },
-  components: {
-    menuComponent
-  },
-  computed: {
-    ...mapState('d2admin/menu', [
-      'header'
-    ])
-  },
-  watch: {
-    '$route.matched': {
-      handler (val) {
-        this.$nextTick(()=>{
-          this.active=''
-          this.active = val[1].path
-        })
-      },
-      immediate: true
-    }
-  },
-  created () {
-    this.header.forEach(res => {
-      if (res.path === '/access') {
-        this.list = res.list;
-        this.active=this.$route.path
-
-        // this.active = res.list[0].path;
-        // this.$router.push({
-        //   path: res.list[0].path,
-        // })
-      }
-    })
-  }
-}
-</script>

src/pages/access/instructions/query-detail.vue

-<template lang="pug">
-  <div class='m_i_dialog'>
-    <el-dialog title="详情" width="1100px" :close-on-click-modal='false' :visible.sync='visible' :modal-append-to-body='false'>
-      .title-bold(slot='title') 指令详情
-      <div style="height:430px;">
-        <div class="m_i_dialog_lift">
-          <div class="header_title">基本信息</div>
-          <el-form :model='dataForm'  ref='dataForm' :inline='true'  label-width="100px">
-            <el-form-item label='指令ID:' prop='port'>
-              <el-input size="medium" v-model='dataForm.instruction' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='资源点名称:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.resourceName' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='资源点编码:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.code' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='资源点类型:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.type' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='资源点状态:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.status' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='IP-PORT:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.addressCode+":"+dataForm.port' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='线路站点:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.lineStationName' readonly></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="m_i_dialog_right">
-          <div class="header_title">运行信息</div>
-          <el-form :model='dataForm' ref='dataForm' :inline='true'  label-width="100px" style='padding-left: 20px;'>
-            <el-form-item label='子系统:' prop='port'>
-              <el-input size="medium" v-model='dataForm.subSystem' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='执行人:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.createUser' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='执行完成时间:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.createTime' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='执行结果:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.result' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='告警等级:' prop='port'>
-              <el-input v-if="!dataForm.eventLevel" value="" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.eventLevel==1" value="特别重大" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.eventLevel==2" value="重大" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.eventLevel==3" value="一般" size="medium" readonly></el-input>
-            </el-form-item>
-            <el-form-item label='故障等级:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.xx' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='触发方式:' prop='port'>
-              <el-input v-if="dataForm.createUser!='系统'" value="手动" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.createUser=='系统'" value="自动" size="medium" readonly></el-input>
-            </el-form-item>
-            <el-form-item label='指令来源:' prop='port'>
-              <el-input v-if="!dataForm.source || dataForm.source==1" value="手动操作" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.source==2" value="系统联动" size="medium" readonly></el-input>
-              <el-input v-if="dataForm.source==3" value="预案执行" size="medium" readonly></el-input>
-            </el-form-item>
-            <el-form-item label='部署位置:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.deployLocation' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='附属信息:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.attachedInfo' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='动作编号:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.xx' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='动作名称:' prop='port'>
-              <el-input  size="medium" v-model='dataForm.actionName' readonly></el-input>
-            </el-form-item>
-            <el-form-item label='动作参数:' prop='port'>
-              <el-input type="textarea" resize="none" readonly v-model="paramStr"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <span class="dialog-footer" slot='footer'>
-        <el-button type="primary" @click='visible = false'>关闭</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-export default {
-  computed: {
-    ...mapState('d2admin/user', [
-      'info'
-    ])
-  },
-  data () {
-    return {
-      visible: false,
-      paramStr: '',
-      dataForm: {
-      }
-    }
-  },
-  created() {
-      this.dataForm = {
-      }
-  },
-  methods: {
-    init (res) {
-      // console.log(res)
-     this.visible = true
-
-     this.$http({
-        url: this.$http.adornUrlEq(`/orGate/getId`),
-        method: 'get',
-        params: { id: res.id,
-                source: res.source,
-                stationId: res.stationId
-                }
-      }).then(data => {
-        if (data && data.code === 0) {
-          this.dataForm = data.bean
-          this.dataForm.status == 1 ? this.dataForm.status = '正常' : this.dataForm.status = '不可用'
-          this.dataForm.result == 1 ? this.dataForm.result = '成功' : this.dataForm.result = '失败'
-          this.paramStr = ''.concat((this.dataForm.paramsName1 ? this.dataForm.paramsName1 : ''), (this.dataForm.paramsValue1 ? this.dataForm.paramsValue1 : ''), (this.dataForm.paramsName2 ? ',' + this.dataForm.paramsName2 : ''), (this.dataForm.paramsValue2 ? this.dataForm.paramsValue2 : ''))
-        }
-      })
-    }
-  }
-}
-</script>
-<style lang='scss' scoped>
-  .m_i_dialog_lift{
-    width:364px;
-    height:450px;
-    background:rgba(255,255,255,1);
-    border:1px solid rgba(23, 41, 71, 0.08);
-
-    float: left;
-    box-shadow:0px 2px 8px 0px rgba(0, 0, 0, 0.2);
-    .header_title{
-      height: 40px; width: 344px; background: #EEF8FF; line-height: 40px; padding-left: 20px; font-family:Microsoft YaHei; font-weight:bold; margin-bottom: 10px;
-    }
-    .el-form-item{
-      margin: 10px 0 0 0 ;
-    }
-  }
-  .m_i_dialog_right{
-    width:670px;
-    height:450px;
-    float: left;
-    background:rgba(255,255,255,1);
-    border:1px solid rgba(23, 41, 71, 0.08);
-    margin-left: 20px;
-    box-shadow:0px 2px 8px 0px rgba(0, 0, 0, 0.2);
-    .header_title{
-      height: 40px; width: 650px; background: #EEF8FF; line-height: 40px; padding-left: 20px; font-family:Microsoft YaHei; font-weight:bold; margin-bottom: 10px;
-    }
-    .el-form-item{
-      margin: 10px 0 0 0 ;
-    }
-    .el-textarea{
-      width: 267%;
-    }
-  }
-</style>

src/pages/alarms/index.vue

-<template>
-  <div>
-    <menu-component class="monitor_menu" :menuList="list" :active="active"></menu-component>
-  </div>
-</template>
-<script>
-import menuComponent from '../components/menu-component'
-import { mapState } from 'vuex'
-export default {
-  data() {
-    return {
-        list: [],
-        active: ''
-    }
-  },
-  components: {
-    menuComponent
-  },
-  computed: {
-    ...mapState('d2admin/menu', [
-      'header'
-    ])
-  },
-  created () {
-    this.header.forEach(res => {
-      if (res.path === '/alarms') {
-        this.list = res.list
-        this.active = res.list[0].path
-        this.$router.push({
-          path: res.list[0].path
-        })
-      }
-    })
-  }
-}
-</script>

src/pages/alarms/processed/history-video-info.vue

-<template lang="pug">
-    el-dialog.my_dialog(:close-on-click-modal='false' :visible.sync='visible' append-to-body width='60%' :before-close='handleClose' :destroy-on-close='true')
-        div.title-bold(slot='title') 历史视频
-        el-row()
-            div(v-if='videoList.length === 0' style='height:500px;display:flex')
-                font(style='margin:auto;font-size:27px') 暂无视频
-            el-col(v-else :span="(index === 0 && videoList.length === 1) || index ===2  ? 24 : 12" v-for="(item, index) in videoList" :key="index")
-                el-card(:body-style="{ padding: '0px' }")
-                    div(slot="header" align='center' class='my_dialog_header')
-                        font() {{item.name}}
-                    video( style="width:100%" :src="item.path" :id="item.id" autoplay loop controls muted="true")
-</template>
-
-<script>
-    export default {
-        name: 'history-video-info',
-        data() {
-            return {
-                visible: false,
-                videoList: [
-                    // {
-                    //     id: 1,
-                    //     src: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4',
-                    //     name: 'ceshi1'
-                    // },
-                    // {
-                    //     id: 2,
-                    //     src: 'http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4',
-                    //     name: 'ceshi2'
-                    // },
-                    // {
-                    //     id: 3,
-                    //     src: 'https://media.w3.org/2010/05/sintel/trailer.mp4',
-                    //     name: 'ceshi3'
-                    // }
-                ]
-            }
-        },
-        methods: {
-            init(row) {
-                this.visible = true
-                // console.log(row)
-                this.initData(row.id)
-            },
-            initData(id) {
-                console.log(id)
-                this.$http({
-                    url: this.$http.adornUrlAlarm('/alarmsInfo/getHistoryVideInfo'),
-                    method: 'get',
-                    params: { id: id }
-                }).then(data => {
-                    if (data && data.code === 0) {
-                        this.videoList = data.list
-                    }
-                })
-            },
-            //关闭页面前调用
-            handleClose() {
-                this.visible = false
-                //关闭视频
-                this.videoList.map(item => {
-                    var vide = document.getElementById(item.id)
-                    if (vide.paused) {
-                        // vide.play()
-                    } else if (vide.play()) {
-                        vide.pause()
-                    }
-                })
-                this.videoList = []
-            }
-        }
-    }
-</script>
-
-<style scoped>
-    .title-bold {
-        font-weight: bold;
-        font-size: 17px;
-    }
-
-    .my_dialog >>> .el-dialog__body {
-        padding: 0px;
-    }
-
-    .my_dialog >>> .el-card__header {
-        padding: 8px 0px;
-    }
-</style>

src/pages/components/menu-component.vue

@@ -76,8 +76,8 @@
 
 </style>
 <style>
-    .theme-tx1 .el-menu--horizontal .menu_item:not(.is-disabled):hover {
+    /* .theme-tx1 .el-menu--horizontal .menu_item:not(.is-disabled):hover {
         color: #fff;
         background: #2999dd;
-    }
+    } */
 </style>

src/pages/css/opr3dot.css

@@ -17,7 +17,11 @@
   height: 40px;
   line-height: 40px;
 }
-.theme-tx1 .el-submenu__title:hover {
+/* .theme-tx1 .el-submenu__title:hover {
+  color: #293849;
+  background: #f5f7fa !important;
+} */
+ .el-submenu__title:hover {
   color: #293849;
   background: #f5f7fa !important;
 }

src/pages/demo/playground/env/index.vue

@@ -13,7 +13,7 @@ export default {
     return {
       env: process.env.NODE_ENV,
       baseUrl: process.env.BASE_URL,
-      title: process.env.VUE_APP_TITLE
+      title: window.CONFIG.TITLE
     }
   }
 }