Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/assets/styles/index.scss

@@ -250,31 +250,31 @@ aside {
 //}
 
 
-.el-button--danger {
-  background: rgba(215,0,15, 0.7) !important;
-  border-color: rgba(215,0,15, 0.7) !important;
-  color:#fff !important;
-}
-
-.el-button--danger:focus,
-.el-button--danger:hover {
-  background: rgba(215,0,15, 1) !important;
-  border-color: rgba(215,0,15, 1) !important;
-  color:#fff !important;
-}
-
-.el-button--primary {
-  background: rgb(73, 180, 236) !important;
-  border-color:rgb(73, 180, 236)  !important;
-  color:#fff !important;
-}
-
-.el-button--primary:focus,
-.el-button--primary:hover {
-  background: rgba(0, 140, 214, 1) !important;
-  border-color: rgba(0, 140, 214,1) !important;
-  color:#fff !important;
-}
+// .el-button--danger {
+//   background: rgba(215,0,15, 0.7) !important;
+//   border-color: rgba(215,0,15, 0.7) !important;
+//   color:#fff !important;
+// }
+
+// .el-button--danger:focus,
+// .el-button--danger:hover {
+//   background: rgba(215,0,15, 1) !important;
+//   border-color: rgba(215,0,15, 1) !important;
+//   color:#fff !important;
+// }
+
+// .el-button--primary {
+//   background: rgb(73, 180, 236) !important;
+//   border-color:rgb(73, 180, 236)  !important;
+//   color:#fff !important;
+// }
+
+// .el-button--primary:focus,
+// .el-button--primary:hover {
+//   background: rgba(0, 140, 214, 1) !important;
+//   border-color: rgba(0, 140, 214,1) !important;
+//   color:#fff !important;
+// }
 
 .el-switch.is-checked .el-switch__core{
   border-color: #009240FF;

src/views/system/device/index.vue

@@ -583,7 +583,7 @@ export default {
           ...this.queryParams,
         },
         `${
-          this.orgName + "-设备导入-" + this.formatTime(new Date(), "YYYYMMhh")
+          this.orgName + "-设备导入模版-" + this.formatTime(new Date(), "YYYYMMhh")
         }.xlsx`
       );
     },