瀏覽代碼

bug修改

luolei 5 年之前
父節點
當前提交
bb5b6bac16
共有 6 個文件被更改,包括 22 次插入6 次删除
  1. 1 0
      src/css/index.less
  2. 1 0
      src/css/login.less
  3. 14 1
      src/css/reset.less
  4. 1 1
      src/html/login.html
  5. 4 3
      src/js/console.js
  6. 1 1
      src/js/index.js

+ 1 - 0
src/css/index.less

@@ -21,6 +21,7 @@
     &:after{
       content: " ";
       display: inline-block;
+      cursor: pointer;
       position: absolute;
       right: 0;
       top:22px;

+ 1 - 0
src/css/login.less

@@ -2,6 +2,7 @@ body {
   background-color: #f5f5f5;
 }
 .login {
+  cursor: pointer;
   .waring {
     color: #FF4D4F;
     margin-top: 18px;

+ 14 - 1
src/css/reset.less

@@ -275,4 +275,17 @@ textarea {
     margin-left: -20px;
     margin-top: -20px;
   }
-}
+}
+
+input::-webkit-input-placeholder{
+  color:#ccc;
+}
+input::-moz-placeholder{   /* Mozilla Firefox 19+ */
+  color:#ccc;
+}
+input:-moz-placeholder{    /* Mozilla Firefox 4 to 18 */
+  color:#ccc;
+}
+input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
+  color:#ccc;
+}

+ 1 - 1
src/html/login.html

@@ -21,7 +21,7 @@
           <p>用户名</p>
           <div class="iptWrap">
             <img src="../images/yonghu.png" alt="">
-            <input type="text" placeholder="请输入用户名" id="username" value="" autocomplete="off">
+            <input type="text" placeholder="请输入用户名" id="username" value="" autocomplete="off">
           </div>
         </div>
         <br>

+ 4 - 3
src/js/console.js

@@ -292,7 +292,7 @@ function emptyCircle(data){
     });
     let bgColor = '#fff';
     let title = '总量';
-    let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
+    let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
     let echartData = data;
     let total = 0;
     for(let i = 0;i < echartData.length;i++){
@@ -398,17 +398,18 @@ function queList(data){
 }
 //饼图列表注释渲染
 function panDetail(data){
+    let color = ['#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336','#F2637B','#975FE4', '#399FFF', '#37CBCB', '#4CCB73','#FAD336'];
     let strAll = '';
     for(let i = 0;i < data.length;i++){
         strAll += `
             <tr class="explainLi">
-                <td class="deptName"><i class="tip"></i>${data[i].name}</td>
+                <td class="deptName"><i class="tip" style="background-color:${color[i]}"></i>${data[i].name}</td>
                 <td class="deptNum">${data[i].num}</td>
                 <td class="percent">(${data[i].percentStr})</td>
             </tr>
         `
     }
-    $(".explainPan table").html(strAll)
+    $(".explainPan table").html(strAll);
     $(".explainPan").css({
         marginTop:-($(".explainPan").height()/2-20)+'px'
     })

+ 1 - 1
src/js/index.js

@@ -84,7 +84,7 @@ function changeWord(oldword,newword){
   });
 }
 //用户信息下拉事件
-$(".setting").click(function(){
+$(".login").click(function(){
   $(".userAction").slideToggle();
 })
 //点击修改密码