Merge branch 'mhy' into 'master'

Mhy

See merge request !57

xichongSys/package.json

@@ -12,6 +12,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",
+    "echarts": "^4.2.1",
     "element-ui": "^2.4.6",
     "font-awesome": "^4.7.0",
     "js-cookie": "^2.2.0",

xichongSys/src/views/Sys/Role.vue

@@ -169,14 +169,16 @@ export default {
 			this.dataForm = {
 				id: 0,
 				name: '',
-				remark: ''
+				remark: '',
 			}
+			this.sealUrl = [];
 		},
 		// 显示编辑界面
 		handleEdit: function (params) {
 			this.dialogVisible = true
 			this.operation = false
 			this.dataForm = Object.assign({}, params.row)
+      this.sealUrl = [];
 		},
 		// 编辑
 		submitForm: function () {
@@ -302,28 +304,20 @@ export default {
       	},
     changeSeal(file) {
 		  var This = this;
-		  this.sealUrl.length = 0;
+		  this.sealUrl = [];
 		  this.sealUrl.push(file);
       if (this.sealUrl.length > 0) {
-        var aa;
-        aa = this.convertImageToBase64();
-        console.log(aa);
-        console.log(this.dataForm);
+        this.convertImageToBase64(function (base64) {
+          This.dataForm.sealStr = base64;
+        });
       }
     },
-    convertImageToBase64() {
-		  var This = this;
-		  var base64;
+    convertImageToBase64(callback) {
 		  let reader = new FileReader();
 		  reader.readAsDataURL(this.sealUrl[0].raw);
 		  reader.onload = function (e) {
-		    console.log(this.result.substring(this.result.indexOf(",") + 1));
-		    base64 =  this.result.substring(this.result.indexOf(",") + 1);
-		    This.sealUrl[0] = this.result.substring(this.result.indexOf(",") + 1);
+		    callback.call(this, this.result.substring(this.result.indexOf(",") + 1));
       }
-      console.log(This.sealUrl[0]);
-      console.log(base64);
-      return base64;
     }
 	},
 	mounted() {