5.26最后上传

src/assets/css/theme/0000ff/index.css

@@ -24,4 +24,7 @@
     background: #8883a5;
     border-color: #8883a5;
     color: #fff;
+  }
+  .custom-0000ff  .input{
+    border: 1px solid  #8883a5; 
   }

src/assets/css/theme/00a597/index.css

@@ -30,4 +30,6 @@
   .custom-00a597  .tabsel{
     border-bottom:1px solid  #d1e5e5;
   }
-  
+  .custom-00a597  .input{
+    border: 1px solid  #00a597; 
+  }

src/assets/css/theme/00a598/index.css

@@ -32,8 +32,6 @@ background-color: #757070;
 /* 表格 */
 .custom-00a598 .el-table td, .el-table th.is-leaf{
     color: #d5d5d5;
- 
-   
   }
   .custom-00a598 .el-table th{
     background-color:#333;
@@ -44,6 +42,9 @@ background-color: #757070;
    .custom-00a598 .el-table td, .el-table th.is-leaf{
  border-bottom: 1px solid #666;
  }
+ .custom-00a598 .el-table td,  .custom-00a598 .el-table th.is-leaf{
+  border-bottom: 1px solid #666
+ }
  .custom-00a598 .el-table--enable-row-hover .el-table__body tr:hover>td{
  background-color: #666 !important;
  }
@@ -56,6 +57,9 @@ background-color: #757070;
    color: #b6b6b6;
    border: 1px solid #757070;
  }
+ .custom-00a598 .el-table--border::after, .el-table--group::after, .el-table::before{
+  background-color: #535353;
+ }
  .custom-00a598 .newfile .el-radio{
    color: #333 !important;
  }
@@ -167,11 +171,19 @@ background-color: #757070;
     }
 .custom-00a598 .el-button--primary{
   background-color: #535353;
-  border-color: #fff;
+  border-color: #535353;
+  color:#fff;
 }
 .custom-00a598 .real .real-content .status{
   color: #d5d5d5 !important;
 }
     /* .el-tabs{
     border-bottom: 1px solid #666;
-    } */
+    } */
+    .custom-00a598  .textselsect {
+      margin-top: 5px;
+    }
+    .custom-00a598  .input{
+      border: 1px solid  #535353; 
+    }
+  

src/assets/css/theme/20a0ff/index.css

@@ -19,4 +19,7 @@
   }
   .custom-20a0ff  .tabsel{
     border-bottom:1px solid  #d1dbe5;
+  }
+  .custom-20a0ff  .input{
+    border: 1px solid  #20a0ff; 
   }

src/assets/css/theme/fa4f52/index.css

@@ -21,4 +21,7 @@
   }
   .custom-fa4f52 .tabsel{
     border-bottom:1px solid  #e5d3d1;
+  }
+  .custom-fa4f52  .input{
+    border: 1px solid  #fa4f52; 
   }

src/assets/css/theme/ff0000/index.css

@@ -6,4 +6,6 @@
   .custom-0000ff .tabsel{
     border-bottom:1px solid  #d3d1e5;
   }
-  
+  .custom-0000ff  .input{
+    border: 1px solid  #0000ff; 
+  }

src/layout/index.vue

@@ -29,8 +29,8 @@
          <div class="headericon">
             <ul>
               
-              <li  class="text_color"><el-tooltip class="item" effect="dark" content="任务" placement="bottom"><i class="el-icon-s-fold"></i>  </el-tooltip> </li> 
-              <li class="text_color"><el-tooltip class="item" effect="dark" content="团队" placement="bottom"><i class="el-icon-s-custom"></i>  </el-tooltip></li>
+              <!-- <li  class="text_color"><el-tooltip class="item" effect="dark" content="任务" placement="bottom"><i class="el-icon-s-fold"></i>  </el-tooltip> </li> 
+              <li class="text_color"><el-tooltip class="item" effect="dark" content="团队" placement="bottom"><i class="el-icon-s-custom"></i>  </el-tooltip></li> -->
               <!-- <li class="text_color" @click="dialogsystem=true"><i class="el-icon-s-tools"></i></li> -->
             
                <!-- <el-tooltip class="item" effect="dark" content="主题切换" placement="bottom"> 主题切换 </el-tooltip> -->
@@ -46,11 +46,11 @@
                   inactive-value="0">
                 </el-switch>
               </el-tooltip> -->
-              <li class="text_color">
+              <!-- <li class="text_color">
                 <span >  <i class="el-icon-question" style="padding:1px 0"></i>
                 <i style="font-size:12px;padding:5px 0" class="el-icon-arrow-down"></i>
                 </span>
-                </li>
+                </li> -->
             </ul>
             </div>
        
@@ -81,7 +81,7 @@
             </router-link>
           </el-menu-item>
           <el-menu-item v-else style=" background:none;">
-            <p @click="toLogin" class="login text_color" :class="classH2" >登录/注册</p>
+            <p @click="toLogin" class="login text_color" :class="classH2"  style="margin-top: 1px;">登录/注册</p>
           </el-menu-item>
         </el-menu>
       </div>
@@ -93,7 +93,7 @@
       </transition>
     </section>
 
-    <div class="lbg_color2"
+    <div class="el-tag--primary lbg_color1"
       :class="[
         'footer',
         fixedHeader ? 'fixed-footer' : '',
@@ -577,7 +577,7 @@ export default {
   line-height: 35px;
   font-size: 12px;
   text-align: center;
-  color: #747474;
+  // color: #747474;
   .police {
     vertical-align: sub;
   }

src/permission.js

@@ -25,6 +25,7 @@ router.beforeEach(async (to, from, next) => {
     }
   } else {
     if (whiteList.indexOf(to.path) !== -1) {
+    
       next() // 在免登录白名单中，直接进入
       NProgress.done() // 关闭进度条
     } else {
@@ -36,8 +37,10 @@ router.beforeEach(async (to, from, next) => {
         cancelButtonText: '取消',
         type: 'warning'
       })
-        .then(() => {
-          next(`/indexLayout/index'?type=reLogin`) 
+         .then(() => {
+          this.$router.replace(`/indexLayout/home?type=reLogin`)
+         // next(`/indexLayout/index'?type=reLogin`) 
+          console.log(next(`/login?redirect=${to.path}`) );
           // next(`/login/index?redirect=${to.path}`) // 在没有访问权限的其他页面将重定向到登录页
           // const errUril = window.location.protocol+"//"+window.location.host+"/"+this.$store.getters.logUrl
           // window.location.href=errUril

src/views/home/myproject/index.vue

@@ -12,19 +12,19 @@
 </el-row>
     </div>
     <div class="scher">
-      <span></span>
-      <span class="xuanzhogn">1个已选中</span><span style="padding: 0 5px;">|</span>
-      <div class="input">
-      <el-select v-model="value" placeholder="请选择">
+      <!-- <span></span>
+      <span class="xuanzhogn">搜索</span><span style="padding: 0 5px;">|</span> -->
+      <div class="input ">
+      <!-- <el-select v-model="value" placeholder="请选择">
         <el-option
           v-for="item in options"
           :key="item.value"
           :label="item.label"
           :value="item.value">
         </el-option>
-      </el-select>
-      <el-input v-model="input" class="text" ></el-input>
-
+      </el-select> -->
+      <el-input v-model="searchtag" placeholder="请输入项目名称" class="text" ></el-input>
+    <el-button @click="search()" type="primary" icon="el-icon-search" style="border-radius:0;">搜索</el-button>
       </div>
     </div>
     <!-- 表格 -->
@@ -33,6 +33,7 @@
       v-loading="loading"
      element-loading-text="拼命加载中"
       :data="tableData"
+         height="600"
       class="lbg_color2"
       @row-click="rowclinck"
       style="width: 100%">
@@ -129,6 +130,8 @@ export default {
         layout: 'total, sizes, prev, pager, next, jumper',
         total: 0,
       },
+      searchtag:'',
+      isshare:"",
         options:[{
           value: '0',
           label: '搜索项目'
@@ -184,16 +187,20 @@ this.init();
   },
   methods: {
     init(){
-      this.projectlist();
+      this.projectlist('');
 
     },
       // 分页查询
         getPagination(data) {
       this.paginationConfig = data;
-      this.projectlist();
+      this.projectlist("");
 
     },
-    projectlist(){//列表加载
+    // 项目查询
+    search(){
+      this.projectlist(this.searchtag);
+    },
+    projectlist(searchtag){//列表加载
     const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -205,6 +212,7 @@ this.init();
           transCode: 'C00001',
         page: this.paginationConfig.page,
         count: this.paginationConfig.size,
+        searchtag:searchtag,
         }
         request(params)
           .then((res) => { 
@@ -295,15 +303,20 @@ this.init();
      color: #b6b6b6;
 }
 .scher .input{
-  width: 30%;
+  width: 25%;
+  min-width: 200px;
     box-sizing: border-box;
-   border:1px solid transparent;
-  &:hover{
-border: 1px solid #666;
 transition: 0.5s linear; 
 position:relative;  
 -moz-box-sizing: border-box; 
  box-sizing: border-box; 
+ overflow: hidden;
+ color: #fff;
+  &:hover{
+
+  }
+  .search{
+    padding: 0 10px;
   }
 }
 .scher .el-select{

src/views/index/index.vue

@@ -627,7 +627,6 @@ loadingend(loading){
   loading.close()
 
 },
-  // HCFD文件渲染之前的动作
   startimg(action,action2){
 let params = {
         transCode: "AFT001",// 服务器渲染实例接口创建推流
@@ -1024,6 +1023,8 @@ html,body{
     z-index: 9;
     height: 30px;
     overflow: hidden;
+
+
 }
  .dialoglocation{
     position: absolute;