Merge remote-tracking branch 'origin/kdnh-web' into kdnh-web

src/layout/components/AppMain.vue

@@ -56,11 +56,13 @@ export default {
   },
   created() {
     // this.getListStatus();
-    this.selectTriggerInfo();
   },
   mounted(){
     this.userType = localStorage.getItem('userType')
-    this.subscriptionMQTT();
+    if(this.userType != 22){
+      this.selectTriggerInfo();
+      this.subscriptionMQTT();
+    }
   },
   methods:{
     workClickOff(){

src/views/home.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="home" :class="userType != 22&&initPage == 'true' ? 'home-class' : ''">
+  <div class="home" :class="userType != 22&&initPage == 'true' ? 'home-class' : ''" >
     <!--<div class="button-max-box" v-if="userType != '22'">-->
     <!--<dv-full-screen-container v-if="userType != '22'&&initPage == 'true'" style="display: flex;flex-direction: column;flex:1;">-->
       <home-navbar />
-      <div class="max-big-home-box">
+      <div class="max-big-home-box" v-if="userType != 22&&initPage == 'true'">
         <div class="max-home-button-box">
           <div class="max-home-box">
             <div class="max-bottom-box">

src/views/system/apkfile/index.vue

@@ -426,10 +426,10 @@
         if (file.type == 'application/vnd.android.package-archive') {
           type = true;
         }else{
-          this.$message.error('只能上传png/jpeg/gif格式图片');
+          this.$message.error('只能上传APK格式文件');
           type = false;
         }
-        console.log('file');
+        console.log('file',file);
         return type;
       },
       // 新增/编辑节点单击事件
@@ -500,12 +500,9 @@
           return
         }
         this.fileList=[];
-        this.$refs.uploader.files = [];
-        this.$refs.uploader.fileList = [];
-        console.log("this.$refs.uploader",this.$refs.uploader);
+        // this.$refs.uploader.files = [];
+        // this.$refs.uploader.fileList = [];
         //this.$refs.uploader.allRemove();
-        console.log("this.$refs.uploader",this.$refs.uploader);
-        console.log("this.$refs.files",this.$refs.files);
         this.fileData = {};
         this.openUp = false;
       },
@@ -573,9 +570,9 @@
               this.openUp = false;
               this.upForm = {};
               this.fileList=[];
-              this.$refs.uploader.files = [];
-              this.$refs.uploader.fileList = [];
-              this.$refs.uploader.cancel()
+              // this.$refs.uploader.files = [];
+              // this.$refs.uploader.fileList = [];
+              // this.$refs.uploader.cancel()
               this.fileData = {};
             });
           }
@@ -686,10 +683,8 @@
         console.log("file",file)
         console.log("fileList",fileList)
         console.log("event",event)
-        this.$refs.uploader.fileList = [];
-        this.$refs.uploader.files = [];
-        console.log("this.$refs.files================",this.$refs.files);
-        console.log("this.$refs.uploader================",this.$refs.uploader);
+        // this.$refs.uploader.fileList = [];
+        // this.$refs.uploader.files = [];
         this.fileList=[];
         file.forEach((e) => {
           this.fileList.push(e);