main
lizhong 2 years ago
parent 27779e363f
commit 2403437fa6

@ -4,18 +4,13 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="dc5c5f4b-3a26-4616-b023-f4f048553ff8" name="Changes" comment=""> <list default="true" id="dc5c5f4b-3a26-4616-b023-f4f048553ff8" name="Changes" comment="socket">
<change afterPath="$PROJECT_DIR$/middleware/auth.ts" afterDir="false" /> <change afterPath="$PROJECT_DIR$/assets/socketio.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/assets/style/public.scss" beforeDir="false" afterPath="$PROJECT_DIR$/assets/style/public.scss" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/components/Header/Index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/components/Header/Index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composables/useUserInfo.ts" beforeDir="false" afterPath="$PROJECT_DIR$/composables/useUserInfo.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/layouts/tabLayout.vue" beforeDir="false" afterPath="$PROJECT_DIR$/layouts/tabLayout.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/nuxt.config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/nuxt.config.ts" afterDir="false" /> <change beforePath="$PROJECT_DIR$/nuxt.config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/nuxt.config.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/comment.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/comment.vue" afterDir="false" /> <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/translate.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/translate.vue" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pages/translate.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/translate.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pages/warning.vue" beforeDir="false" afterPath="$PROJECT_DIR$/pages/warning.vue" afterDir="false" /> <change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/utils/http.ts" beforeDir="false" afterPath="$PROJECT_DIR$/utils/http.ts" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -28,6 +23,7 @@
<option value="vue3" /> <option value="vue3" />
<option value="Vue Single File Component" /> <option value="Vue Single File Component" />
<option value="TypeScript File" /> <option value="TypeScript File" />
<option value="JavaScript File" />
</list> </list>
</option> </option>
</component> </component>
@ -82,7 +78,7 @@
<recent name="$PROJECT_DIR$/src/assets" /> <recent name="$PROJECT_DIR$/src/assets" />
</key> </key>
</component> </component>
<component name="RunManager" selected="npm.generate"> <component name="RunManager" selected="npm.dev">
<configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true"> <configuration name="build" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" /> <package-json value="$PROJECT_DIR$/package.json" />
<command value="run" /> <command value="run" />
@ -115,8 +111,8 @@
</configuration> </configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="npm.generate" />
<item itemvalue="npm.dev" /> <item itemvalue="npm.dev" />
<item itemvalue="npm.generate" />
<item itemvalue="npm.build" /> <item itemvalue="npm.build" />
</list> </list>
</recent_temporary> </recent_temporary>
@ -142,11 +138,23 @@
<workItem from="1679887069532" duration="713000" /> <workItem from="1679887069532" duration="713000" />
<workItem from="1679913811172" duration="1597000" /> <workItem from="1679913811172" duration="1597000" />
<workItem from="1680008447811" duration="223000" /> <workItem from="1680008447811" duration="223000" />
<workItem from="1680009330616" duration="7707000" /> <workItem from="1680009330616" duration="16248000" />
</task> </task>
<task id="LOCAL-00001" summary="socket">
<created>1680082088939</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1680082088940</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </component>
<component name="VcsManagerConfiguration">
<MESSAGE value="socket" />
<option name="LAST_COMMIT_MESSAGE" value="socket" />
</component>
</project> </project>

File diff suppressed because it is too large Load Diff

@ -14,12 +14,12 @@ export default defineNuxtConfig({
{src: '~~/plugins/persits', mode: 'client'}, {src: '~~/plugins/persits', mode: 'client'},
// {src: '~~/plugins/router.js', mode: 'client'}, // {src: '~~/plugins/router.js', mode: 'client'},
], ],
script: [ // script: [
{ // {
type: 'text/javascript', // type: 'text/javascript',
src:'https://cdn.bootcss.com/socket.io/1.3.7/socket.io.js', // src:'https://cdn.bootcss.com/socket.io/1.3.7/socket.io.js',
} // }
], // ],
// routeRules: { // routeRules: {
// "/": { static: true }, // ssr // "/": { static: true }, // ssr
// "/about": { static: false }, // spa 应用 // "/about": { static: false }, // spa 应用

@ -27,7 +27,7 @@
"pinia-plugin-persistedstate": "^3.1.0", "pinia-plugin-persistedstate": "^3.1.0",
"qs": "^6.11.1", "qs": "^6.11.1",
"sass": "^1.58.3", "sass": "^1.58.3",
"socket.io-client": "^4.6.1", "socket.io-client": "^4.0.1",
"vue-i18n": "^9.2.2" "vue-i18n": "^9.2.2"
} }
} }

@ -27,7 +27,8 @@
<el-button v-if="radio1==1||radio1==3" @click="translate"></el-button> <el-button v-if="radio1==1||radio1==3" @click="translate"></el-button>
<el-button v-if="radio1==4||radio1==2" @click="translate2"></el-button> <el-button v-if="radio1==4||radio1==2" @click="translate2"></el-button>
<div class="select_wrap" v-if="currentLangModalStatus" ref="tanchuang1"> <div class="select_wrap" v-if="currentLangModalStatus" ref="tanchuang1">
<el-input placeholder="搜索语言" v-model="searchLanguage" @keyup.enter="inputChange"></el-input> <el-input placeholder="搜索语言" v-model="searchLanguage"
@keyup.enter="inputChange"></el-input>
<div class="hr"></div> <div class="hr"></div>
<div class="language_wrap"> <div class="language_wrap">
<el-scrollbar class="scrollbar"> <el-scrollbar class="scrollbar">
@ -100,7 +101,7 @@
v-model="textarea2" v-model="textarea2"
:rows="2" :rows="2"
type="textarea"/> type="textarea"/>
<!-- <HtmlPreview :content="content"/> --> <!-- <HtmlPreview :content="content"/> -->
</div> </div>
</div> </div>
@ -165,8 +166,8 @@ import dayjs from "dayjs";
import {onClickOutside} from "@vueuse/core" import {onClickOutside} from "@vueuse/core"
// import socket from "@/utils/socket"; // import socket from "@/utils/socket";
// import io from 'socket.io-client' // import io from 'socket.io-client'
// import {process} from "unenv/runtime/node/process/_process";
definePageMeta({ definePageMeta({
@ -216,57 +217,83 @@ const tanchuang2 = ref()
const upload = ref() const upload = ref()
const fileUrl = ref('') const fileUrl = ref('')
const uid = ref('') const uid = ref('')
const socket = ref(null)
watchEffect(()=>{ watchEffect(() => {
radio1.value = route.query?.type ?? 1; radio1.value = route.query?.type ?? 1;
const user = useUserInfo()
// // @ts-ignore const user = useUserInfo()
if(process.client) { // // @ts-ignore
// // @ts-ignore // if(porce.client) {
const socket = io('http://research.mcnetmart.com:2120');//socket // // @ts-ignore
// socket.on("disconnect", () => {
// console.log(socket.id); // undefined
// });
// if (user.$state.info.id) {
if(user.$state.info.id) {
debugger
socket.on('connect', function () {
console.log('dengll', user)
//@ts-ignore
this.emit('login', user.$state.info.id);
});
// socket.on("connect", () => { // socket.on("connect", () => {
// const transport = socket.io.engine.transport.name; // , "polling" // const transport = socket.io.engine.transport.name; // , "polling"
// socket.emit('login', user.$state.info.id); // socket.emit('login', user.$state.info.id);
// socket.io.engine.on("upgrade", () => { // socket.io.engine.on("upgrade", () => {
// const upgradedTransport = socket.io.engine.transport.name; // , "websocket" // const upgradedTransport = socket.io.engine.transport.name; // , "websocket"
// }); // });
// }); // });
} // }
} // }
}) if(user.$state.info.id) {
window.io = null
// if (process.client) {
const socketio = document.createElement('script')
socketio.src = 'https://cdn.bootcss.com/socket.io/1.3.7/socket.io.js'
document.body.append(socketio)
let timer = setInterval(()=>{
// @ts-ignore
if (io) {
socket.value = io('http://research.mcnetmart.com:2120');//socket
// @ts-ignore
socket.value.on('connect', function () {
// @ts-ingore
console.log('dengll', user)
//@ts-ignore
this.emit('login', user.$state.info.id);
});
console.log('socket>>>>', socket)
clearInterval(timer)
}
}, 1000)
}
})
async function inputChange(){ async function inputChange() {
const {data: data} = await translateApi.getAllLanguage({keyword:searchLanguage.value}) const {data: data} = await translateApi.getAllLanguage({keyword: searchLanguage.value})
language.value = data language.value = data
} }
function changeTranslate(val: any){
function changeTranslate(val: any) {
router.replace({ router.replace({
path:route.path, path: route.path,
query: { query: {
type: val type: val
} }
}) })
} }
function beforeUpload(file: any) { function beforeUpload(file: any) {
console.log(file) console.log(file)
} }
function uploadChange() { function uploadChange() {
} }
function uploadSuccess(response: any) { function uploadSuccess(response: any) {
ElMessage.success(response.msg) ElMessage.success(response.msg)
console.log(typeof response.data.url) console.log(typeof response.data.url)
@ -289,7 +316,7 @@ function goYouHua() {
radio1.value = 3 radio1.value = 3
} }
async function importIdentifyLanguage(){ async function importIdentifyLanguage() {
const {data: data} = await translateApi.identifyLanguage({ const {data: data} = await translateApi.identifyLanguage({
content: textarea.value, content: textarea.value,
}) })
@ -358,20 +385,20 @@ async function translate() {
textarea2.value = data textarea2.value = data
} }
} }
async function translate2() { async function translate2() {
translateApi.translateFile({ translateApi.translateFile({
file: fileUrl.value, file: fileUrl.value,
source: abbreviation1.value, source: abbreviation1.value,
target: abbreviation2.value target: abbreviation2.value
}).then(res=>{ }).then(res => {
socket.on('translateDoc', async (msg)=> { // @ts-ignore
socket.value.on('translateDoc', async (msg) => {
console.log("收到消息:" + msg); console.log("收到消息:" + msg);
// //
translateApi.getUserTranslateDocInfo({id: msg}).then((data) => {
translateApi.getUserTranslateDocInfo({id:msg}).then((data)=>{
}) })
}); });
@ -433,6 +460,7 @@ allLanguage()
* { * {
--el-color-primary: #022950 --el-color-primary: #022950
} }
.wrap { .wrap {
padding: 0 244px 50px 244px; padding: 0 244px 50px 244px;
background-color: #EEF1F9; background-color: #EEF1F9;

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save