Skip to content

E
electron-printer
Commit d2185f56 by zhuzhequan
Options

添加清除缓存功能

parent d9e2351d
Showing with 112 additions and 52 deletions
package.json
......@@ -2,7 +2,7 @@
"name": "JomallProductionAssistant",
"productName": "JomallProductionAssistant",
"description": "",
"version": "1.0.1",
"version": "1.0.2",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
......
src/utils/axios.js
......@@ -26,6 +26,7 @@ function endLoading() {
// Add a request interceptor
service.interceptors.request.use(
config => {
console.log(Vue.prototype.$dataStore);
const user = Vue.prototype.$dataStore.get("user");
const company = Vue.prototype.$dataStore.get("company");
if (user) {
......
src/views/design/head/index.vue
......@@ -6,8 +6,9 @@ import { grid } from "../data";
import pkg from "../../../../package.json";
import UpdateDialog from "@/views/design/updateDialog.vue";
export default {
components: { PrintDialog,UpdateDialog },
components: { PrintDialog, UpdateDialog },
props: {
user: {
default: {
......@@ -22,10 +23,34 @@ export default {
},
data() {
return {
checkList: [],
cacheList: [
{
label: "清除当前登录信息",
value: "token"
},
{
label: "登录记录",
value: "userList"
},{
label: "公司信息",
value: "company"
}, {
label: "打印预设",
value: "print-setting"
}, {
label: "系统授权信息",
value: "deviceId"
}, {
label: "系统设置",
value: "setting"
}
],
selectGridIndex: 0,
pkg,
actionIndex: -1,
isAutoFinish: false,
cacheVisible: false,
showPrintDialog: false,
productionNo: "",
setting: {
......@@ -62,7 +87,7 @@ export default {
avatar() {
if (this.user && this.user.avatar && this.company.domain) {
console.log(this.user, 9);
console.log(this.company,8);
console.log(this.company, 8);
let host = this.company.domain;
if (host.includes("console")) {
host = host.replace(".jomalls.com", ".joshine.cn");
......@@ -107,8 +132,8 @@ export default {
if (data) {
// 有新版本更新
this.$refs.updateDialog.open(data);
}else{
this.$message.warning('已是最新版本')
} else {
this.$message.warning("已是最新版本");
}
});
},
......@@ -141,19 +166,9 @@ export default {
.catch(() => {
});
break;
case "clear":
// this.$confirm("是否清除缓存?", "提示", {
// confirmButtonText: "确定",
// cancelButtonText: "取消",
// type: "warning"
// }).then(() => {
// for (let k in this.$dataStore.store) {
// this.$dataStore.delete(k);
// }
// location.reload();
// }).catch(() => {
//
// });
case "cache":
this.checkList = [];
this.cacheVisible = true;
break;
}
},
......@@ -175,6 +190,36 @@ export default {
await this.setData(this.detail);
});
},
clearCache() {
if (this.checkList.length === 0) {
return this.$message.warning("请选择要清除的数据");
}
this.$confirm("是否确定清除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
for (let k of this.checkList) {
if (k === "print-setting" || k === "deviceId") {
let list = Object.keys(this.$dataStore.store).filter(el => el.includes(k));
list.forEach(el => {
this.$dataStore.delete(el);
});
}else if (k === "token" ) {
this.$dataStore.delete('token');
this.$dataStore.delete('user');
} else {
if (this.$dataStore.get(k)) {
this.$dataStore.delete(k);
}
}
}
window.location.reload();
})
.catch(() => {
});
},
async downloadImage() {
if (!this.detail || Object.keys(this.detail).length === 0)
return this.$message.warning("请扫描生产单号");
......@@ -522,12 +567,22 @@ export default {
<!-- <el-dropdown-item command="clear">清除缓存</el-dropdown-item>-->
<el-dropdown-item command="company">切换系统</el-dropdown-item>
<el-dropdown-item command="logout">退出登录</el-dropdown-item>
<el-dropdown-item command="cache">清除缓存</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
<update-dialog ref="updateDialog" />
<el-dialog :visible.sync="cacheVisible" title="清除缓存" width="700px">
<el-checkbox-group style="display: flex;flex-direction: column" v-model="checkList">
<el-checkbox style="margin-bottom: 10px" :label="item.value" v-for="(item,i) in cacheList"
:key="i">{{item.label}}</el-checkbox>
</el-checkbox-group>
<template #footer>
<el-button @click="cacheVisible =false">取消</el-button>
<el-button @click="clearCache" type="primary">清除</el-button>
</template>
</el-dialog>
</div>
</template>
......
src/views/login/index.vue
......@@ -4,7 +4,7 @@ export default {
return {
rules: {
company: [
{ message: "请选择客户名称", required: true, trigger: "change" },
{ validator:this.validatePass, message: "请检查客户名称", required: true, trigger: "blur" },
],
loginName: [
{ message: "请输入用户名", required: true, trigger: "blur" },
......@@ -33,7 +33,7 @@ export default {
this.company = this.$dataStore.get("company");
this.userList = this.$dataStore.get("userList") || [];
if (this.company) {
this.form.company = this.company.domain;
this.form.company = this.company.domain.replace('.jomalls.com','');
}
// if (user) {
......@@ -66,7 +66,7 @@ export default {
},
{
headers: {
company: this.form.company,
company: this.form.company +'.jomalls.com',
},
}
)
......@@ -75,7 +75,7 @@ export default {
this.authorityVisible = false;
this.$message.success("申请提交成功");
this.$dataStore.set(
this.form.company.replace('.jomalls.com','_') + "deviceId_" + this.form.loginName,
this.form.company + "_deviceId_" + this.form.loginName,
res.data.id
);
}
......@@ -109,10 +109,12 @@ export default {
if (!f.deviceId) {
f.deviceId = this.$dataStore.get(
f.company.replace('.jomalls.com','_') + "deviceId_" + this.form.loginName
f.company + "_deviceId_" + this.form.loginName
);
}
if(f.company){
f.company = f.company.includes('.jomalls.com')?f.company:f.company+'.jomalls.com'
}
if (!f.deviceId) delete f.deviceId;
let { data, code, message } = await this.$api.post("/login", f);
if (code === 411) {
......@@ -132,7 +134,7 @@ export default {
console.log(item, 111222);
this.$dataStore.set("user", data);
this.$dataStore.set("company", item);
console.log( this.$dataStore);
if (this.remember) {
let userList = this.$dataStore.get("userList");
......@@ -161,7 +163,7 @@ export default {
return;
}
console.log(this.userList, v);
this.form.company = this.userList[v].company;
this.form.company = this.userList[v].company.replace('.jomalls.com','');
this.form.loginName = this.userList[v].loginName;
this.form.password = this.userList[v].password;
this.form.deviceId = this.userList[v].deviceId;
......@@ -177,7 +179,7 @@ export default {
<template>
<div class="login">
<div class="form-content">
<el-form v-if="" ref="formRef" :rules="rules" size="small" :model="form">
<el-form ref="formRef" :rules="rules" size="small" :model="form">
<el-form-item v-if="userList.length > 0">
<el-select
@change="userChange"
......@@ -199,30 +201,32 @@ export default {
</el-select>
</el-form-item>
<el-form-item v-if="!company" prop="company">
<!-- <el-select prefix-icon="el-icon-monitor" v-model="form.company">-->
<!-- <el-option v-for="(it,i) in companyList" :key="i" :label="it.companyName" :value="it.domain.replace('.jomalls.com','')"></el-option>-->
<!-- </el-select>-->
<!--&lt;!&ndash; <el-input placeholder="客户（例如demo）" prefix-icon="el-icon-monitor" v-model="form.company"&ndash;&gt;-->
<!--&lt;!&ndash; clearable>&ndash;&gt;-->
<!--&lt;!&ndash; </el-input>&ndash;&gt;-->
<el-select
filterable
style="width: 100%"
placeholder="系统"
v-model="form.company"
clearable
>
<template slot="prefix">
<i class="el-icon-monitor"></i>
</template>
<el-option
v-for="(it, i) in companyList"
:key="i"
:label="it.companyName"
:value="it.domain"
></el-option>
</el-select>
<!-- <el-select prefix-icon="el-icon-monitor" v-model="form.company">-->
<!-- <el-option v-for="(it,i) in companyList" :key="i" :label="it.companyName" :value="it.domain.replace('.jomalls.com','')"></el-option>-->
<!-- </el-select>-->
<el-input placeholder="客户（例如demo）" prefix-icon="el-icon-monitor" v-model="form.company"
clearable>
<template #append>
.jomalls.com
</template>
</el-input>
<!-- <el-select-->
<!-- filterable-->
<!-- style="width: 100%"-->
<!-- placeholder="系统"-->
<!-- v-model="form.company"-->
<!-- clearable-->
<!-- >-->
<!-- <template slot="prefix">-->
<!-- <i class="el-icon-monitor"></i>-->
<!-- </template>-->
<!-- <el-option-->
<!-- v-for="(it, i) in companyList"-->
<!-- :key="i"-->
<!-- :label="it.companyName"-->
<!-- :value="it.domain"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item>
<el-form-item prop="loginName">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment