Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/src/components/FileUpload.vue

@@ -41,11 +41,14 @@
         class="el-upload-list__item ele-upload-list__item-content"
         v-for="(file, index) in list"
       >
-        <el-link :href="file.url" :underline="false" target="_blank">
+        <el-link v-if="canDown" :href="file.url" :underline="false" target="_blank">
           <span class="el-icon-document" style="font-size: 12px">
             {{ getFileName(file.name) }}
           </span>
         </el-link>
+        <span v-else class="el-icon-document" style="font-size: 12px">
+            {{ getFileName(file.name) }}
+        </span>
         <div class="ele-upload-list__item-content-action">
           <el-link
             :underline="false"
@@ -91,6 +94,10 @@ export default {
     fileName: {
       type: String,
       default: '',
+    },
+    canDown:{
+      type:Boolean,
+      default:true
     }
   },
   data() {

device-manager-ui/admin/src/views/alarm/config/drawershow.vue

@@ -62,7 +62,7 @@
           placeholder="请选择是否启用"
         />
       </el-row>
-      <form-buttons @submit="submitForm" noCancelBtn />
+      <form-buttons @submit="submitForm" noCancelBtn v-if="pageInfo.type != 'view'"/>
     </el-form>
   </el-drawer>
 </template>

device-manager-ui/admin/src/views/app/publish/dialogshow.vue

@@ -6,7 +6,7 @@
 
               <Field label="应用名称" :span="20" prop="appCode" type="select" :enumData="dict.appPublish" v-model="form.appCode" placeholder="请选择应用"/>
 
-              <Field :span="20" label="文件路径地址"><fileUpload v-model="form.filePath"  prePath="/file/uploadfile"/></Field>
+              <Field :span="20" label="文件路径地址"><fileUpload v-model="form.filePath"  prePath="/file/uploadfile" :canDown="false"/></Field>
                             <Field label="应用类型" :span="20" prop="appType" v-model="form.appType" type="select" :enumData="dict.appType" placeholder="请选择应用类型"/>
                             <Field label="版本号" :span="20" prop="version" type="num" v-model="form.version" placeholder="请输入版本号"/>
 

device-manager-ui/admin/src/views/device/drawershow.vue

@@ -198,7 +198,7 @@
           placeholder="请输入备注"
         />
       </el-row>
-      <form-buttons @submit="submitForm" noCancelBtn />
+      <form-buttons @submit="submitForm" noCancelBtn v-if="pageInfo.type != 'view'"/>
     </el-form>
   </el-drawer>
 </template>

device-manager-ui/admin/src/views/device/module/dialogshow.vue

@@ -12,7 +12,7 @@
                             <Field :span="20" label="模块消息编码" prop="moduleMsgCode" v-model="form.moduleMsgCode" type="textarea" placeholder="请输入模块消息编码，与上报消息头编码一致，唯一"/>
 
             </el-row>
-            <form-buttons @submit="submitForm" noCancelBtn />
+            <form-buttons @submit="submitForm" noCancelBtn v-if="pageInfo.type != 'view'"/>
 
         </el-form>
     </el-drawer>

device-manager-ui/admin/src/views/firm/drawershow.vue

@@ -13,7 +13,7 @@
 
             </el-row>
 
-            <form-buttons @submit='submitForm' noCancelBtn />
+            <form-buttons @submit='submitForm' noCancelBtn v-if="pageInfo.type != 'view'"/>
         </el-form>
 
     </el-drawer>

device-manager-ui/admin/src/views/platform/drawershow.vue

@@ -18,7 +18,7 @@
 
             </el-row>
 
-            <form-buttons @submit='submitForm' noCancelBtn />
+            <form-buttons @submit='submitForm' noCancelBtn v-if="pageInfo.type != 'view'"/>
 
         </el-form>
 

device-manager-ui/admin/src/views/product/version/drawershow.vue

@@ -14,7 +14,7 @@
 
             </el-row>
 
-            <form-buttons @submit='submitForm' noCancelBtn />
+            <form-buttons @submit='submitForm' noCancelBtn v-if="pageInfo.type != 'view'"/>
         </el-form>
 
     </el-drawer>