Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/layout/layout-part/heads.vue

@@ -2,8 +2,11 @@
   <div id="heads">
     <el-row>
       <el-col :span="24">
-        <el-col :span="15" class="title">
-          吉林省小微企业金融管理后台
+        <el-col :span="1" style="width: 35px;padding-top: 20px;">
+          <el-image style="width: 35px; height: 35px;border-radius: 50%" :src="require('../../assets/top.png')"></el-image>
+        </el-col>
+        <el-col :span="14" class="title">
+          吉企银通管理后台
         </el-col>
         <el-col :span="3" class="admin"> </el-col>
         <el-dialog title="修改密码" :visible.sync="dialogFormVisible" style="">
@@ -97,7 +100,7 @@ export default {
   font-family: Source Han Sans SC;
   font-weight: bold;
   color: #ffffff;
-  padding: 23px 29px;
+  padding: 23px 10px;
 }
 .admin {
   text-align: right;

src/layout/layout-part/menus.vue

@@ -96,11 +96,11 @@
       <el-menu-item index="/region/index"> <i class="el-icon-s-grid"></i>地区管理</el-menu-item>
       <el-menu-item index="/banner/index"> <i class="el-icon-s-grid"></i>首页轮播管理</el-menu-item>
 
-      <el-menu-item index="/tNewAssign/index"> <i class="el-icon-s-grid"></i>企业申请信息指派</el-menu-item>
+      <el-menu-item index="/tNewAssign/index"> <i class="el-icon-s-grid"></i>业务指派</el-menu-item>
       <el-submenu index="6">
         <template v-slot:title>
           <i class="el-icon-s-grid"></i>
-          <span>企业申请信息催办</span>
+          <span>业务催办</span>
         </template>
         <el-menu-item-group>
           <el-menu-item index="/tUrgeHandle/index">催办操作</el-menu-item>

src/layout/tUrgeHandle/tUrgeHandleList.vue

@@ -30,6 +30,7 @@
                             tooltip-effect="dark"
                             :default-sort="{ prop: 'date', order: 'descending' }"
                             style="width: 100%"
+                            :row-class-name="tableRowClassName"
                             @selection-change="handleSelectionChange"
                     >
                         <!--<el-table-column type="selection" align="center"> </el-table-column>-->
@@ -312,6 +313,13 @@
                         return '接单'+ timeout;
                 }
             },
+            tableRowClassName({ row, rowIndex }) {
+                console.log(row.creditStatus, rowIndex);
+                if (row.next_is_timeout == '1') {
+                    return 'warning-row';
+                }
+                return '';
+            },
         },
     };
 </script>
@@ -340,6 +348,9 @@
         text-overflow: ellipsis;
         white-space: nowrap;
     }
+    /deep/.el-table  .warning-row {
+        background:oldlace;
+    }
 
     .other {
         color: #f36302;

src/views/login.vue

@@ -4,8 +4,8 @@
       <el-col :span="24" class="login" :style="'background: url(' + loginBei + ')no-repeat center center;'">
         <el-col :span="12" class="info">
           <el-col :span="24" class="topTitle">
-            <p>吉林省小微企业金融</p>
-            <p>综合服务管理平台</p>
+            <p>吉企银通管理后台</p>
+<!--            <p>综合服务管理平台</p>-->
           </el-col>
           <el-col :span="24" class="kuang" :style="'background: url(' + kuang + ')no-repeat center center;'">
             <el-form ref="form" :model="form">