Skip to content

X
xxx_phase2_web
Commit 79ee2052 authored by 以墨为白's avatar 以墨为白 🎧
Browse files
Options

1

parent a92ebafb
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
src/view/sjgl/wxk_public.vue
View file @ 79ee2052
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
title="编辑"></i>&nbsp; title="编辑"></i>&nbsp;
<!-- <i class="el-icon-delete-solid" @click="handleOpen(scope.$index, scope.row)" <!-- <i class="el-icon-delete-solid" @click="handleOpen(scope.$index, scope.row)"
title="打开软件" v-if="fl_type===2"></i>&nbsp; --> title="打开软件" v-if="fl_type===2"></i>&nbsp; -->
<div class="ht-div" @click="handleOpen(scope.$index, scope.row)" v-if="fl_type === 2" <div class="ht-div" @click="handleOpen(scope.$index, scope.row)"
title="打开软件"></div> v-if="fl_type === 2" title="打开软件"></div>
<i class="el-icon-delete-solid" @click="handleDelete(scope.$index, scope.row)" <i class="el-icon-delete-solid" @click="handleDelete(scope.$index, scope.row)"
title="删除"></i> title="删除"></i>
</template> </template>
...@@ -845,10 +845,13 @@ export default { ...@@ -845,10 +845,13 @@ export default {
}) })
.then(result => { .then(result => {
if (!result) { if (!result) {
let fd = new FormData(); // let fd = new FormData();
fd.append("file", file); // fd.append("file", file);
fd.append("filename", md5); // fd.append("filename", md5);
fd.append("bucket", "MERGE"); // fd.append("bucket", "MERGE");
// return fileUploadProgress("api/rest/file/upload", fd, res => {//文件上传
// load.text = "上传中:" + res;
// });
return uploadOSSProgress(md5, "MERGE", file, res => {//文件上传 return uploadOSSProgress(md5, "MERGE", file, res => {//文件上传
load.text = "上传中:" + res; load.text = "上传中:" + res;
}); });
...@@ -1494,4 +1497,5 @@ export default { ...@@ -1494,4 +1497,5 @@ export default {
padding: 25px 25px 0px; padding: 25px 25px 0px;
} }
} }
}</style> }
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment