Merge branch '王立生' of sckj/mz-cloud into master

ruoyi-ui/package.json

@@ -87,8 +87,7 @@
         "script-ext-html-webpack-plugin": "2.1.5",
         "svg-sprite-loader": "5.1.1",
         "table-xlsx": "^0.1.6",
-        "vue-template-compiler": "2.6.12",
-
+        "vue-template-compiler": "2.6.12"
     },
     "engines": {
         "node": ">=8.9",

ruoyi-ui/src/components/BizReadxls/index.vue

@@ -201,7 +201,7 @@ export default {
             this.trainingList.push(outdata[i]);
           }
           this.totalcount=this.trainingList.length-1;
-       //   this.$refs.upload.value = ''; // 处理完成 清空表单值
+          this.$refs.upload.value = ''; // 处理完成 清空表单值
         } catch (e) {
           return false;
         }};

ruoyi-ui/src/views/system/demo/index.vue

@@ -277,6 +277,7 @@ export default {
       para.para1 = "adfd95a4b3634b58b0cf3b8c67b18a29" //para1-para5 查询参数，使用规则selecttable依据业务表查询条件而定。
       this.$impxls(para, (para) => {
         this.$alert('选择值：' + para.length);
+        console.log(para,"wwwww");
         this.dsbm = para.code;
         this.dsmc = para.name;
         this.qxpid = para.id;