Skip to content

S
SuperMan
Commit 8a9e6350 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent b74884de
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 64 deletions
src/App.vue
View file @ 8a9e6350
......@@ -10,17 +10,7 @@
</viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- -->
<div v-show="mazip==0" id="downzip">
<div>
<div>
<a href="https://reborndev.oss-cn-hangzhou.aliyuncs.com/IM/%E9%BA%A6%E5%AD%90%E5%8A%A9%E6%89%8B.exe">
<img @click="CloseZip" src="./assets/img/mzzip.png" alt="">
</a>
<img @click="CloseZip" class="close" src="./assets/img/close.png" alt="">
</div>
</div>
</div>
</div>
</template>
......@@ -68,15 +58,12 @@ export default {
dataShow:false,
haveOpenMode:false,
settingSys: false,
mazip:sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : 0,
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
}
},
methods: {
CloseZip(){
this.mazip=1;
sessionStorage.setItem("mazip",1);
},
inited (viewer){
this.$viewer = viewer
},
......@@ -137,35 +124,6 @@ export default {
.BMap_cpyCtrl {display: none;}
.anchorBL {display: none;}
.viewer{display: none !important;}
#downzip{
width: 100%;
height: 100%;
position: fixed;
background: rgba(0,0,0,0.3);
top: 0;
left: 0;
z-index: 2019;
display: table;
}
#downzip>div{
display: table-cell;
vertical-align: middle;
position: relative;
}
#downzip>div>div{
width:285px;
height: 260px;
position: absolute;
cursor: pointer;
right: 50px;
top: 50px;
}
.close{
position: absolute;
top: 0;
right: 0px;
width: 25px;
height: 25px;
}
</style>
src/assets/common/lang/zh.js
View file @ 8a9e6350
......@@ -39,6 +39,9 @@ export const pub={
clickToView:'点击查看',
man:'男',
woman:'女',
yes:'是',
no:'否',
}
......@@ -1318,6 +1321,13 @@ export const adm={
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
adm_gwname:"岗位名称",
adm_gxtime:"更新时间",
adm_ynyyfenqu:"是否应用分区",
adm_qsrgwname:"请输入岗位名称",
adm_qxzsfyyfenqu:"请选择是否应用分区",
}
export const visaT = {
cxjihua: '出行计划',
......
src/components/administrative/positionManagement.vue
View file @ 8a9e6350
......@@ -6,28 +6,29 @@
<div class="query-box">
<ul>
<li>
<span><em>岗位名称</em><el-input class='w210' v-model='msg.PostName'
<!-- 岗位名称 -->
<span><em>{{$t('adm.adm_gwname')}}</em><el-input class='w210' v-model='msg.PostName'
@keyup.enter.native="getList"></el-input></span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()"/>
<input type="button" @click="outerVisible = true,dialogTitle='新增岗位',layerShowIndex=1,getCompany()"
class="normalBtn" value="新增"/>
class="normalBtn" :value="$t('pub.addBtn')"/>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th>岗位名称</th>
<th>更新时间</th>
<th width="250">操作</th>
<th>{{$t('adm.adm_gwname')}}</th>
<th>{{$t('adm.adm_gxtime')}}</th>
<th width="250">{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.PostName}}</td>
<td>{{item.UpdateTime}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button
@click="outerVisible = true,dialogTitle='修改岗位信息',getCompany(),getDerpartMent(),updateData(index,item.PostId)"
type="primary" icon="el-icon-edit"></el-button>
......@@ -38,7 +39,7 @@
<el-tooltip class="item" effect="dark" content="APP角色管理" placement="top-start">
<el-button @click="roleAllocation(item.PostId,2)" type="primary" icon="iconfont icon-user11"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button @click="deleteData(item.PostId)" type="danger" icon="el-icon-delete"></el-button>
</el-tooltip>
</el-button-group>
......@@ -52,13 +53,13 @@
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<div v-if="this.layerShowIndex==1">
<el-form-item label="岗位名称" prop="PostName">
<el-form-item :label="$t('adm.adm_gwname')" prop="PostName">
<el-input class='w300' type="text" v-model="addMsg.PostName" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label="是否应用分区" prop="IsUseSubarea">
<el-select v-model="addMsg.IsUseSubarea" placeholder="请选择">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="2"></el-option>
<el-form-item :label="$t('adm.adm_ynyyfenqu')" prop="IsUseSubarea">
<el-select v-model="addMsg.IsUseSubarea" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.yes')" value="1"></el-option>
<el-option :label="$t('pub.no')" value="2"></el-option>
</el-select>
</el-form-item>
</div>
......@@ -67,9 +68,9 @@
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button> &nbsp;
<button v-if="this.layerShowIndex==1" class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
<button v-if="this.layerShowIndex==2" class="normalBtn" type="primary" @click="updateRole()">保存</button>
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button v-if="this.layerShowIndex==1" class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
<button v-if="this.layerShowIndex==2" class="normalBtn" type="primary" @click="updateRole()">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
......@@ -106,8 +107,8 @@
Status: 0,
},
rules: {
PostName: [{required: true,message: '请输入岗位名称',trigger: 'blur'}],
IsUseSubarea: [{required: true,message: '请选择是否应用分区',trigger: 'blur'}]
PostName: [{required: true,message: this.$t('adm.adm_qsrgwname'),trigger: 'blur'}],
IsUseSubarea: [{required: true,message: this.$t('adm.adm_qxzsfyyfenqu'),trigger: 'blur'}]
},
addMsg: {
PostId: '-1',
......
src/components/index.vue
View file @ 8a9e6350
......@@ -761,6 +761,18 @@
</div>
</el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
<div v-show="mazip==0" id="downzip">
<div>
<div>
<a href="https://reborndev.oss-cn-hangzhou.aliyuncs.com/IM/%E9%BA%A6%E5%AD%90%E5%8A%A9%E6%89%8B.exe">
<img @click="CloseZip" src="../assets/img/mzzip.png" alt="">
</a>
<img @click="CloseZip" class="close" src="../assets/img/close.png" alt="">
</div>
</div>
</div>
</div>
</template>
......@@ -785,6 +797,7 @@ export default {
},
data() {
return {
mazip:sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : 0,
language:'zh-CN',
douTimer:null,
defaultHeadImg:
......@@ -1333,6 +1346,10 @@ export default {
}
},
methods: {
CloseZip(){
this.mazip=1;
sessionStorage.setItem("mazip",1);
},
ChangeLan(str){
this.language=str;
this.$i18n.locale = str;
......@@ -3196,6 +3213,36 @@ export default {
@import "../assets/css/main.less";
@import "../assets/css/cssReset.css";
@import "../assets/css/message.css";
#downzip{
width: 100%;
height: 100%;
position: fixed;
background: rgba(0,0,0,0.3);
top: 0;
left: 0;
z-index: 2000;
display: table;
}
#downzip>div{
display: table-cell;
vertical-align: middle;
margin-top: 200px;
}
#downzip>div>div{
width:285px;
height: 260px;
margin: 0 auto;
position: relative;
cursor: pointer;
}
.close{
position: absolute;
top: 0;
right: 0px;
width: 25px;
height: 25px;
}
.changelanguage{
width:124px;
}
......
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