Commit cf8038bd authored by 张冬's avatar 张冬

更新

parent 2fea7cd4
...@@ -78,7 +78,7 @@ export default { ...@@ -78,7 +78,7 @@ export default {
let value = [] let value = []
for (let i = 0; i < fileList.length; i++) { for (let i = 0; i < fileList.length; i++) {
let message = {} let message = {}
message.fileName = fileList[i].name message.fileName = fileList[i].fileName
message.fileUrl = fileList[i].url message.fileUrl = fileList[i].url
value.push(message) value.push(message)
} }
...@@ -122,11 +122,10 @@ export default { ...@@ -122,11 +122,10 @@ export default {
let objName = getFileNameUUID() let objName = getFileNameUUID()
// 调用 ali-oss 中的方法 // 调用 ali-oss 中的方法
put(`${objName}${option.file.name}`, option.file).then(res => { put(`${objName}${option.file.name}`, option.file).then(res => {
console.log(res) res.fileName=option.file.name;
this.fileList.push(res) this.fileList.push(res)
console.log(this.fileList) console.log(this.fileList)
this.emitInput(this.fileList) this.emitInput(this.fileList)
}) })
} }
} }
......
...@@ -162,7 +162,8 @@ export default { ...@@ -162,7 +162,8 @@ export default {
res. time = getTime() res. time = getTime()
res.free = true res.free = true
res.price = '' res.price = ''
res.fileName = res.name // /* res.fileName = res.name */
res.fileName = option.file.name
res.fileUrl = res.url res.fileUrl = res.url
this.fileList.push(res) this.fileList.push(res)
this.$emit('input', this.fileList) this.$emit('input', this.fileList)
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="content"> <div class="content">
<upload @onsuccess="get"></upload> <upload @onsuccess="get"></upload>
<div @click="up">上传</div> <div @click="up">上传</div>
<singleUpload :limit="1" tip="支持扩展名:.rar .zip .doc .docx .pdf .jpg..." @input="getfile"></singleUpload>
</div> </div>
</div> </div>
</template> </template>
...@@ -11,23 +12,20 @@ ...@@ -11,23 +12,20 @@
import { autodeploy} from '@api/common/list' import { autodeploy} from '@api/common/list'
import imgupload from '@components/Upload/imgUpload.vue' import imgupload from '@components/Upload/imgUpload.vue'
import upload from '@components/Upload/newUpload.vue' import upload from '@components/Upload/newUpload.vue'
import singleUpload from '@components/Upload/Upload.vue'
export default { export default {
components: { components: {
upload, upload,
imgupload imgupload,
singleUpload
}, },
data() { data() {
return { return {
} }
}, },
methods: { methods: {
getmessage(val) {
console.log(val) getfile(val){
},
getimg(val) {
console.log(val)
},
get(val){
console.log(val) console.log(val)
}, },
async up() { async up() {
......
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
let token=localStorage.getItem("token") let token=localStorage.getItem("token")
let projectId = localStorage.getItem("projectId") let projectId = localStorage.getItem("projectId")
// this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId +"/"+token ) // this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId +"/"+token )
this.websocket = new WebSocket('ws://60.205.251.80:8082/webSocket/' + projectId +"/"+token ) this.websocket = new WebSocket('ws://60.205.251.80:8889/webSocket/' + projectId +"/"+token )
// 连接成功时 // 连接成功时
this.websocket.onopen = () => {} this.websocket.onopen = () => {}
this.websocket.onmessage = event => { this.websocket.onmessage = event => {
......
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
let token=localStorage.getItem("token") let token=localStorage.getItem("token")
let projectId = localStorage.getItem("projectId") let projectId = localStorage.getItem("projectId")
// this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId +"/"+token ) // this.websocket = new WebSocket('ws://192.168.3.35:8085/webSocket/' + projectId +"/"+token )
this.websocket = new WebSocket('ws://60.205.251.80:8082/webSocket/' + projectId +"/"+token ) this.websocket = new WebSocket('ws://60.205.251.80:8889/webSocket/' + projectId +"/"+token )
// 连接成功时 // 连接成功时
this.websocket.onopen = () => {} this.websocket.onopen = () => {}
this.websocket.onmessage = event => { this.websocket.onmessage = event => {
......
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