Compare commits

..

No commits in common. 'master' and 'jcbranch' have entirely different histories.

File diff suppressed because it is too large Load Diff

@ -1,176 +0,0 @@
@charset "utf-8";
/*
* @Author: Larry
* @Date: 2016-12-15 17:20:54
* @Last Modified by: qinsh
* @Last Modified time: 2016-12-20 18:06:40
* +----------------------------------------------------------------------
* | LarryBlogCMS [ LarryCMS ]
* | Copyright (c) 2016-2017 http://www.larrycms.com All rights reserved.
* | Licensed ( http://www.larrycms.com/licenses/ )
* | Author: qinshouwei <313492783@qq.com>
* +----------------------------------------------------------------------
*/
/* 公共样式 */
body {
background: #f1f2f7;
/*overflow-x:hidden;*/
padding: 0px;
}
.larry-personal {
margin: 0 auto;
background: #ffffff;
border-radius: 3px;
padding-bottom: 0px;
border: none;
}
header.larry-personal-tit {
width: 100%;
height: 50px;
border-bottom: 1px solid #eeeff1;
padding: 0 20px;
padding-left: 30px;
}
header.larry-personal-tit span {
line-height: 50px;
font-size: 14px;
color: #858585;
font-weight: 300;
}
.larry-personal-body {
padding: 8px 10px 8px 10px;
}
.layui-form {
padding: 0px;
}
/* 个人信息 */
.layui-form .layui-form-item label.layui-form-label {
width: 180px;
font-family: "Microsoft YaHei";
}
.layui-input-block {
margin-left: 200px;
}
.layui-disabled {
background: #eeeeee;
color: #595963 !important;
}
.layui-disabled:hover {
color: #595963 !important;
}
.layui-input-block textarea {
height: 90px;
}
/* 修改密码 */
.changepwd {
padding-bottom: 150px;
}
.change-submit {
margin-top: 20px;
}
/* 日志管理 */
.layui-elem-quote {
background: #ffffff;
border-bottom: 1px solid #e2e2e2;
margin-bottom: 0px;
}
.larry-separate {
background: #f2f2f2;
width: 100%;
height: 10px;
}
.mylog-info-tit .layui-tab-title {
border: none;
}
.mylog-info-tit .layui-tab-title li {
color: #ffffff;
border-radius: 3px;
margin-right: 10px;
}
.mylog-info-tit .layui-tab-title li i {
padding-right: 5px;
}
.mylog-info-tit .layui-tab-title li.layui-this {
background: #ff5722;
border: none;
border-radius: 3px;
}
.larry-log-del {
display: inline-block;
width: 100px;
height: 38px;
float: right;
color: #ffffff;
line-height: 38px;
text-align: center;
}
.larry-log-del i {
display: inline-block;
font-size: 16px;
}
.mylog-info-box .layui-tab-content {
margin: 0px;
padding: 0px;
}
.mylog-info-box .layui-tab-content .layui-tab-item {
margin: 0px;
padding: 0px;
width: 100%;
}
.mylog-info-box {
padding-top: 15px;
padding-bottom: 20px;
}
.mylog-info-box .layui-tab-item {
/* border: 1px solid red; */
}
.layui-field-box .layui-table {
margin-top: 0px;
border: 1px solid #e2e2e2;
}
.layui-field-box .layui-table tr th,
.layui-field-box .layui-table tr td {
text-align: center;
/* padding: 0px; */
}
.layui-field-box .layui-table tr th:first-child,
.layui-field-box .layui-table tr td:first-child {
width: 40px;
padding: 0px;
}
.layui-field-box .layui-table tr th:nth-child(2) {
padding: 0px;
text-align: left;
text-indent: 5px;
}
.layui-field-box .layui-table tr td:nth-child(2) {
padding: 0px;
text-align: left;
}
.table-hover tbody tr:hover {
background-color: #eeeeee;
}
.layui-btn i {
padding-right: 5px;
}
.larry-table-page {
width: 100%;
height: 50px;
padding-top: 6px;
}
.larry-table-page .layui-btn {
display: block;
float: left;
}
.larry-table-page .page {
padding-left: 15px;
float: left;
}
.larry-table-page .page .layui-laypage {
padding: 0px;
margin: 0px;
}
.layui-table {
margin: 1px 0;
}

File diff suppressed because it is too large Load Diff

@ -13,11 +13,7 @@ export default {
this.initWebSocket();
window.addEventListener("onmessageWS", this.getSocketData);
},
data() {
return {
recentAlerts: [], //
};
},
methods: {
...mapActions("cache", ["addCache", "removeCache"]),
//
@ -60,39 +56,12 @@ export default {
},
getSocketData(res) {
console.log(res);
const newAlert = res.detail.data;
//
this.recentAlerts.push(newAlert);
// 3
if (this.recentAlerts.length > 3) {
this.recentAlerts.shift(); //
}
// 使
this.showAlerts();
// this.$notify({
// title: "",
// message: res.detail.data,
// position: "bottom-right",
// type: "warning",
// duration: 0,
// });
},
showAlerts() {
//
this.recentAlerts.forEach((alert, index) => {
// 便
setTimeout(() => {
this.$notify({
title: "告警",
message: alert,
message: res.detail.data,
position: "bottom-right",
type: "warning",
duration: 0, // 0
});
}, index * 1000); // 1
duration: 0,
});
},
},

@ -267,20 +267,3 @@ export function getPermissionTree(data) {
params: data,
});
}
//查询当前装置的iccid
export function getSimcardApi(data) {
return request({
url: "/xymanager/terminal/getSimcard",
method: "get",
params: data,
});
}
//修改当前装置的iccic
export function updateSimcardApi(data) {
return request({
url: "/xymanager/terminal/updateSimcard",
method: "post",
data,
});
}

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

@ -11,18 +11,6 @@
></el-input>
<p class="redErr" v-if="titleFlag">*</p>
</div>
<div class="noteBox">
<h3 class="lableBox">是否告警</h3>
<el-select v-model="activityForm.warnVal">
<el-option
v-for="item in warnOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</div>
<div class="upgradeBox">
<h3 class="lableBox">装置列表</h3>
<el-input
@ -81,12 +69,6 @@
}}%
</template>
</el-table-column>
<el-table-column prop="status" label="告警通知">
<template slot-scope="scope">
<span v-if="scope.row.status == 1"></span>
<span v-if="scope.row.status == 2"></span>
</template>
</el-table-column>
<!-- <el-table-column prop="path" label="文件路径"> </el-table-column> -->
<el-table-column label="操作" width="300" class-name="editClass">
<template slot-scope="scope">
@ -179,21 +161,9 @@ export default {
data() {
return {
activityloading: true,
warnOptions: [
{
value: 1,
label: "不通知",
},
{
value: 2,
label: "通知",
},
],
activityData: [], //
activityForm: {
title: "",
warnVal: 1,
cmdidArr: "",
},
cmdObjects: [], //
@ -301,7 +271,6 @@ export default {
this.termsLoading = true;
this.termsData = row.terms;
this.activityNameTitle = row.title;
this.activityName = row.title + "(" + row.terms.length + ")";
this.termsData = row.terms;
},
@ -344,7 +313,6 @@ export default {
console.log(row);
this.ActibityId = row.id;
this.activityForm.title = row.title;
this.activityForm.warnVal = row.status;
const columnData = row.terms.map((item) => item.cmdid);
this.activityForm.cmdidArr = columnData.join("\n");
},
@ -365,7 +333,6 @@ export default {
actParams = {
id: this.ActibityId,
title: this.activityForm.title,
status: this.activityForm.warnVal,
terms: this.cmdObjects,
};
updActiveApi(actParams)
@ -374,7 +341,6 @@ export default {
this.getactivityList();
this.activityForm.title = "";
this.activityForm.cmdidArr = "";
this.activityForm.warnVal = 1;
this.ActibityId = "";
})
.catch((err) => {});
@ -384,7 +350,6 @@ export default {
actParams = {
title: this.activityForm.title,
terms: this.cmdObjects,
status: this.activityForm.warnVal,
};
addActiveApi(actParams)
.then((res) => {
@ -392,7 +357,6 @@ export default {
this.getactivityList();
this.activityForm.title = "";
this.activityForm.cmdidArr = "";
this.activityForm.warnVal = 1;
this.ActibityId = "";
})
.catch((err) => {});
@ -417,9 +381,6 @@ export default {
.noteClass {
width: 100%;
}
.el-select {
width: 100%;
}
.lableBox {
font-size: 14px;
font-weight: normal;

@ -1,189 +0,0 @@
<template>
<el-dialog
class="changeIccicDialog"
title="修改ICCID"
:visible.sync="isShow"
:close-on-click-modal="false"
width="680px"
>
<el-form
label-position="left"
label-width="92px"
ref="formLineInfo"
:model="formdata"
>
<div class="left">
<el-form-item label="网络类型:" prop="type1">
<el-select v-model="formdata.type1" placeholder="请选择">
<el-option
v-for="item in networkOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="ICCID1" prop="iccid1">
<el-input placeholder="请输入iccid1" v-model="formdata.iccid1">
</el-input>
</el-form-item>
<el-form-item label="imsi1" prop="imsi1">
<el-input placeholder="请输入imsi1" v-model="formdata.imsi1">
</el-input>
</el-form-item>
<el-form-item label="msisdn1" prop="msisdn1">
<el-input placeholder="请输入msisdn1" v-model="formdata.msisdn1">
</el-input>
</el-form-item>
<el-form-item label="sim1" prop="sim1">
<el-input placeholder="请输入sim1" v-model="formdata.sim1">
</el-input>
</el-form-item>
</div>
<div class="right">
<el-form-item label="网络类型:" prop="type2">
<el-select v-model="formdata.type2" placeholder="请选择">
<el-option
v-for="item in networkOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="ICCID2" prop="iccid2">
<el-input placeholder="请输入iccid2" v-model="formdata.iccid2">
</el-input>
</el-form-item>
<el-form-item label="imsi2" prop="imsi2">
<el-input placeholder="请输入imsi2" v-model="formdata.imsi2">
</el-input>
</el-form-item>
<el-form-item label="msisdn2" prop="msisdn2">
<el-input placeholder="请输入msisdn2" v-model="formdata.msisdn2">
</el-input>
</el-form-item>
<el-form-item label="sim2" prop="sim2">
<el-input placeholder="请输入sim2" v-model="formdata.sim2">
</el-input>
</el-form-item>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="isShow = false"> </el-button>
<el-button type="primary" @click="submitForm()"> </el-button>
</div>
</el-dialog>
</template>
<script>
import { getSimcardApi, updateSimcardApi } from "@/utils/api/index";
export default {
props: {},
data() {
return {
isShow: false,
termInfo: "",
formdata: {},
networkOptions: [
{
id: -1,
name: "未绑定",
},
{
id: 1,
name: "大汉移动",
},
{
id: 2,
name: "公田移动rabchase",
},
{
id: 3,
name: "公田m2m10086",
},
{
id: 4,
name: "安徽",
},
], //
};
},
computed: {},
methods: {
getsimCard() {
getSimcardApi({
termId: this.termInfo.id,
})
.then((res) => {
console.log(res);
if (res.code == 200 && res.data !== null) {
this.formdata = res.data;
} else {
this.formdata = {};
}
})
.catch((err) => {});
},
//
submitForm() {
console.log(this.formdata);
this.$refs.formLineInfo.validate((valid) => {
if (valid) {
console.log(this.formdata);
this.formdata.termId = this.termInfo.id;
updateSimcardApi(this.formdata)
.then((res) => {
console.log(res);
if (res.code == 200) {
this.isShow = false;
this.$message({
duration: 1500,
showClose: true,
message: "修改成功",
type: "success",
});
} else {
this.$message({
duration: 1500,
showClose: true,
message: res.msg,
type: "error",
});
}
})
.catch((err) => {});
} else {
console.log("error submit!!");
return false;
}
});
},
display(val) {
console.log(val);
this.termInfo = val;
this.isShow = true;
this.getsimCard();
},
hide() {
this.isShow = false;
this.formdata = {};
},
},
};
</script>
<style lang="less">
.changeIccicDialog {
.el-form {
display: flex;
justify-content: space-between;
}
.el-select {
width: 100%;
}
}
</style>

@ -13,9 +13,9 @@
<el-descriptions-item label="装置编号">{{
termInfo.cmdid
}}</el-descriptions-item>
<!-- <el-descriptions-item label="iccid">{{
<el-descriptions-item label="iccid">{{
termInfo.iccid
}}</el-descriptions-item> -->
}}</el-descriptions-item>
<el-descriptions-item label="运营商">{{
msgCompany
}}</el-descriptions-item>
@ -23,9 +23,6 @@
termInfo.protocolName
}}</el-descriptions-item>
</el-descriptions>
<el-button type="primary" icon="el-icon-refresh" @click="refreshClick"
>刷新</el-button
>
</div>
<div class="tableBox">
@ -125,6 +122,10 @@
style="width: 100%; height: 380px; border: none"
class="iframeBox"
></iframe>
<!-- <iframe
src="/wulw/message/history"
style="width: 100%; height: 500px; border: none"
></iframe> -->
</div>
</div>
</div>
@ -134,8 +135,6 @@
</el-dialog>
</template>
<script>
import { refresh } from "less";
export default {
props: ["msgListData", "msgCompany", "multipleSelection", "msgtype"],
components: {},
@ -155,7 +154,6 @@ export default {
console.log(this.multipleSelection);
this.msgisShow = true;
this.termInfo = this.multipleSelection[0];
console.log("aaaaaaaa", this.msgtype);
//
if (this.msgtype == 4) {
// DOM
@ -163,8 +161,10 @@ export default {
// HTML
const doc = parser.parseFromString(this.msgListData, "text/html");
console.log(doc);
// <div>
const divToRemove = doc.getElementsByClassName("larry-personal");
while (divToRemove.length > 0) {
// elements[elements.length - 1]
//
@ -175,7 +175,7 @@ export default {
// HTML
console.log(doc.documentElement.outerHTML);
//console.log(this.msgListData);
let modifiedHtml = doc.documentElement.outerHTML
this.modifiedMsgListData = doc.documentElement.outerHTML
.replace(
/\/wulw\/static\/layui\/css\/layui\.css\?v=26/g,
"https://www.lwwlkj.com/wulw/static/layui/css/layui.css?v=26"
@ -193,17 +193,11 @@ export default {
"https://www.lwwlkj.com/wulw/static/css/global.css?v=26"
);
console.log(this.modifiedMsgListData);
this.$nextTick(() => {
this.modifiedMsgListData = modifiedHtml;
});
}
},
refreshClick() {
this.$parent.handlemsgList();
},
handleclose() {
this.msgisShow = false;
this.modifiedMsgListData = "";
},
},
};
@ -215,12 +209,6 @@ export default {
.msgTbale {
.msgHead {
margin-bottom: 8px;
width: 50%;
display: flex;
align-items: center;
}
.el-button {
margin-left: 12px;
}
}
.tableBox {
@ -232,7 +220,7 @@ export default {
}
.anhui {
iframe {
//background-color: #fcc;
background-color: #fcc;
.larry-personal {
display: none;
}

@ -19,12 +19,6 @@
<el-form-item>
<el-button type="primary" @click="sendMsg"></el-button>
</el-form-item>
<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">
@ -710,11 +704,6 @@
<span> {{ scope.row.mntnStatus.lastIp }}</span>
</template>
</u-table-column>
<u-table-column label="算法" width="120">
<template slot-scope="scope">
<span> {{ scope.row.mntnStatus.reportMap.night415 }}</span>
</template>
</u-table-column>
<u-table-column
label="备注"
v-if="notecheck"
@ -925,105 +914,7 @@
<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升级文件"
@ -1064,7 +955,6 @@
>
</div>
</el-dialog>
<!-- 开启frpc服务器 -->
<el-dialog
title="设置frpc"
@ -1328,11 +1218,6 @@
<el-button type="primary" @click="handlemsgList"></el-button>
</div>
</el-dialog>
<!-- 修改ICCID -->
<editIccid
ref="iccidRef"
:multipleSelection="multipleSelection"
></editIccid>
<!-- 短信接收记录 -->
<msgList
@ -1379,50 +1264,6 @@
<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>上传规约报文</h2>
<!-- <el-input
v-model="logset.noSpecData"
placeholder="请输入内容"
></el-input> -->
<el-radio-group v-model="logset.noSpecData">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
<!-- <b>(不上传specdata日志 默认为0)</b> -->
</div>
<div class="bottom">
<h2>日志时长</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>
@ -1436,7 +1277,6 @@ import {
msglistApi,
} from "@/utils/api/index";
import rowMsgDialog from "./rowMsgDialog.vue";
import editIccid from "./editIccid.vue";
import msgList from "./msglist.vue";
import config from "./setConfig/config";
import htmlToExcel from "@/utils/htmlToExcel";
@ -1456,7 +1296,6 @@ export default {
rowMsgDialog,
msgList,
config,
editIccid,
},
data() {
//ip
@ -1501,7 +1340,6 @@ export default {
pull_files: "拉取文件",
push_file: "推送文件",
dl_file: "推送大文件",
yw_app_upd_ota: "App增量更新",
},
taskdrawer: false,
drawer: false,
@ -1618,42 +1456,7 @@ 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: "",
@ -1800,14 +1603,6 @@ 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: "通道拍照配置",
@ -1848,20 +1643,12 @@ 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文件",
},
],
pullpathOption: [
// {
// name: "/sdcard/com.xypower.mpapp/data/App.json",
// desc: "MpAPP",
// },
{
name: "/sdcard/com.xypower.mpapp/data/App.json",
desc: "MpAPP全局配置",
},
{
name: "/sdcard/com.xypower.mpapp/data/recog.json",
desc: "AI全局配置",
@ -1870,14 +1657,6 @@ 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: "通道拍照配置",
@ -1918,14 +1697,6 @@ 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
@ -2021,24 +1792,8 @@ export default {
desc: "系统日志目录",
},
],
//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);
@ -2537,14 +2292,14 @@ export default {
if (logSetparam !== null) {
console.log(logSetparam);
} else {
logSetparam = { noSpecData: 0, mTime: 345600 };
logSetparam = { noSpecData: 0, mTime: 0 };
}
var params = {
action: "yw_cmd_upload_i1_zip_log",
//url: "http://180.166.218.222:40101/upload/",
termIds: this.idArray,
noSpecData: Number(logSetparam.noSpecData),
mtime: Number(logSetparam.mTime),
mTime: Number(logSetparam.mTime),
};
this.changeIssue(params);
return;
@ -2614,12 +2369,6 @@ export default {
console.log("查看目录文件");
this.fileContentVisible = true;
return;
case 17:
console.log("app增量更新");
this.appVisible = true;
this.getUpgradeAppList();
// this.getUpgradeList();
return;
}
},
//
@ -2636,21 +2385,6 @@ export default {
return;
}
},
//editIccidICCICD
editIccid() {
if (this.idArray.length == 1) {
console.log(this.multipleSelection[0]);
this.$refs.iccidRef.display(this.multipleSelection[0]);
} else {
this.$message({
duration: 1500,
showClose: true,
message: "最多选中一个设备",
type: "warning",
});
return;
}
},
handleSend(item) {
console.log(item);
this.sendForm.msginfo = item.value;
@ -2661,7 +2395,6 @@ export default {
termIdList: this.idArray,
content: this.sendForm.msginfo,
};
console.log(params);
sendMsgApi(params)
.then((res) => {
console.log(res);
@ -2690,9 +2423,7 @@ export default {
this.msgListData = res.data.data;
this.msgCompany = this.companyMap[res.data.type];
this.msgtype = res.data.type;
this.$nextTick(() => {
this.$refs.msglistRef.display();
});
} else {
this.$message({
duration: 1500,
@ -2781,11 +2512,20 @@ 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
@ -2794,6 +2534,15 @@ 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) => {
@ -2810,80 +2559,6 @@ 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) => {
@ -3096,14 +2771,7 @@ 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);
@ -3741,50 +3409,4 @@ 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: 108px;
}
.el-input--small {
width: 272px;
}
.days {
margin-left: 12px;
}
}
.top {
margin-bottom: 20px;
.el-radio-group {
width: 74%;
margin-top: 0px !important;
text-align: left;
margin-left: 6px;
}
}
.savebtn {
display: flex;
margin-top: 12px;
margin-left: auto;
}
}
.el-radio-group {
width: 100%;
margin-top: 20px;
text-align: center;
}
}
}
</style>

@ -79,14 +79,18 @@
</el-select>
</el-form-item>
<el-form-item label="规约" class="gybox">
<el-select v-model="formdata.protocol" @change="changeprotocol">
<el-select
v-model="formdata.protocol"
filterable
@keyup.enter.native="onSubmit()"
>
<el-option
v-for="item in protocolOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
{{ item.name }} - {{ item.id }}
{{ item.name }}-{{ item.id }}
</el-option>
</el-select>
</el-form-item>
@ -223,7 +227,7 @@
@keyup.enter.native="onSubmit()"
v-model="formdata.activityId"
filterable
@change="changeActive2"
@change="changeActive"
>
<el-option
v-for="item in activityOptions"
@ -498,7 +502,6 @@ export default {
getProtocolList()
.then((res) => {
console.log(res);
this.protocolOptions = [{ id: -1, name: "全部" }];
this.protocolOptions = this.protocolOptions.concat(res.data.list);
this.formdata.protocol = this.protocolOptions[0].id;
})
@ -525,20 +528,11 @@ export default {
})
.catch((err) => {});
},
changeprotocol(val) {
console.log(val);
this.formdata.protocol = val;
},
changeActive(val) {
console.log(this.activityOptions);
console.log(val);
localStorage.setItem("activeId", JSON.stringify(val));
},
changeActive2(val) {
console.log(this.activityOptions);
console.log(val);
localStorage.setItem("activeId", JSON.stringify(val));
},
onSubmit() {
this.tableLoaidng = true;

@ -51,6 +51,27 @@
>
</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>
@ -67,11 +88,23 @@ export default {
dahan: "",
m2m10086: "",
lwwlkj: "",
logset: {
noSpecData: 0,
mTime: 0,
},
};
},
computed: {},
watch: {},
created() {},
created() {
let logSetparam = JSON.parse(localStorage.getItem("logset"));
if (logSetparam !== null) {
this.logset = logSetparam;
} else {
this.logset = { noSpecData: 0, mTime: 0 };
}
},
mounted() {
this.getAuthfn();
},
@ -136,6 +169,10 @@ export default {
refresh() {
this.getAuthfn();
},
saveLog() {
localStorage.setItem("logset", JSON.stringify(this.logset));
},
},
};
</script>
@ -165,5 +202,32 @@ 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>

@ -150,32 +150,8 @@
>apk版本{{ item.cmdMap.fileName }}</b
>
<b v-else>cmd{{ item.cmdMap }}</b>
<el-popover
placement="left"
trigger="click"
popper-class="lookPopover"
>
<p>createTime:{{ item.createTime }}</p>
<p>publishTime:{{ item.publishTime }}</p>
<p>resTime:{{ item.resTime }}</p>
<p v-if="item.name !== 'list_files'">{{ item.content }}</p>
<ul v-else>
<li
v-for="(item, index) in JSON.parse(item.content)"
:key="index"
>
{{ index + 1 }}.文件名: {{ item.n }} 大小:
{{ formatSize(item.s) }}
修改时间:
{{ formatDate(item.m) }}
</li>
</ul>
<!-- <el-table
v-else
:data="JSON.parse(item.content)"
height="520px"
>
<el-popover placement="left" width="480" trigger="click">
<el-table :data="JSON.parse(item.content)" height="520px">
<el-table-column
property="n"
label="名称"
@ -197,13 +173,13 @@
{{ $moment(scope.row.m).format("YYYY-MM-DD HH:mm:ss") }}
</template>
</el-table-column>
</el-table> -->
</el-table>
<el-button
type="parimary"
size="mini"
v-if="item.content !== null"
slot="reference"
>查看内容</el-button
>查看目录</el-button
>
</el-popover>
</span>
@ -274,7 +250,6 @@ export default {
dl_file: "推送大文件",
upd_cfg: "修改配置文件",
list_files: "列出目录下的文件名",
yw_app_upd_ota: "App增量更新",
},
cmdtimer: null,
endtimer: null,
@ -302,21 +277,6 @@ export default {
},
methods: {
formatDate(timestamp) {
//
const date = new Date(timestamp);
return date.toLocaleString();
},
formatSize(bytes) {
if (bytes === 0) return "0 B";
const units = ["B", "KB", "MB", "GB", "TB"];
const k = 1024; // 1 KB = 1024 B
const i = Math.floor(Math.log(bytes) / Math.log(k)); //
//
return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + " " + units[i];
},
getCmdOptionsFun() {
getCmdActionApi()
.then((res) => {
@ -410,7 +370,6 @@ export default {
//this.endCommand = res.data;
//this.endCommand = res.data.list
this.rightCommand = res.data.list;
//
this.rightComLoading = false;
this.updateTime = new Date();
@ -665,16 +624,4 @@ export default {
}
}
}
.lookPopover {
height: 460px;
width: 540px;
overflow-y: auto;
overflow-x: hidden;
ul {
li {
margin-bottom: 4px;
list-style: none;
}
}
}
</style>

Loading…
Cancel
Save