Selaa lähdekoodia

Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

ouyang 2 vuotta sitten
vanhempi
commit
3e7345a405

+ 11 - 11
src/views/core/edu/task/dialog.info.vue

@@ -225,17 +225,17 @@ export default {
                 let link = document.createElement("a");
                 let body = document.querySelector("body");
 
-               //  link.href = URL.createObjectURL(blob);
-               //  link.download = filename;
-               //
-               //  // fix Firefox
-               //  link.style.display = "none";
-               //  body.appendChild(link);
-               //
-               //  link.click();
-               //  body.removeChild(link);
-               //
-               // window.URL.revokeObjectURL(link.href);
+                link.href = URL.createObjectURL(blob);
+                link.download = filename;
+
+                // fix Firefox
+                link.style.display = "none";
+                body.appendChild(link);
+
+                link.click();
+                body.removeChild(link);
+
+               window.URL.revokeObjectURL(link.href);
            }
         },
         // 事件

+ 2 - 2
src/views/safetycheck/ruleManager/index.vue

@@ -348,7 +348,7 @@ export default {
         return (
           <span class="custom-tree-node">
             <span class="show-ellipsis">
-              {data.label}
+              {data.shortName}
             </span>
           </span>
         );
@@ -360,7 +360,7 @@ export default {
                 class="el-icon-s-management"
                 style="color: #008cd6; padding-top: 3px"
               ></i>
-              <span class="show-ellipsis">{data.label}</span>
+              <span class="show-ellipsis">{data.shortName}</span>
             </span>
           </span>
         );