优化页面,添加日志上传配置

master
fanluyan 1 month ago
parent a3a57bf1bf
commit bd2eb4ce2a

@ -8,7 +8,7 @@ const service = axios.create({
// baseURL: '',
// timeout: 5000
baseURL: "api", //把原来的项目地址改成api解决跨域问题
timeout: 60000,
timeout: 600000,
});
service.interceptors.request.use((config) => {

@ -22,6 +22,9 @@
<el-form-item>
<el-button type="primary" @click="editIccid">ICCID</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="logSetClick"></el-button>
</el-form-item>
</el-form>
</div>
<div class="zzMsg">
@ -922,7 +925,105 @@
<el-button type="primary" @click="handleupgradation"> </el-button>
</div>
</el-dialog>
<!-- 升级 -->
<!-- 增量升级apk -->
<el-dialog
class="upDialogBox"
title="请选择升级文件"
:visible.sync="appVisible"
:close-on-click-modal="false"
width="30%"
>
<el-form
:model="upgradationappform"
:rules="upgradationappRules"
ref="upgradationappRuleForm"
>
<el-form-item label="oldApk" prop="oldVal">
<el-select
v-model="upgradationappform.oldVal"
placeholder="请选择升级文件"
@change="selectoldChanged"
filterable
>
<el-option
v-for="item in upOldOptions"
:key="item.id"
:label="item.fileName"
:value="item.path"
:title="item.title"
>
{{ item.fileName }}
<i class="title">{{ item.title }}</i
><i class="time">{{ item.createTime }}</i>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="patch升级包" prop="patchVal">
<el-select
v-model="upgradationappform.patchVal"
placeholder="请选择升级文件"
@change="selectPatchChanged"
filterable
>
<el-option
v-for="item in upPatchOptions"
:key="item.id"
:label="item.fileName"
:value="item.path"
:title="item.title"
>
{{ item.fileName }}
<i class="title">{{ item.title }}</i
><i class="time">{{ item.createTime }}</i>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="newApk" prop="upVal">
<el-select
v-model="upgradationappform.upVal"
placeholder="请选择升级文件"
@change="selectUpChanged"
filterable
>
<el-option
v-for="item in upUpOptions"
:key="item.id"
:label="item.fileName"
:value="item.path"
:title="item.title"
>
{{ item.fileName }}
<i class="title">{{ item.title }}</i
><i class="time">{{ item.createTime }}</i>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="key" prop="keyVal">
<el-select
v-model="upgradationappform.keyVal"
placeholder="请选择升级文件"
@change="selectKeyChanged"
filterable
>
<el-option
v-for="item in keyOption"
:key="item.id"
:label="item.name"
:value="item.value"
>
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="appVisible = false"> </el-button>
<el-button type="primary" @click="handleupgradationApp"
> </el-button
>
</div>
</el-dialog>
<!-- 升级ota -->
<el-dialog
class="upDialogBox"
title="请选择OTA升级文件"
@ -963,6 +1064,7 @@
>
</div>
</el-dialog>
<!-- 开启frpc服务器 -->
<el-dialog
title="设置frpc"
@ -1277,6 +1379,46 @@
<el-button type="primary" @click="handleFileDelete"> </el-button>
</div>
</el-dialog>
<!-- 日志设置 -->
<el-dialog
title="日志设置"
:visible.sync="logVisible"
:close-on-click-modal="false"
width="504px"
class="logSetDialog"
>
<div class="logSet">
<div class="logMain">
<div class="top">
<h2>noSpecData</h2>
<el-input
v-model="logset.noSpecData"
placeholder="请输入内容"
></el-input>
<!-- <b>(不上传specdata日志 默认为0)</b> -->
</div>
<div class="bottom">
<h2>mTime</h2>
<el-input
v-model="logset.mTime"
placeholder="请输入内容"
></el-input>
<span class="days">{{ logset.mTime / (60 * 60 * 24) }}</span>
<!-- <b>(日志最后修改时间为多少秒以内 默认为0)</b> -->
</div>
</div>
<el-radio-group v-model="logset.mTime">
<el-radio :label="86400">1</el-radio>
<el-radio :label="172800">2</el-radio>
<el-radio :label="259200">3</el-radio>
<el-radio :label="345600">4</el-radio>
</el-radio-group>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="logVisible = false"> </el-button>
<el-button type="primary" @click="saveLog"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -1355,6 +1497,7 @@ export default {
pull_files: "拉取文件",
push_file: "推送文件",
dl_file: "推送大文件",
yw_app_upd_ota: "App增量更新",
},
taskdrawer: false,
drawer: false,
@ -1471,7 +1614,42 @@ export default {
],
},
upOptions: [],
//apk
appVisible: false,
upgradationappform: {
oldVal: "",
patchVal: "",
upVal: "",
keyVal: "",
},
keyOption: [
{
name: "mpapp",
value: "mpapp",
},
{
name: "mpmaster",
value: "mpmaster",
},
],
selectUpOldObj: {},
selectUpPatchObj: {},
selectUpObj: {},
upgradationappRules: {
oldVal: [
{ required: true, message: "请选择升级文件", trigger: "change" },
],
patchVal: [
{ required: true, message: "请选择升级文件", trigger: "change" },
],
upVal: [
{ required: true, message: "请选择升级文件", trigger: "change" },
],
},
upOldOptions: [],
upPatchOptions: [],
upUpOptions: [],
//ota
upgradationVisibleOta: false,
upgradationformOta: {
upVal: "",
@ -1618,6 +1796,14 @@ export default {
name: "/sdcard/com.xypower.mpapp/data/bc.json",
desc: "电压电量配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/schedules/1",
desc: "通道拍照时间表配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/schedules/2",
desc: "通道拍照时间表配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/channels/1.json",
desc: "通道拍照配置",
@ -1658,12 +1844,20 @@ export default {
name: "/sdcard/com.xypower.mpmaster/data/Master.json",
desc: "运维配置文件",
},
],
pullpathOption: [
{
name: "/sdcard/com.xypower.mpapp/data/App.json",
desc: "MpAPP全局配置",
name: "/sdcard/com.xypower.mpapp/data/App.db",
desc: "数据库app文件",
},
{
name: "/sdcard/com.xypower.mpapp/data/stats",
desc: "统计数据stats文件",
},
],
pullpathOption: [
// {
// name: "/sdcard/com.xypower.mpapp/data/App.json",
// desc: "MpAPP",
// },
{
name: "/sdcard/com.xypower.mpapp/data/recog.json",
desc: "AI全局配置",
@ -1672,6 +1866,14 @@ export default {
name: "/sdcard/com.xypower.mpapp/data/bc.json",
desc: "电压电量配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/schedules/1",
desc: "通道拍照时间表配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/schedules/2",
desc: "通道拍照时间表配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/channels/1.json",
desc: "通道拍照配置",
@ -1712,6 +1914,14 @@ export default {
name: "/sdcard/com.xypower.mpmaster/data/Master.json",
desc: "运维配置文件",
},
{
name: "/sdcard/com.xypower.mpapp/data/App.db",
desc: "数据库app文件",
},
{
name: "/sdcard/com.xypower.mpapp/data/stats",
desc: "统计数据stats文件",
},
],
checkedName: [],
//base64
@ -1809,8 +2019,22 @@ export default {
],
//iccid
iccidVisible: false,
//
logVisible: false,
logset: {
noSpecData: 0,
mTime: 345600,
},
};
},
created() {
let logSetparam = JSON.parse(localStorage.getItem("logset"));
if (logSetparam !== null) {
this.logset = logSetparam;
} else {
this.logset = { noSpecData: 0, mTime: 345600 };
}
},
mounted() {
this.loadLocalStorage();
this.calculateHeight(this.showFlag);
@ -2309,7 +2533,7 @@ export default {
if (logSetparam !== null) {
console.log(logSetparam);
} else {
logSetparam = { noSpecData: 0, mTime: 0 };
logSetparam = { noSpecData: 0, mTime: 345600 };
}
var params = {
action: "yw_cmd_upload_i1_zip_log",
@ -2386,6 +2610,12 @@ export default {
console.log("查看目录文件");
this.fileContentVisible = true;
return;
case 17:
console.log("app增量更新");
this.appVisible = true;
this.getUpgradeAppList();
// this.getUpgradeList();
return;
}
},
//
@ -2547,20 +2777,11 @@ export default {
upgradeListApi({ type: 0 })
.then((res) => {
console.log(res);
console.log("aaaaaaaaaaaaaaaaaaaaaaa");
this.upOptions = res.data;
})
.catch((err) => {});
},
//OtaapkList
getUpgradeOtaList() {
upgradeListApi({ type: 1 })
.then((res) => {
console.log(res);
this.upOptionsOta = res.data;
})
.catch((err) => {});
},
selectChanged(val) {
console.log(val);
// object
@ -2569,15 +2790,6 @@ export default {
});
console.log(this.selectUpObj);
},
selectChangedOta(val) {
console.log(val);
// object
this.selectUpObjOta = this.upOptionsOta.find((item) => {
return item["path"] === val;
});
console.log(this.selectUpObj);
},
//
handleupgradation() {
this.$refs.upgradationRuleForm.validate((valid) => {
@ -2594,6 +2806,80 @@ export default {
}
});
},
//apkList
getUpgradeAppList() {
upgradeListApi({ type: 0 })
.then((res) => {
console.log(res);
this.upOldOptions = res.data;
this.upPatchOptions = res.data;
this.upUpOptions = res.data;
})
.catch((err) => {});
},
//old
selectoldChanged(val) {
console.log(val);
// object
this.selectUpOldObj = this.upOldOptions.find((item) => {
return item["path"] === val;
});
console.log(this.selectUpOldObj);
},
//pacth
selectPatchChanged(val) {
console.log(val);
// object
this.selectUpPatchObj = this.upPatchOptions.find((item) => {
return item["path"] === val;
});
console.log(this.selectUpPatchObj);
},
selectUpChanged(val) {
console.log(val);
// object
this.selectUpUpObj = this.upUpOptions.find((item) => {
return item["path"] === val;
});
console.log(this.selectUpUpObj);
},
handleupgradationApp() {
this.$refs.upgradationappRuleForm.validate((valid) => {
if (valid) {
var params = {
action: "yw_app_upd_ota",
oldurl: this.upgradationappform.oldVal,
appurl: this.upgradationappform.upVal,
otaurl: this.upgradationappform.patchVal,
md5: this.selectUpUpObj.md5,
key: this.upgradationappform.keyVal,
termIds: this.idArray,
};
this.changeIssue(params);
this.appVisible = false;
}
});
},
//OtaapkList
getUpgradeOtaList() {
upgradeListApi({ type: 1 })
.then((res) => {
console.log(res);
this.upOptionsOta = res.data;
})
.catch((err) => {});
},
selectChangedOta(val) {
console.log(val);
// object
this.selectUpObjOta = this.upOptionsOta.find((item) => {
return item["path"] === val;
});
console.log(this.selectUpObj);
},
//OTa
handleupgradationOta() {
this.$refs.upgradationRuleFormOta.validate((valid) => {
@ -2806,7 +3092,14 @@ export default {
}
});
},
//
logSetClick() {
this.logVisible = true;
},
saveLog() {
localStorage.setItem("logset", JSON.stringify(this.logset));
this.logVisible = false;
},
saveLocalStorage() {
localStorage.setItem("gycheck", this.gycheck);
localStorage.setItem("dccheck", this.dccheck);
@ -3444,4 +3737,44 @@ export default {
margin-right: 4px;
}
}
.logSetDialog {
.logSet {
// width: 300px;
// border: 1px solid #eee;
padding: 12px;
.logMain {
.top,
.bottom {
display: flex;
align-items: center;
h2 {
font-size: 14px;
font-weight: normal;
margin-right: 8px;
text-align: right;
width: 100px;
}
.el-input--small {
width: 296px;
}
.days {
margin-left: 12px;
}
}
.top {
margin-bottom: 20px;
}
.savebtn {
display: flex;
margin-top: 12px;
margin-left: auto;
}
}
.el-radio-group {
width: 100%;
margin-top: 20px;
text-align: center;
}
}
}
</style>

@ -51,27 +51,6 @@
>
</div>
</div>
<div class="logSet">
<h4>日志设置</h4>
<div class="logMain">
<div class="top">
<h2>noSpecData</h2>
<el-input
v-model="logset.noSpecData"
placeholder="请输入内容"
></el-input>
<!-- <b>(不上传specdata日志 默认为0)</b> -->
</div>
<div class="bottom">
<h2>mTime</h2>
<el-input v-model="logset.mTime" placeholder="请输入内容"></el-input>
<!-- <b>(日志最后修改时间为多少秒以内 默认为0)</b> -->
</div>
<el-button type="primary" class="savebtn" @click="saveLog"
>保存</el-button
>
</div>
</div>
</div>
</template>
<script>
@ -88,23 +67,11 @@ export default {
dahan: "",
m2m10086: "",
lwwlkj: "",
logset: {
noSpecData: 0,
mTime: 0,
},
};
},
computed: {},
watch: {},
created() {
let logSetparam = JSON.parse(localStorage.getItem("logset"));
if (logSetparam !== null) {
this.logset = logSetparam;
} else {
this.logset = { noSpecData: 0, mTime: 0 };
}
},
created() {},
mounted() {
this.getAuthfn();
},
@ -169,10 +136,6 @@ export default {
refresh() {
this.getAuthfn();
},
saveLog() {
localStorage.setItem("logset", JSON.stringify(this.logset));
},
},
};
</script>
@ -202,32 +165,5 @@ export default {
}
}
}
.logSet {
width: 300px;
border: 1px solid #eee;
padding: 12px;
.logMain {
.top,
.bottom {
display: flex;
align-items: center;
h2 {
font-size: 14px;
font-weight: normal;
margin-right: 8px;
text-align: right;
width: 100px;
}
}
.top {
margin-bottom: 20px;
}
.savebtn {
display: flex;
margin-top: 12px;
margin-left: auto;
}
}
}
}
</style>

@ -274,6 +274,7 @@ export default {
dl_file: "推送大文件",
upd_cfg: "修改配置文件",
list_files: "列出目录下的文件名",
yw_app_upd_ota: "App增量更新",
},
cmdtimer: null,
endtimer: null,

Loading…
Cancel
Save