chengdandan
/
InternetCompetition
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

代码提交_12_31

This commit is contained in:
lixiaobang 2024-12-31 10:26:51 +08:00
parent f4ed699e12 6f5981a0b3
commit 80041e5c34
15 changed files with 515 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/ChiClone.vue
View File

@ -577,9 +577,11 @@ export default {
user_id: this.user_id,
type: "3",
}).then((res) => {
console.log(res);
console.log(JSON.parse(res.data.data.data));
if(this.$i18n.locale==='zh'){
this.trees = JSON.parse(res.data.data.r2);
}else{
this.trees = JSON.parse(res.data.data.data);
}
});
},
methods: {

7
src/components/ChiClonewifi.vue
View File

@ -552,10 +552,11 @@ export default {
user_id: this.user_id,
type: "4",
}).then((res) => {
console.log(res);
console.log(JSON.parse(res.data.data.data));
if(this.$i18n.locale==='zh'){
this.trees = JSON.parse(res.data.data.r2);
}else{
this.trees = JSON.parse(res.data.data.data);
console.log(this.trees, "this.trees");
}
});
},
methods: {

6
src/components/ChiCollection.vue
View File

@ -1551,9 +1551,11 @@ export default {
user_id: this.user_id,
type: "3",
}).then((res) => {
console.log(res);
console.log(JSON.parse(res.data.data.data));
if(this.$i18n.locale==='zh'){
this.trees = JSON.parse(res.data.data.r2);
}else{
this.trees = JSON.parse(res.data.data.data);
}
});
}
},

22
src/components/ChiCollectionwifi.vue
View File

@ -291,7 +291,6 @@ import _ from 'lodash'
import {SaveUserAnswer, GetUserAnswer, GetTree, SendTree, getQueryAnswer} from "@/api/user";
export default {
name: "ChiCollectionwifi",
data() {
return {
user_id: "",
@ -826,22 +825,13 @@ export default {
outerVisible: false,
rulesGate: {
wgpz_wgmc: [
{ required: true, message: "请选择网关名称", trigger: "blur" },
{ required: true, message: this.$t('dbcollectiongate.rules.wgpz_wgmc'), trigger: "blur" },
],
wgpz_wgid: [
{ required: true, message: "请选择网关id", trigger: "blur" },
{ required: true, message: this.$t('dbcollectiongate.rules.wgpz_wgid'), trigger: "blur" },
],
},
opts1: [
{
value: "有线区网关2",
label: "有线区网关2",
},
{
value: "无线区网关2",
label: "无线区网关2",
},
],
opts1: this.$t('dbcollectiongate.options2'),
opts2: [
{
value: "LAN-BOX2",
@ -1474,9 +1464,11 @@ export default {
user_id: this.user_id,
type: "4",
}).then((res) => {
console.log(res);
console.log(JSON.parse(res.data.data.data));
if(this.$i18n.locale==='zh'){
this.trees = JSON.parse(res.data.data.r2);
}else{
this.trees = JSON.parse(res.data.data.data);
}
});
}
this.getUserAnswer();

2
src/components/ChiDevice.vue
View File

@ -1222,7 +1222,7 @@ export default {
justify-content: space-between;
.title_l {
width: 103px;
// width: 103px;
height: 26px;
color: rgba(16, 16, 16, 1);
font-size: 18px;

6
src/components/ChiDevicewifi.vue
View File

@ -982,9 +982,11 @@ export default {
user_id: this.user_id,
type: "4",
});
console.log(res);
console.log(JSON.parse(res.data.data.data));
if(this.$i18n.locale==='zh'){
this.trees = JSON.parse(res.data.data.r2);
}else{
this.trees = JSON.parse(res.data.data.data);
}
},
//网关配置的信息
async submitGate() {

27
src/components/ChiGate.vue
View File

@ -135,32 +135,7 @@ export default {
mqtt_cjd_sbmc: "",
mqtt_cjd_tagid: "",
},
options1: [
{
value: "开放式",
label: "开放式",
},
{
value: "共享式",
label: "共享式",
},
{
value: "WPA-PSK",
label: "WPA-PSK",
},
{
value: "WPA",
label: "WPA",
},
{
value: "WPA2-PSK",
label: "WPA2-PSK",
},
{
value: "WPA2",
label: "WPA2",
},
],
options1: this.$t('wirelessgatewayip.options1'),
options2: [
{
value: "NONE",

11
src/components/CloneView.vue
View File

@ -424,16 +424,7 @@ export default {
label: "qos2",
},
],
options2: [
{
value: "周期上传",
label: "周期上传",
},
{
value: "整点上传",
label: "整点上传",
},
],
options2: this.$t('mqttClient.options2'),
points: [
{
id: 1,

11
src/components/CloneWifi.vue
View File

@ -420,16 +420,7 @@ export default {
label: "qos2",
},
],
options2: [
{
value: "周期上传",
label: "周期上传",
},
{
value: "整点上传",
label: "整点上传",
},
],
options2: this.$t('mqttClient.options2'),
options3: [],
options4: [],
points: [

4
src/components/IpConfiguration.vue
View File

@ -36,8 +36,8 @@
v-model="ruleForm.ippz_dns_hqfs"
style="width: 200px"
>
<el-option label="自动获取" value="自动获取"></el-option>
<el-option label="手动设定" value="手动设定"></el-option>
<el-option :label="$t('ckipconfig.auto')" :value="$t('ckipconfig.auto')"></el-option>
<el-option :label="$t('ckipconfig.manual')" :value="$t('ckipconfig.manual')"></el-option>
</el-select>
</el-form-item>
</el-col>

31
src/components/PortConfiguration.vue
View File

@ -49,12 +49,13 @@
<el-form-item :label="$t('ckportconfig.checkBit')" prop="dkpz_jyw">
<el-col :span="15">
<el-select v-model="ruleForm.dkpz_jyw">
<el-option
<el-option :value="item.value" v-for="(item,index) in checkBitList" :key="index"></el-option>
<!-- <el-option
label="无校验(None)"
value="无校验(None)"
></el-option>
<el-option label="奇校验" value="奇校验"></el-option>
<el-option label="偶校验" value="偶校验"></el-option>
<el-option label="偶校验" value="偶校验"></el-option> -->
</el-select>
</el-col>
</el-form-item>
@ -94,7 +95,7 @@
<el-col :span="15">
<el-select v-model="ruleForm.dkpz_tbbtl">
<el-option label="None" value="None"></el-option>
<el-option label="启用" value="启用"></el-option>
<el-option :label="$t('ckportconfig.enable')" :value="$t('ckportconfig.enable')"></el-option>
</el-select>
</el-col>
</el-form-item>
@ -117,29 +118,9 @@ import {SaveUserAnswer, GetUserAnswer, getQueryAnswer} from "@/api/user";
export default {
data() {
return {
checkBitList:this.$t('ckportconfig.checkBitList'),
user_id: "",
datas: [
{
name: "端口",
children: [
{
name: "端口1",
},
{
name: "端口2",
},
{
name: "端口3",
},
{
name: "端口4",
},
{
name: "网页转串口",
},
],
},
],
datas: this.$t('ckportconfig.datas'),
defaultProps: {
children: "children",
label: "name",

9
src/components/netConfiguration.vue
View File

@ -35,11 +35,11 @@
<el-form-item :label="$t('toWifi.checkBit')" prop="ckcssz_jyw">
<el-select v-model="ruleForm.ckcssz_jyw" :placeholder="$t('select')">
<el-option
label="无校验（none）"
value="无校验（none）"
:label="item.label"
:value="item.value"
:key="index"
v-for="(item,index) in checkBitList"
></el-option>
<el-option label="偶校验" value="偶校验"></el-option>
<el-option label="奇校验" value="奇校验"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('toWifi.controlMode')" prop="ckcssz_lk">
@ -144,6 +144,7 @@ import {SaveUserAnswer, GetUserAnswer, getQueryAnswer} from "@/api/user";
export default {
data() {
return {
checkBitList:this.$t('ckportconfig.checkBitList'),
dialogVisible: true,
labelPosition: "left",
user_id: "",

65
src/language/en.js
View File

@ -289,7 +289,17 @@ export default {
mqtt_sjgl: "请输入数据过滤",//请输入数据过滤
ip1: '请输入IP地址',//请输入IP地址
ip2: '请输入有效的IP地址',//请输入有效的IP地址
}
},
options2: [
{
value: "周期上传",
label: "周期上传",
},
{
value: "整点上传",
label: "整点上传",
},
],
},
// 斥候设备配置
reconnoitreConfiguration: {
@ -368,6 +378,8 @@ export default {
gateway: '网关地址:',//网关地址
primaryDNS: '主DNS服务器:',//主DNS服务器
backupDNS: '备用DNS服务器:',//备用DNS服务器
auto:'自动获取',//自动获取
manual:'手动设定',//手动设定
rules: {
ipMethod: '请选择IP获取方式',//请选择IP获取方式
getDNS: '请选择DNS获取方式',//请选择DNS获取方式
@ -395,6 +407,7 @@ export default {
packagingTime: '打包时长(ms):',//打包时长
synBaudRate: '同步波特率(RF2217):',//同步波特率
checked: '使能串口心跳包',//使能串口心跳包
enable:'启用',
rules: {
dkpz_btl: "请选择波特率",
dkpz_sjw: "请选择数据位",
@ -404,7 +417,43 @@ export default {
dkpz_dbcd: "请输入打包长度",
dkpz_dbsj: "请输入打包时间",
dkpz_tbbtl: "请选择同步波特率",//请选择同步波特率
},
datas:[
{
name: "端口",
children: [
{
name: "端口1",
},
{
name: "端口2",
},
{
name: "端口3",
},
{
name: "端口4",
},
{
name: "网页转串口",
},
],
},
],
checkBitList:[
{
label:'无校验(None)',
value:'无校验(None)'
},
{
label:'奇校验',
value:'奇校验'
},
{
label:'偶校验',
value:'偶校验'
}
]
},
//485towifi-串口及网络协议设置
toWifi: {
@ -423,6 +472,20 @@ export default {
customPacket: '自定义心跳包',//自定义心跳包
socketFunction: '套接字分发功能',//套接字分发功能
Note: '注意：开启后，模块主动向服务器发送注册包，此功能用于辨识设备。模块建立时发送注册包，每次发送数据时发送注册包',
checkBitList:[
{
label:'无校验(None)',
value:'无校验(None)'
},
{
label:'奇校验',
value:'奇校验'
},
{
label:'偶校验',
value:'偶校验'
}
]
},
// 串口服务器-485towifi-网口配置
cknet: {

108
src/language/zh.js
View File

@ -88,7 +88,33 @@ export default{
ippz_mac: "Please enter the MAC address",//请输入mac地址
ippz_wifi_ssid: "Please enter the SSID", //请输入SSID
ippz_wifi_mm: "Please enter the password",//请输入密码
}
},
options1: [
{
value: "Open",
label: "Open",
},
{
value: "Shared",
label: "Shared",
},
{
value: "WPA-PSK",
label: "WPA-PSK",
},
{
value: "WPA",
label: "WPA",
},
{
value: "WPA2-PSK",
label: "WPA2-PSK",
},
{
value: "WPA2",
label: "WPA2",
},
],
},
// DB/斥候-网关配置
dbcollectiongate: {
@ -302,7 +328,17 @@ export default{
mqtt_sjgl: "Please enter the data filtering",//请输入数据过滤
ip1: 'Please enter a IP address',//请输入IP地址
ip2: 'Please enter a valid IP address',//请输入有效的IP地址
}
},
options2: [
{
value: "Periodic upload",
label: "Periodic upload",
},
{
value: "Upload on the hoaur",
label: "Upload on the hoaur",
},
],
},
// 斥候设备配置
reconnoitreConfiguration: {
@ -339,7 +375,17 @@ export default{
sbpz_cjcgsj: "Please enter the collection overtime(ms)",//请输入采集超过时间
sbpz_zqsbonchange: "周期上报Onchange数据",//周期上报Onchange数据
sbpz_txsjjg: "Please enter the communication time interval(ms)",//请输入通讯时间间隔
}
},
options1: [
{
value: "Wired area precision carving equipment 2",
label: "Wired area precision carving equipment 2",
},
{
value: "Wireless area precision carving equipment 2",
label: "Wireless area precision carving equipment 2",
},
]
},
// 斥候网关mqtt
chmqtt: {
@ -373,6 +419,8 @@ export default{
gateway: 'Default gateway:',//网关地址
primaryDNS: 'Primary DNS server:',//主DNS服务器
backupDNS: 'Backup DNS server',//备用DNS服务器
auto: 'Automatic acquisition(default)',//自动获取
manual: 'Manual setting',//手动设定
rules: {
ipMethod: 'Please select IP acquisition method',//请选择IP获取方式
getDNS: 'Please select DNS acquisition method',//请选择DNS获取方式
@ -400,6 +448,7 @@ export default{
packagingTime: 'Packaging time(ms)',//打包时长
synBaudRate: 'Synchronous Baud Rate(RF2217)',//同步波特率
checked: 'Enable serial heartbeat packet',//使能串口心跳包
enable:'Enable',//启用
rules: {
dkpz_btl: "Please select Baud rate(bps)",
dkpz_sjw: "Please select Data bits(bit)",
@ -409,7 +458,44 @@ export default{
dkpz_dbcd: "Please select Packaging length(bytes)",
dkpz_dbsj: "Please select packagingTime",
dkpz_tbbtl: "Please select Synchronous Baud Rate(RF2217)",//请选择同步波特率
},
checkBitList: [
{
label: 'None',
value: 'None'
},
{
label: 'Odd check',
value: 'Odd check'
},
{
label: 'Parity check',
value: 'Parity check'
}
],
datas: [
{
name: "Port",
children: [
{
name: "Port 1",
},
{
name: "Port 2",
},
{
name: "Port 3",
},
{
name: "Port 4",
},
{
name: "Web page to serial port",
},
],
},
],
},
//485towifi-串口及网络协议设置
toWifi: {
@ -427,7 +513,21 @@ export default{
packageType: 'Registration package type',//注册包类型
customPacket: 'Custom heartbeat packet',//自定义心跳包
socketFunction: 'Socket distribution function',//套接字分发功能
Note:'Note:After activation, the module actively sends a registration package to the server, which is used to identify the device.First: Send registration package when module is established,every: Send registration package every time data is sent'
Note: 'Note:After activation, the module actively sends a registration package to the server, which is used to identify the device.First: Send registration package when module is established,every: Send registration package every time data is sent',
checkBitList: [
{
label: 'None',
value: 'None'
},
{
label: 'Odd check',
value: 'Odd check'
},
{
label: 'Parity check',
value: 'Parity check'
}
],
},
// 串口服务器-485towifi-网口配置
cknet: {

8
src/views/examModule/examPage.vue
View File

@ -196,7 +196,12 @@ export default {
formData.append("data", JSON.stringify(data));
submitPracticeTopic(formData).then((res) => {
localStorage.removeItem("countdownEndTime");
this.$router.push("/practiceSuccess?score=" + res.data.data.score+'&result_id='+res.data.data.result_id);
this.$router.push(
"/practiceSuccess?score=" +
res.data.data.score +
"&result_id=" +
res.data.data.result_id
);
});
},
//答题卡数据获取
@ -259,6 +264,7 @@ export default {
},
// 题目点击
testClick(item) {
console.log(item, "xxxxxxx");
// 保存缓存
this.saveCacheData();
this.testContent.options = [];