liuqiao 2 年之前
父節點
當前提交
ac78c9fdf1

+ 3 - 0
src/assets/css/theme/00a598/index.css

@@ -188,4 +188,7 @@ background-color: #757070;
     }
     .custom-00a598  .page-content .el-pagination .el-pagination__jump{
       margin-top: 0 !important;
+}
+.custom-00a598  .el-form-item {
+  margin-bottom: 22px;
 }

+ 1 - 1
src/permission.js

@@ -8,7 +8,7 @@ import { Caegw_LogUrl } from '@/settings' // 引入settings.js
 
 NProgress.configure({ showSpinner: false }) // NProgress配置
 
-const whiteList = ['/fail404', '/home','/sso','/login/index','/register/index', '/forget/index', '/protocol/index','/indexLayout/index','/index','/HCFDLab/chart']// 免登录的'白名单
+const whiteList = ['/fail404', '/home','/sso','/login/index','/register/index', '/forget/index', '/protocol/index','/indexLayout/index','/HCFDLab/chart']// 免登录的'白名单
 // 前置路由守卫
 router.beforeEach(async (to, from, next) => {
   NProgress.start() // 开启进度条

+ 1 - 11
src/views/home/openproject/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div class="myproject">
     <div class="title">
-      <span>我的项目</span>
+      <span>公开项目</span>
     </div>
     <div class="btn">
     </div>
@@ -152,8 +152,6 @@ this.init();
           }, 1500)
     },
     rowclinck(row, column, event){
-      console.log(row)
-    //   this.$router.push({path:'/index',query:{pid:row.id}});
     },
 
 
@@ -228,9 +226,6 @@ position:relative;
  box-sizing: border-box; 
  overflow: hidden;
  color: #fff;
-  &:hover{
-
-  }
   .search{
     padding: 0 10px;
   }
@@ -244,11 +239,6 @@ position:relative;
 .input .text{
   flex:1;
 }
-
-//  .el-table, .el-table__expanded-cell{
-//   background-color:#333;
-//  }
- 
 </style>
 <style >
 .scher .el-input__inner{

+ 10 - 1
src/views/index/HCFDLab/echartsHFCD.vue

@@ -1,5 +1,5 @@
 <template>
-<div>
+<div class="X-echats">
  
   <div class="x-bar" v-show="container_show">
     <div id="container"></div>
@@ -13,6 +13,7 @@ import Highcharts from "highcharts"; //必须引入
 import { kgReplace, ugread } from "./Util.js";
 import { options } from 'runjs';
 import { request } from "@/utils/request";
+import { Message, MessageBox } from "element-ui";
 
 export default {
   data() {
@@ -148,6 +149,7 @@ export default {
            request(params)
         .then((res) => {
           console.log(res);
+         
             })
   },
 
@@ -167,6 +169,7 @@ export default {
     // websocket
     getwebsocket() {
      // 初始化weosocket
+      this.$emit('statechange','1');
      this.numlist=[];
      this.option.series=[];
      this.convergeDate.value=[];
@@ -184,6 +187,7 @@ export default {
            this.getlog();
            this.historydata()
             // }
+      
     },
     websocketonerror() {
       //连接建立失败重连
@@ -191,11 +195,13 @@ export default {
     },
     websocketonmessage(e) {
       //数据接收
+
    try{
             const redata = JSON.parse(e.data);
             if(typeof redata==='object'&& redata){
             
               if(redata.type == "log"){
+                    // this.$emit('statechange','1');
                  this.$emit('getthislog',redata.stats+redata.value);
               }
             if (redata.type == "iter") {
@@ -330,4 +336,7 @@ export default {
 // .x-bar{
 //   margin-top: 120px;
 // }
+.x-bar{
+    margin-top: 130px;
+}
 </style>