修改问题

main
JayChou 2 weeks ago
parent a6d4c99252
commit 6ef4d6bf18
  1. 2
      src/store/modules/setting.ts
  2. 68
      src/views/compiler/index.vue
  3. 4
      src/views/largeDataScreen/home.vue

@ -28,7 +28,7 @@ const settingStore = defineStore("settingStore", {
isRunning: false,
isRunCode: Boolean(localStorage.getItem("isRunCode")) || false,
shiyanData: [],
activeStepIndex:Number(localStorage.getItem('activeStepIndex')) || 0
activeStepIndex:Number(localStorage.getItem('activeStepIndex')) || 1
};
},
actions: {

@ -1,15 +1,17 @@
<template>
<div class="container">
<div class="main">
<!-- <pre><code ref="editor" class="edit-text html" contenteditable="true" @input="highlightCode">console.log('Hello, World!');</code></pre> -->
<div class="edit-text" contenteditable="true" spellcheck="false">
<!-- <highlightjs ref="editor" :language="language" :code="code" v-model="code" contenteditable="true" @input="highlightCode"></highlightjs> -->
oisafkahsdkjfhasdf sdfhkjsahfdlkjas \n /n sldhfkajshfd salkdhflkasf asfasdf
</div>
<div
class="edit-text"
contenteditable="true"
spellcheck="false"
ref="code"
></div>
</div>
<div class="setting">
<el-button @click="saveCode" v-if="isShowStrring">保存</el-button>
<el-button @click="router.back()" v-else>返回</el-button>
<el-button @click="copyCode" v-if="isShowStrring">复制答案</el-button>
</div>
</div>
</template>
@ -20,18 +22,60 @@ import { setStepEvent } from "@/utils/setStep";
import { formatDate } from "@/utils";
import settingStore from "@/store/modules/setting";
import { useRouter } from "vue-router";
const router = useRouter()
import { ElMessage } from "element-plus";
const code = ref();
const router = useRouter();
const useSettingStore = settingStore();
const isShowStrring = Boolean(localStorage.getItem('falg')) || false
const isShowStrring = Boolean(localStorage.getItem("falg")) || false;
const saveCode = () => {
useSettingStore.setValue(true, 'isRunCode');
localStorage.setItem('isRunCode','true')
setStepEvent(8,formatDate(new Date()))
useSettingStore.activeStepIndex = 9
if(!validateJavaCode(answer, code.value.innerText)){
ElMessage({
message: "代码编写错误",
type: "warning",
})
}
useSettingStore.setValue(true, "isRunCode");
localStorage.setItem("isRunCode", "true");
setStepEvent(8, formatDate(new Date()));
useSettingStore.activeStepIndex = 9;
router.push("/program");
};
function normalizeCode(code) {
return code.replace(/\s+/g, ""); //
}
router.push('/program')
function validateJavaCode(answer, userCode) {
return normalizeCode(answer) === normalizeCode(userCode);
}
//
const answer = `@RequestMapping(value = "/convert", produces = "application/json; charset=utf-8")
public String convert() throws IOException {
while (true) {
String tcp = TcpUtils.tcp();
if (tcp != null) {
System.out.println("获取到的tcp数据:" + tcp);
Date date = new Date();
String temperature = StrUtil.subBetween(tcp, "温度:", "℃");
String humidity = StrUtil.subBetween(tcp, "湿度:", "%RH");
String formatTime = DateUtil.formatTime(date);
Decs da = new Decs();
da.setId(count);
da.setTemperature(temperature);
da.setHumidity(humidity);
da.setTime(formatTime);
dataList.add(da);
count++;
}
}
}
`;
const copyCode = () => {
navigator.clipboard.writeText(answer).then(() => {
ElMessage.success("复制成功");
});
};
</script>
<style scoped>

@ -226,7 +226,7 @@
</div>
<div class="name" style="font-weight: 700">打开</div>
</div>
<div class="item" @click="showMessage('请点击管理员身份运行')">
<div class="item">
<div class="icon">
<img src="@/assets/images/home.png" alt="" />
</div>
@ -780,7 +780,7 @@ const router = useRouter();
const useSettingStore = settingStore();
const isShowIdea = ref<Boolean>(false);
console.log(route);
onActivated(() => {
onMounted(() => {
if (route.query.idea) {
isShowIdea.value = true;
installationStep.value = 10;

Loading…
Cancel
Save