flx:优化界面
This commit is contained in:
parent
91ca8b345f
commit
0bc3ed9dcb
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "zhgdyun",
|
||||
"version": "1.0.0",
|
||||
"version": "1.0.1",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"start": "npm run dev",
|
||||
@ -121,4 +121,4 @@
|
||||
"last 2 versions",
|
||||
"not dead"
|
||||
]
|
||||
}
|
||||
}
|
||||
BIN
src/assets/images/login-tips.png
Normal file
BIN
src/assets/images/login-tips.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 204 KiB |
@ -533,6 +533,30 @@
|
||||
</div> -->
|
||||
</div>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
:modal-append-to-body="false"
|
||||
:visible.sync="tipsLoginDialog"
|
||||
class="dialog_w667 tips_login"
|
||||
>
|
||||
<div slot="title" class="header-title">
|
||||
<img src="@/assets/images/login-tips.png" alt="" />
|
||||
</div>
|
||||
<div class="dialog_content">
|
||||
<div class="tips-header">温馨提示:局域网方式</div>
|
||||
<div class="tips-content">
|
||||
为保证包头公司管理网安全,请拔除网线,WIFI访问!
|
||||
</div>
|
||||
<div class="dialog-footer">
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
size="medium"
|
||||
@click="tipsLoginDialog = false"
|
||||
>确定
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -569,6 +593,8 @@ export default {
|
||||
cardDialog2: false,
|
||||
equipmentBgImg: "",
|
||||
|
||||
tipsLoginDialog: true,
|
||||
|
||||
firstLoginDialog: false,
|
||||
isLoadingBtn: false,
|
||||
isShowContent: false,
|
||||
@ -736,22 +762,6 @@ export default {
|
||||
this.company = COMPANY;
|
||||
this.projectType = PROJECT_TYPE;
|
||||
const encryption = window.localStorage.getItem("encryption");
|
||||
|
||||
// 打包客户端的时候要打开此注释,打包客户端的时候要打开此注释
|
||||
this.$nextTick(() => {
|
||||
// 检测Electron环境
|
||||
// this.$alert(versionData);
|
||||
console.log("Electron应用");
|
||||
if (
|
||||
window.__isElectron ||
|
||||
navigator.userAgent.includes("Electron") ||
|
||||
(typeof process !== "undefined" && process.versions?.electron)
|
||||
) {
|
||||
this.$alert("请拔掉网线,使用局域网wifi访问!");
|
||||
this.viewVersionInfo();
|
||||
}
|
||||
});
|
||||
|
||||
if (encryption) {
|
||||
const form = JSON.parse(encryption);
|
||||
const decrypted = CryptoJS.AES.decrypt(
|
||||
@ -812,6 +822,22 @@ export default {
|
||||
this.$store.commit("setUid", false);
|
||||
this.getDetail(this.headquartersSnData);
|
||||
this.getData();
|
||||
// 打包客户端的时候要打开此注释,打包客户端的时候要打开此注释
|
||||
this.$nextTick(() => {
|
||||
// 检测Electron环境
|
||||
// this.$alert(versionData);
|
||||
console.log("Electron应用");
|
||||
// this.$alert("请拔掉网线,使用局域网wifi访问!");
|
||||
this.tipsLoginDialog = true;
|
||||
if (
|
||||
window.__isElectron ||
|
||||
navigator.userAgent.includes("Electron") ||
|
||||
(typeof process !== "undefined" &&
|
||||
process.versions?.electron)
|
||||
) {
|
||||
this.viewVersionInfo();
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@ -1767,6 +1793,52 @@ export default {
|
||||
};
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
/deep/ .tips_login {
|
||||
.el-dialog {
|
||||
margin-top: 0 !important;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
}
|
||||
.el-dialog__header {
|
||||
padding: 0;
|
||||
.header-title {
|
||||
width: 100%;
|
||||
height: 157px;
|
||||
> img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-dialog__body {
|
||||
padding: 20px;
|
||||
.dialog_content {
|
||||
padding: 0;
|
||||
}
|
||||
}
|
||||
.tips-header {
|
||||
font-size: 16px;
|
||||
color: #171717;
|
||||
padding-left: 10px;
|
||||
position: relative;
|
||||
}
|
||||
.tips-header::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
width: 3px;
|
||||
height: 80%;
|
||||
left: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
background-color: #5181f6;
|
||||
}
|
||||
.tips-content {
|
||||
font-size: 18px;
|
||||
color: #ff0000;
|
||||
margin-top: 20px;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
.first_login {
|
||||
.el-dialog__body {
|
||||
padding: 20px;
|
||||
|
||||
@ -4284,12 +4284,12 @@ export default {
|
||||
// downloadUrl[0].url
|
||||
// "http://192.168.34.133:20626/#/pages/homePage/scandownload?url=http://219.147.96.219:9809/image/67cd55cd4f0c9e0977d25778.apk"
|
||||
this.bindQRCode(
|
||||
`http://219.147.96.219:19999/#/pages/homePage/scandownload?url=${downloadUrl[0].url}`,
|
||||
`http://192.168.3.9:39809/app/#/pages/homePage/scandownload?url=${downloadUrl[0].url}`,
|
||||
this.$refs.qrCodeDiv1,
|
||||
'qrCode1'
|
||||
);
|
||||
this.bindQRCode1(
|
||||
`http://219.147.96.219:19999/#/pages/homePage/scandownload?url=${downloadUrl[0].url}`,
|
||||
`http://192.168.3.9:39809/app/#/pages/homePage/scandownload?url=${downloadUrl[0].url}`,
|
||||
this.$refs.qrCodeDiv3,
|
||||
'qrCode3'
|
||||
);
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
node-key="id"
|
||||
ref="treeNode"
|
||||
label="name"
|
||||
:expand-on-click-node="false"
|
||||
:expand-on-click-node="true"
|
||||
:default-expand-all="false"
|
||||
@node-click="changeTreeVideo"
|
||||
>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user