Merge remote-tracking branch 'origin/shoot-hand-html' into shoot-hand-html

src/views/admin/repair/RepairStatistics.vue

@@ -699,8 +699,9 @@ export default {
 }
 
 .statusView .caseStatusView .headView .titleView, .statusView .evaluateView .headView .titleView {
-  font-size: 14px;
-  color: gray;
+  font-size: 16px;
+  color: black;
+  font-weight: bold;
 }
 
 
@@ -774,8 +775,9 @@ export default {
 }
 
 .faultView .floorView .headView .titleView {
-  font-size: 14px;
-  color: gray;
+  font-size: 16px;
+  color: black;
+  font-weight: bold;
 }
 
 
@@ -817,8 +819,9 @@ export default {
 }
 
 .rightView .blockView .headView .titleView {
-  font-size: 14px;
-  color: gray;
+  font-size: 16px;
+  color: black;
+  font-weight: bold;
 }
 
 .rightView .blockView .headView .conditionView {
@@ -851,8 +854,9 @@ export default {
 }
 
 .tableView .headView .titleView {
-  font-size: 14px;
-  color: gray;
+  font-size: 16px;
+  color: black;
+  font-weight: bold;
 }
 
 .tableView .headView .conditionView {

src/views/admin/repair/modules/RepairDeviceTypeModal.vue

@@ -14,8 +14,8 @@
       <a-form-item style="display:none">
         <a-input v-decorator="['version']" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别名称">
-        <a-input placeholder="名称" v-decorator="['name']" />
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="故障类型">
+        <a-input placeholder="请输入故障类型" v-decorator="['name']" />
       </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="预计完成时间">
         <a-input-number placeholder="预计完成时间" v-decorator="['days']" />

src/views/user/Login.vue

@@ -277,7 +277,7 @@ export default {
     },
     loginSuccess (res) {
       if (res.code === 0) {
-        this.$router.push({ name: 'analysis' }, () => { // 登录跳转
+        this.$router.push({ name: 'repairStatistics' }, () => { // 登录跳转
           this.$notification.success({
             message: '欢迎',
             description: `${timeFix()}，欢迎回来`