Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

pages/account/register/password/index.vue

@@ -17,7 +17,7 @@
             :label-width="95"
           >
             <Row>
-              <Col span="5">
+              <Col span="6">
                 <FormItem label="原密码：" prop="oldpass">
                   <Input
                     type="password"
@@ -28,7 +28,7 @@
               </Col>
             </Row>
             <Row>
-              <Col span="5" class="container">
+              <Col span="6" class="container">
                 <FormItem label="新密码：" prop="passwd">
                   <Input
                     type="password"
@@ -37,7 +37,7 @@
                   ></Input>
                 </FormItem>
                 <div class="input_span">
-                  <label style="margin-left: 40px">强度:</label>
+                  <label style="margin-left: 40px">强度：</label>
                   <span id="one"></span>
                   <span id="two"></span>
                   <span id="three"></span>
@@ -50,7 +50,7 @@
               </Col>
             </Row>
             <Row>
-              <Col span="5">
+              <Col span="6">
                 <FormItem label="确认密码：" prop="passwdCheck">
                   <Input
                     size="large"
@@ -244,7 +244,7 @@ export default {
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
   border-right: 0px solid;
-  margin-left: 20px;
+  margin-left: 10px;
   margin-right: 3px;
 }
 
@@ -266,7 +266,7 @@ export default {
 }
 #font span:nth-child(1) {
   color: red;
-  margin-left: 80px;
+  margin-left:100px;
 }
 #font span:nth-child(2) {
   color: orange;

pages/home/index.vue

@@ -107,7 +107,7 @@
       <Divider>
         <span style="color: #2680eb;">
           生产计划状态监控
-          <Icon :type="show?'md-eye':'md-eye-off'" @click="clickEye" />
+          <Icon :type="show?'md-eye':'md-eye-off'" @click="clickEye" class="eye"/>
         </span>
       </Divider>
       <div class="set-img">
@@ -116,7 +116,7 @@
       <Divider>
         <span style="color: #2680eb;">
           不合格品审理单统计
-          <Icon :type="show1?'md-eye':'md-eye-off'" @click="clickEye1" />
+          <Icon :type="show1?'md-eye':'md-eye-off'" @click="clickEye1" class="eye"/>
         </span>
       </Divider>
       <div class="set-img">
@@ -125,7 +125,7 @@
       <Divider>
         <span style="color: #2680eb;">
           班组工单监控
-          <Icon :type="show2?'md-eye':'md-eye-off'" @click="clickEye2" />
+          <Icon :type="show2?'md-eye':'md-eye-off'" @click="clickEye2" class="eye"/>
         </span>
       </Divider>
       <div class="set-img">
@@ -134,7 +134,7 @@
       <Divider>
         <span style="color: #2680eb;">
           暂停任务统计
-          <Icon :type="show3?'md-eye':'md-eye-off'" @click="clickEye3" />
+          <Icon :type="show3?'md-eye':'md-eye-off'" @click="clickEye3" class="eye"/>
         </span>
       </Divider>
       <div class="set-img">
@@ -143,7 +143,7 @@
       <Divider>
         <span style="color: #2680eb;">
           物料相关统计
-          <Icon :type="show4?'md-eye':'md-eye-off'" @click="clickEye4" />
+          <Icon :type="show4?'md-eye':'md-eye-off'" @click="clickEye4" class="eye"/>
         </span>
       </Divider>
       <div class="set-img">
@@ -599,6 +599,9 @@ export default {
   text-align: center;
   margin-bottom: 25px;
 }
+.eye{
+  cursor: pointer;
+}
 .modal-r {
   height: 400px;
   overflow: auto;