meswork/50-XiAn204-MacroinfManage_MES
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit 20220820

Browse Source
This commit is contained in:
LIUHAO
2022-08-20 18:01:20 +08:00
parent 60f15c3c88
commit 44e29b8242
10 changed files with 519 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/icons/svg/BasicVariableQuery.svg Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660966027988" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3431" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M170.666667 910.222222V113.777778h682.666666v455.111111h56.888889V56.888889H113.777778v910.222222h398.222222v-56.888889z" p-id="3432"></path><path d="M227.555556 568.888889h227.555555v56.888889H227.555556v-56.888889z m0-170.666667h568.888888v56.888889H227.555556V398.222222z m0-170.666666h341.333333v56.888888H227.555556V227.555556z" p-id="3433"></path><path d="M682.666667 625.777778c62.577778 0 113.777778 51.2 113.777777 113.777778s-51.2 113.777778-113.777777 113.777777-113.777778-51.2-113.777778-113.777777 51.2-113.777778 113.777778-113.777778m0-56.888889c-96.711111 0-170.666667 73.955556-170.666667 170.666667s73.955556 170.666667 170.666667 170.666666 170.666667-73.955556 170.666666-170.666666-73.955556-170.666667-170.666666-170.666667z" p-id="3434"></path><path d="M967.111111 967.111111l-164.977778-130.844444M794.737778 800.256l211.057778 164.067556-34.872889 44.942222-211.114667-164.067556z" p-id="3435"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

2
src/icons/svg/DistributionStation.svg Normal file
View File

@@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660956993972" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2452" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M1005.9 375.6c-0.1-0.1-0.2-0.3-0.3-0.4l-252.3-288.1c-12.2-14.6-29.4-23-47.5-23.1-0.1 0-0.2 0-0.3 0-18.1 0-35.4 8.4-47.8 23-11.1 12.6-17.1 29.5-17.1 47.6l0 121.5L544 256.1c-17.7 0-32 14.3-32 32s14.3 32 32 32l128.7 0c17.7 0 32-14.3 32-32l0-153.5c0-2.2 0.5-3.9 0.9-4.8l251.6 287.3c2.5 3.1 2.5 9.5 0 12.6l-251.4 287.4c-0.6-1.1-1.1-2.8-1.1-5.1L704.7 545.3c0-17.7-14.3-32-32-32L512 513.3 383.3 513.3 383.3 378.6c0-38.8-29.1-70.4-64.8-70.4-18.4 0-35.8 8.2-47.8 22.4L19.4 619.1c-0.1 0.1-0.2 0.2-0.3 0.3-22.7 26.8-22.7 68.7 0 95.5 0.1 0.2 0.3 0.4 0.5 0.5l251.2 284.1c12.2 14.6 29.4 23 47.4 23.1 0.1 0 0.2 0 0.3 0 18.1 0 35.4-8.4 47.8-23 11.1-12.6 17.1-29.5 17.1-47.6L383.4 832 482 832c17.7 0 32-14.3 32-32s-14.3-32-32-32L351.3 768c-17.7 0-32 14.3-32 32l0 152.2c0 2.2-0.5 3.9-0.9 4.8L67.8 673.5c-2.4-3.1-2.4-9.5 0-12.6L318.2 373.6c0.6 1.1 1.1 2.8 1.1 5.1l0 166.7c0 17.7 14.3 32 32 32L512 577.4l128.7 0 0 134.7c0 38.8 29.1 70.4 64.8 70.4 18.4 0 35.8-8.1 47.7-22.4l252.3-288.5c0.1-0.1 0.2-0.3 0.3-0.4C1028.6 444.4 1028.6 402.4 1005.9 375.6z" p-id="2453"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

119
src/views/BasicData/DistributionStation/index.vue Normal file
View File

@@ -0,0 +1,119 @@
<template>
<div class="app-container">
<el-card class="topCard">
<div class="topDiv">
<span style="margin-left: 10px">人员：</span>
<el-select v-model="peopleValue" placeholder="请选择人员" size="small" style="width: 150px" @change="getNumber();getNumberRight()">
<el-option
v-for="item in people"
:key="item.value"
:label="item.label"
:value="item.value"
size="mini"/>
</el-select>
<div style="margin-top: 10px;margin-left: 10px">
<el-transfer v-model="value" :data="data" :titles="titles" style="height: 700px"/>
</div>
</div>
</el-card>
</div>
</template>
<script>
import request from '@/utils/request'
export default {
data() {
return {
data: [],
value: [],
titles: ['可选工位', '分配工位'],
people: [], // 人员数组
peopleValue: '' // 人员信息
}
},
created() {
this.getPeople()
this.getNumber()
},
methods: {
// 初始化获取产品型号
getPeople() {
this.people = []
var param = []
var Data = this.CreateData('11', '人员名单_查询数据', param)
this.ExecDatabase(Data).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.people.push({
label: response.data[i].姓名,
value: response.data[i].考勤编号
})
}
})
},
getNumber() {
this.data = []
request({
url: '',
method: 'post',
data: {
type: '3',
name: `SELECT [工位号] FROM [dbo].[MES_计划BOM_工位与名称]`
}
}).then(response => {
if (response.data.length) {
for (let i = 0; i < response.data.length; i++) {
this.data.push({
label: response.data[i].工位号,
key: response.data[i].工位号,
disabled: this.peopleValue === ''
})
}
}
})
},
getNumberRight() {
this.value = []
request({
url: '',
method: 'post',
data: {
type: '3',
name: `SELECT dbo.MES_Web_User.Id,
dbo.MES_Web_User.UserId,
dbo.MES_Web_User.OpCode,
dbo.MES_Web_User.OpName,
dbo.MES_计划BOM_工位与名称.工位名称
FROM dbo.MES_计划BOM_工位与名称 INNER JOIN dbo.MES_Web_User
ON dbo.MES_计划BOM_工位与名称.工位代码 = dbo.MES_Web_User.OpCode
WHERE (MES_Web_User.UserId = ${this.peopleValue})`
}
}).then(response => {
console.log(response.data, 'response.data')
if (response.data.length) {
for (let i = 0; i < response.data.length; i++) {
this.value.push(
response.data[i].OpName
)
}
}
})
}
}
}
</script>
<style scoped>
.topCard{
margin: 5px;
height: 840px;
}
.topDiv{
margin-bottom: 10px;
}
/deep/.el-transfer-panel__list{
height: 700px;
}
/deep/.el-transfer-panel__body{
height: 700px;
}
</style>

12
src/views/BasicDataMaintenance/BasicVariableMaintenance/index.vue
View File

@@ -33,9 +33,9 @@
{{ scope.row.工位号 }}
</template>
</el-table-column>
<el-table-column label="IP" align="center">
<el-table-column label="PLC" align="center">
<template slot-scope="scope">
{{ scope.row.IP }}
{{ scope.row.PLC }}
</template>
</el-table-column>
<el-table-column disabled label="报警数" align="center">
@@ -62,8 +62,8 @@
</el-card>
<el-dialog :visible.sync="dialogFormVisible" :title="title" center style="min-height: 200px;" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="110px">
<el-form-item label="IP" prop="IP" style="display: inline-block">
<el-input v-model="form.IP" clearable size="small" placeholder="IP"/>
<el-form-item label="PLC" prop="PLCIP" style="display: inline-block">
<el-input v-model="form.PLCIP" clearable size="small" placeholder="PLCIP"/>
</el-form-item>
<el-form-item label="报警数" prop="numberAlarms" style="display: inline-block">
<el-input
@@ -129,7 +129,7 @@ export default {
dialogFormVisible: false,
dialogFormVisible3: false,
form: {
IP: '',
PLCIP: '',
numberAlarms: '',
massNumber: '',
stationNo: '',
@@ -173,7 +173,7 @@ export default {
for (let i = 0; i < this.multipleSelection_variable.length; i++) {
stationNo = this.multipleSelection_variable[i].工位号
fourNumber = this.multipleSelection_variable[i].工位代码
ip = this.multipleSelection_variable[i].IP
ip = this.multipleSelection_variable[i].PLC
numberAlarms = this.multipleSelection_variable[i].报警数
massNumber = this.multipleSelection_variable[i].质量组数
await this.writeVariableDetermine(ip, numberAlarms, massNumber, stationNo, fourNumber)

342
src/views/BasicDataMaintenance/BasicVariableQuery/index.vue Normal file
View File

@@ -0,0 +1,342 @@
<template>
<div class="app-container">
<el-card class="topCard">
<div class="topDiv">
<span style="margin-left: 10px">工位号：</span>
<el-select v-model="dataTypeValue" placeholder="工位号" clearable size="small" style="width:100px">
<el-option
v-for="item in dataType"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">变量类型：</span>
<el-select v-model="valueTypeValue" placeholder="变量类型" clearable size="small" style="width:100px">
<el-option
v-for="item in valueType"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageSize=100;pageCurrent=1;searchTable()">查询</el-button>
</div>
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
border
size="mini"
height="740"
center
style="width: 100%">
<el-table-column type="index" width="60" label="序号" align="center"/>
<el-table-column label="TagID" align="center">
<template slot-scope="scope">
{{ scope.row.TagID }}
</template>
</el-table-column>
<el-table-column label="TagName" width="200px" align="center">
<template slot-scope="scope">
{{ scope.row.TagName }}
</template>
</el-table-column>
<el-table-column label="工位号" align="center">
<template slot-scope="scope">
{{ scope.row.工位号 }}
</template>
</el-table-column>
<el-table-column label="数据来源" align="center">
<template slot-scope="scope">
{{ scope.row.数据来源 }}
</template>
</el-table-column>
<el-table-column label="IP" align="center">
<template slot-scope="scope">
{{ scope.row.IP }}
</template>
</el-table-column>
<el-table-column label="TagTypeID" width="90px" align="center">
<template slot-scope="scope">
{{ scope.row.TagTypeID }}
</template>
</el-table-column>
<el-table-column label="TagLong" align="center">
<template slot-scope="scope">
{{ scope.row.TagLong }}
</template>
</el-table-column>
<el-table-column label="DbName" align="center">
<template slot-scope="scope">
{{ scope.row.DbName }}
</template>
</el-table-column>
<el-table-column label="变量类型" align="center">
<template slot-scope="scope">
{{ scope.row.变量类型 }}
</template>
</el-table-column>
<el-table-column label="变量地址" align="center">
<template slot-scope="scope">
{{ scope.row.变量地址 }}
</template>
</el-table-column>
<el-table-column label="变量其它" align="center">
<template slot-scope="scope">
{{ scope.row.变量其它 }}
</template>
</el-table-column>
<el-table-column label="演示偏移" align="center">
<template slot-scope="scope">
{{ scope.row.演示偏移 }}
</template>
</el-table-column>
<el-table-column label="列位置" align="center">
<template slot-scope="scope">
{{ scope.row.列位置 }}
</template>
</el-table-column>
<el-table-column label="测量位置" align="center">
<template slot-scope="scope">
{{ scope.row.测量位置 }}
</template>
</el-table-column>
<el-table-column label="测量项目" align="center">
<template slot-scope="scope">
{{ scope.row.测量项目 }}
</template>
</el-table-column>
<el-table-column label="测量单位" align="center">
<template slot-scope="scope">
{{ scope.row.测量单位 }}
</template>
</el-table-column>
<el-table-column label="变量类型代码" align="center">
<template slot-scope="scope">
{{ scope.row.变量类型代码 }}
</template>
</el-table-column>
<el-table-column label="变量类型名称" width="300px" align="center">
<template slot-scope="scope">
{{ scope.row.变量类型名称 }}
</template>
</el-table-column>
<el-table-column label="机体类型" align="center">
<template slot-scope="scope">
{{ scope.row.机体类型 }}
</template>
</el-table-column>
<el-table-column label="线体类型" align="center">
<template slot-scope="scope">
{{ scope.row.线体类型 }}
</template>
</el-table-column>
<el-table-column label="TagAdrDemo" align="center">
<template slot-scope="scope">
{{ scope.row.TagAdrDemo }}
</template>
</el-table-column>
<el-table-column label="是否启用" align="center">
<template slot-scope="scope">
{{ scope.row.是否启用 }}
</template>
</el-table-column>
<el-table-column label="监控组" align="center">
<template slot-scope="scope">
{{ scope.row.监控组 }}
</template>
</el-table-column>
<el-table-column label="监控时间间隔" align="center">
<template slot-scope="scope">
{{ scope.row.监控时间间隔 }}
</template>
</el-table-column>
<el-table-column label="OpcServer_OPNAME" width="100px" align="center">
<template slot-scope="scope">
{{ scope.row.OpcServer_OPNAME }}
</template>
</el-table-column>
<el-table-column label="变量特点" align="center">
<template slot-scope="scope">
{{ scope.row.变量特点 }}
</template>
</el-table-column>
<el-table-column label="是否监控" align="center">
<template slot-scope="scope">
{{ scope.row.是否监控 }}
</template>
</el-table-column>
<el-table-column label="变量排序" align="center">
<template slot-scope="scope">
{{ scope.row.变量排序 }}
</template>
</el-table-column>
<el-table-column label="工序能力" align="center">
<template slot-scope="scope">
{{ scope.row.工序能力 }}
</template>
</el-table-column>
<el-table-column label="监控属性代码" align="center">
<template slot-scope="scope">
{{ scope.row.监控属性代码 }}
</template>
</el-table-column>
<el-table-column label="测量位置短" align="center">
<template slot-scope="scope">
{{ scope.row.测量位置短 }}
</template>
</el-table-column>
<el-table-column label="上限值" align="center">
<template slot-scope="scope">
{{ scope.row.上限值 }}
</template>
</el-table-column>
<el-table-column label="下限值" align="center">
<template slot-scope="scope">
{{ scope.row.下限值 }}
</template>
</el-table-column>
<el-table-column label="理论值" align="center">
<template slot-scope="scope">
{{ scope.row.理论值 }}
</template>
</el-table-column>
<el-table-column label="IsGoodBad" align="center">
<template slot-scope="scope">
{{ scope.row.IsGoodBad }}
</template>
</el-table-column>
<el-table-column label="IsSaveToSql" align="center">
<template slot-scope="scope">
{{ scope.row.IsSaveToSql }}
</template>
</el-table-column>
<el-table-column label="IsWebSocket" align="center">
<template slot-scope="scope">
{{ scope.row.IsWebSocket }}
</template>
</el-table-column>
<el-table-column label="连接名称" align="center">
<template slot-scope="scope">
{{ scope.row.连接名称 }}
</template>
</el-table-column>
<el-table-column label="OpcServer_MIS" align="center">
<template slot-scope="scope">
{{ scope.row.OpcServer_MIS }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-sizes="[50, 100, 200]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import request from '@/utils/request'
export default {
data() {
return {
loading: false,
tableData: [],
dataType: [], // 工位数组
dataTypeValue: '', // 工位信息
valueType: [
{
label: '基本变量',
value: 8
}, {
label: '报警变量',
value: 9
}, {
label: '质量变量',
value: 7
}
],
valueTypeValue: '',
total: 0, // 总条数
pageList: 100, // 每页显示条数
pageSize: 100, // 每页显示条数
pageCurrent: 1 // 后台获取页
}
},
created() {
this.getNumber()
this.searchTable()
},
methods: {
// 初始化获取产品型号
getNumber() {
this.dataType = []
request({
url: '',
method: 'post',
data: {
type: '3',
name: `SELECT [工位号] FROM [dbo].[MES_计划BOM_工位与名称]`
}
}).then(response => {
if (response.data.length) {
for (let i = 0; i < response.data.length; i++) {
this.dataType.push({
label: response.data[i].工位号,
value: response.data[i].工位号
})
}
}
})
},
searchTable() {
this.loading = true
this.tableData = []
let stationNumberValue_check, valueType_check
// this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '')
this.dataTypeValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.dataTypeValue = '')
this.valueTypeValue ? valueType_check = 1 : (valueType_check = 0, this.valueTypeValue = '')
var param = []
param[0] = ['变量类型_ischeck', valueType_check]
param[1] = ['变量类型', this.valueTypeValue]
param[2] = ['工位号_ischeck', stationNumberValue_check]
param[3] = ['工位号', this.dataTypeValue]
param[4] = ['PageCurrent', this.pageCurrent]
param[5] = ['PageSize', this.pageSize]
param[6] = ['PageCount', '1111', 'int', '1']
param[7] = ['ItemCount', '1111', 'int', '1']
var Data = this.CreateData('11', 'MES_基本变量_查询数据', param)
this.ExecDatabase(Data).then(response => {
console.log(response, 66)
if (response.data.result.length !== 0) {
this.tableData = response.data.result
}
this.total = parseInt(response.data.output[0].ItemCount)
this.loading = false
})
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
}
}
</script>
<style scoped>
.topDiv{
margin-bottom: 10px;
}
</style>

1
src/views/BasicDataMaintenance/StationInformationMaintenance/index.vue
View File

@@ -24,6 +24,7 @@
center
style="width: 100%"
@row-click="rowClick">
<el-table-column type="index" width="60" label="序号" align="center"/>
<el-table-column label="工位代码" align="center">
<template slot-scope="scope">
<template>

23
src/views/EquipmentOperationAnalysis/EquipmentMaintenancePlan/index.vue
View File

@@ -42,12 +42,12 @@
<!-- <span>{{ data.day }}</span>-->
</p>
<div style="margin-left: 20%;margin-top: 5px">
<el-checkbox v-model="dataC[data.day]['banCheck']" @change="aa(dataC[data.day])">班</el-checkbox>
<el-time-picker v-model="dataC[data.day]['banTime']" :clearable="false" :picker-options="{selectableRange: '00:00:00 - 23:59:59'}" value-format="HH:mm:ss" style="width: 80px;height: 20px" @input="bb(dataC[data.day]['banTime'], data.day)"/>
<el-checkbox v-model="dataC[data.day]['banCheck']" @change="selectBox(dataC[data.day])">班</el-checkbox>
<el-time-picker v-model="dataC[data.day]['banTime']" :key="dataC[data.day]['banTime']" :clearable="false" :picker-options="{selectableRange: '00:00:00 - 23:59:59'}" value-format="HH:mm:ss" style="width: 80px;height: 20px" @blur="selectTime(dataC[data.day]['banTime'], data.day)"/>
</div>
<div style="margin-left: 20%;margin-top: 5px">
<el-checkbox v-model="dataC[data.day]['dayCheck']">天</el-checkbox>
<el-time-picker v-model="dataC[data.day]['dayTime']" :clearable="false" :picker-options="{selectableRange: '00:00:00 - 23:59:59'}" value-format="HH:mm:ss" style="width: 80px;height: 20px"/>
<el-time-picker v-model="dataC[data.day]['dayTime']" :clearable="false" :picker-options="{selectableRange: '00:00:00 - 23:59:59'}" value-format="HH:mm:ss" style="width: 80px;height: 20px" @blur="selectTime(dataC[data.day]['banTime'], data.day)"/>
</div>
<div style="margin-left: 20%;margin-top: 5px">
<el-checkbox v-model="dataC[data.day]['weekCheck']">周</el-checkbox>
@@ -69,7 +69,9 @@
</el-card>
</div>
</template>
<script>
import { arrDeepCopy } from '../../../utils/tool.js'
export default {
data() {
return {
@@ -132,16 +134,19 @@ export default {
window.dataC = this.dataC
},
methods: {
aa(a) {
selectBox(a) {
// a[0].isSelected = !a[0].isSelected
console.log('[data.day]', a)
},
bb(a, b) {
selectTime(a, b) {
// this.$forceUpdate()
this.$set(this.dataC[b], 'banTime', a)
// this.dataC[b]['banTime'] = a
console.log('[data.day]', this.dataC[b])
this.viewDayWork(b)
//
// this.$set(this.dataC[b], 'banTime', a)
// this.$forceUpdate()
this.dataC[b]['banTime'] = a
this.dataC = arrDeepCopy(this.dataC)
// console.log('[data.day]', this.dataC[b])
// this.viewDayWork(b)
},
viewDayWork(a) {
console.log(a)

8
src/views/QualityAssurance/AssemblyQualitydataQuery/index.vue
View File

@@ -243,10 +243,10 @@ export default {
value: 1
}, {
label: '不合格',
value: 2
value: 0
}, {
label: '全部',
value: 0
value: 2
}
], // 是否合格
isQualifiedValue: 1, // 是否合格
@@ -456,8 +456,8 @@ export default {
this.traceabilityCode ? traceabilityCode_check = 1 : (traceabilityCode_check = 0, this.traceabilityCode = '')
this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '')
var param = []
param[0] = ['开始时间', this.dateTime[0]]
param[1] = ['结束时间', this.dateTime[1]]
param[0] = ['开始时间', this.dateTime[0] + ' ' + '00:00']
param[1] = ['结束时间', this.dateTime[1] + ' ' + '23:59']
param[2] = ['发动机型号_ischeck', engineTypeValue_check]
param[3] = ['发动机型号', this.engineTypeValue]
param[4] = ['发动机号_ischeck', assemblyNumberValue_check]

54
src/views/login/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div>
<div class="login-container">
<i class="login-img"/>
<!-- <i class="login-img"/>-->
<el-form
ref="loginForm"
:model="loginForm"
@@ -34,7 +34,7 @@
</el-form-item>
<div>
<el-checkbox v-model="loginForm.checked" class="remeberPassword">记住密码</el-checkbox>
<el-button type="text" style="margin-left: 224px" @click="handleEdit('form')">修改密码</el-button>
<el-button type="text" style="margin-left: 224px;color: #1576e8" @click="handleEdit('form')">修改密码</el-button>
</div>
<el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
<span style="font-size: 20px!important;">登录</span>
@@ -222,17 +222,18 @@ export default {
position: fixed;
height: 100%;
width:100%;
background-color: #192045;
background-color: #ebebeb;
background-image:url("../../../static/login.png");background-repeat:no-repeat; background-size:100% 100%;-moz-background-size:100% 100%;
input:-webkit-autofill {
-webkit-box-shadow: 0 0 0 1000px #293444 inset !important;
-webkit-text-fill-color: #fff !important;
}
.login-img{
position: absolute;
width: 100%;
height: 100%;
background: url("../../../static/login.png") no-repeat;
}
/*.login-img{*/
/* position: absolute;*/
/* width: 100%;*/
/* height: 100%;*/
/* background: url("../../../static/login.png") no-repeat;*/
/*}*/
input {
background: transparent;
border: 1px;
@@ -249,7 +250,7 @@ export default {
}
.svg-container {
padding: 6px 5px 6px 15px;
color: #f3b82d;
color: #1576e8;
font-size: 20px!important;
vertical-align: middle;
width: 30px;
@@ -261,7 +262,7 @@ export default {
.title {
font-size: 22px;
line-height: 30px;
color: #ffffff;
color: #1576e8;
margin: 0 auto 20px auto;
text-align: center;
font-weight: bold;
@@ -274,10 +275,13 @@ export default {
.line{
width: 70%;
margin: 0 auto 25px auto;
background-color: #ffffff;
background-color: #1576e8;
height: 1px;
}
.login-form {
height: 500px;
border-radius: 20px;
background-color: white;
position: absolute;
left: 0;
right: 0;
@@ -301,7 +305,7 @@ export default {
color: #29335b!important;
}
.el-form-item {
border: 1px solid #f3b82d;
border: 1px solid #1576e8;
background: #ffffff;
border-radius: 5px;
color: #454545;
@@ -313,21 +317,21 @@ export default {
margin-top: 20px;
border-radius: 5px;
font-size: 18px;
color:#29335b;
background: -webkit-linear-gradient(left, #f5c44f , #9fd2ab); /* Safari 5.1 - 6.0 */
background: -o-linear-gradient(right, #f5c44f, #9fd2ab); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(right, #f5c44f, #9fd2ab); /* Firefox 3.6 - 15 */
background: linear-gradient(to right, #f5c44f , #9fd2ab); /* 标准的语法（必须放在最后） */
color:white;
background: -webkit-linear-gradient(left, #1576e8 , #9fd2ab); /* Safari 5.1 - 6.0 */
background: -o-linear-gradient(right, #1576e8, #9fd2ab); /* Opera 11.1 - 12.0 */
background: -moz-linear-gradient(right, #1576e8, #9fd2ab); /* Firefox 3.6 - 15 */
background: linear-gradient(to right, #1576e8 , #9fd2ab); /* 标准的语法（必须放在最后） */
}
.remeberPassword{
color: $dark_gray;
color: #1576e8;
}
.show-pwd {
position: absolute;
right: 10px;
top: 7px;
font-size: 16px;
color: $dark_gray;
color: #1576e8;
cursor: pointer;
user-select:none;
}
@@ -363,17 +367,17 @@ export default {
</style>
<style>
.remeberPassword .el-checkbox__inner:hover{
border: 1px solid #f3b82d;
border: 1px solid #1576e8;
}
.remeberPassword .el-checkbox__input.is-checked .el-checkbox__inner{
background-color: #f3b82d;
border-color: #f3b82d;
background-color: #1576e8;
border-color: #1576e8;
}
.remeberPassword .el-checkbox__input.is-checked+.el-checkbox__label{
color: #fff;
color: #1576e8;
}
.remeberPassword .el-checkbox__input.is-focus .el-checkbox__inner{
border-color: #f3b82d;
border-color: #1576e8;
}
.login-container input:-webkit-autofill{
-webkit-box-shadow:0 0 0 1000px #fff inset !important;