elink-star
/
esua-epdc-admin
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【PC端优化】前端优化-王公峰-2020-07-27

master
wanggongfeng 5 years ago
parent
12da8f4056
commit
49602e23af
9 changed files with 54 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/modules/api/scanswitch-add-or-update.vue
  2. 10
      src/views/modules/api/scanswitch.vue
  3. 4
      src/views/modules/custom/epidemicsentrypost-add-or-update.vue
  4. 8
      src/views/modules/custom/epidemicsentrypost.vue
  5. 22
      src/views/modules/custom/majorfunctionconf-add-or-update.vue
  6. 2
      src/views/modules/custom/majorfunctionconf.vue
  7. 4
      src/views/modules/events/category-add-or-update.vue
  8. 20
      src/views/modules/events/issue-process-list.vue
  9. 14
      src/views/modules/user/partymembers-add-or-update.vue

6
src/views/modules/api/scanswitch-add-or-update.vue
View File

@ -11,7 +11,8 @@
<el-form-item label="版本号" <el-form-item label="版本号"
prop="versionNum"> prop="versionNum">
<el-input v-model="dataForm.versionNum" <el-input v-model="dataForm.versionNum"
placeholder="版本号"></el-input> placeholder="版本号"
maxlength="20"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="扫码开关" prop="scanFlag"> <el-form-item label="扫码开关" prop="scanFlag">
<el-select v-model="dataForm.scanFlag" placeholder="扫码开关"> <el-select v-model="dataForm.scanFlag" placeholder="扫码开关">
@ -28,7 +29,8 @@
<el-form-item label="维护信息" <el-form-item label="维护信息"
prop="maintainInfo"> prop="maintainInfo">
<el-input v-model="dataForm.maintainInfo" <el-input v-model="dataForm.maintainInfo"
placeholder="维护信息"></el-input> placeholder="维护信息"
maxlength="200"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template slot="footer"> <template slot="footer">

10
src/views/modules/api/scanswitch.vue
View File

@ -37,28 +37,36 @@
<el-table-column prop="versionNum" <el-table-column prop="versionNum"
label="版本号" label="版本号"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="120"
show-overflow-tooltip></el-table-column>
<el-table-column prop="scanFlag" <el-table-column prop="scanFlag"
label="开关状态" label="开关状态"
header-align="center" header-align="center"
align="center" align="center"
width="120"
:formatter="stateFormat"></el-table-column> :formatter="stateFormat"></el-table-column>
<el-table-column prop="maintainFlag" <el-table-column prop="maintainFlag"
label="维护状态" label="维护状态"
header-align="center" header-align="center"
align="center" align="center"
width="120"
:formatter="maintainStateFormat"></el-table-column> :formatter="maintainStateFormat"></el-table-column>
<el-table-column prop="maintainInfo" <el-table-column prop="maintainInfo"
label="维护信息" label="维护信息"
header-align="center" header-align="center"
min-width="400"
show-overflow-tooltip
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="createdTime" <el-table-column prop="createdTime"
label="创建时间" label="创建时间"
header-align="center" header-align="center"
width="180"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="updatedTime" <el-table-column prop="updatedTime"
label="更新时间" label="更新时间"
header-align="center" header-align="center"
width="180"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column :label="$t('handle')" <el-table-column :label="$t('handle')"
fixed="right" fixed="right"

4
src/views/modules/custom/epidemicsentrypost-add-or-update.vue
View File

@ -14,11 +14,11 @@
:label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"
> >
<el-form-item label="哨卡编码" prop="sentryPostCode"> <el-form-item label="哨卡编码" prop="sentryPostCode">
<el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码(唯一性最长6位)" style="width: 800px"></el-input> <el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码(唯一性最长6位)" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="哨卡名称" prop="id"> <el-form-item label="哨卡名称" prop="id">
<el-select v-model="dataForm.id" clearable filterable <el-select v-model="dataForm.id" clearable filterable
placeholder="请选择" style="width: 800px" > placeholder="请选择" >
<el-option v-for="item in verifyOptions" <el-option v-for="item in verifyOptions"
:key="item.id" :key="item.id"
:label="item.sentryPostName" :label="item.sentryPostName"

8
src/views/modules/custom/epidemicsentrypost.vue
View File

@ -10,13 +10,13 @@
<el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码" clearable></el-input> <el-input v-model="dataForm.sentryPostCode" placeholder="哨卡编码" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button type="success" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="initDeptMaCodeHandle()">批量生成功能</el-button> <el-button type="success" @click="initDeptMaCodeHandle()">批量生成功能</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('news:epidemicsentrypost:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> <el-button v-if="$hasPermission('news:epidemicsentrypost:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@ -24,7 +24,7 @@
</el-form> </el-form>
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;"> <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
<!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> --> <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
<el-table-column prop="sentryPostCode" label="哨卡编码" header-align="center" align="center"></el-table-column> <el-table-column prop="sentryPostCode" label="哨卡编码" width="150" header-align="center" align="center"></el-table-column>
<el-table-column prop="sentryPostName" label="哨卡名称" width="200" show-overflow-tooltip header-align="center" align="center"></el-table-column> <el-table-column prop="sentryPostName" label="哨卡名称" width="200" show-overflow-tooltip header-align="center" align="center"></el-table-column>
<el-table-column prop="thirdSentryPostId" label="第三方哨卡id" width="300" show-overflow-tooltip header-align="center" align="center"></el-table-column> <el-table-column prop="thirdSentryPostId" label="第三方哨卡id" width="300" show-overflow-tooltip header-align="center" align="center"></el-table-column>
<el-table-column prop="maCodeUrl" label="哨卡小程序码访问地址" min-width="800" header-align="center" align="center"></el-table-column> <el-table-column prop="maCodeUrl" label="哨卡小程序码访问地址" min-width="800" header-align="center" align="center"></el-table-column>
@ -48,7 +48,7 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="160px"></el-table-column> <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width="180px"></el-table-column>
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150px"> <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="danger" <el-button type="danger"

22
src/views/modules/custom/majorfunctionconf-add-or-update.vue
View File

@ -10,7 +10,7 @@
:label-width="$i18n.locale === 'en-US' ? '120px' : '80px'"> :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
<el-form-item label="功能编码" <el-form-item label="功能编码"
v-if="!dataForm.id" v-if="!dataForm.id"
prop="code"> prop="code" label-width="120px">
<el-select v-model="dataForm.code" <el-select v-model="dataForm.code"
@change="changeCode" @change="changeCode"
placeholder="请选择"> placeholder="请选择">
@ -23,7 +23,7 @@
</el-form-item> </el-form-item>
<el-form-item label="功能编码" <el-form-item label="功能编码"
v-if="dataForm.id" v-if="dataForm.id"
prop="code"> prop="code" label-width="120px">
<el-select v-model="dataForm.code" <el-select v-model="dataForm.code"
disabled disabled
@change="changeCode" @change="changeCode"
@ -36,7 +36,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否可用" <el-form-item label="是否可用"
prop="availableFlag"> prop="availableFlag" label-width="120px">
<template> <template>
<el-radio v-model="dataForm.availableFlag" <el-radio v-model="dataForm.availableFlag"
label="0">否</el-radio> label="0">否</el-radio>
@ -45,7 +45,7 @@
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="需要拼接token" <el-form-item label="需要拼接token"
prop="tokenFlag"> prop="tokenFlag" label-width="120px">
<template> <template>
<el-radio v-model="dataForm.tokenFlag" <el-radio v-model="dataForm.tokenFlag"
label="0">否</el-radio> label="0">否</el-radio>
@ -54,7 +54,7 @@
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="是否访问外链" <el-form-item label="是否访问外链"
prop="externalFlag"> prop="externalFlag" label-width="120px">
<template> <template>
<el-radio v-model="dataForm.externalFlag" <el-radio v-model="dataForm.externalFlag"
label="0">否</el-radio> label="0">否</el-radio>
@ -63,17 +63,19 @@
</template> </template>
</el-form-item> </el-form-item>
<el-form-item label="访问地址" <el-form-item label="访问地址"
prop="externalUrl"> prop="externalUrl" label-width="120px">
<el-input v-model="dataForm.externalUrl" <el-input v-model="dataForm.externalUrl"
placeholder="访问地址"></el-input> placeholder="访问地址"
maxlength="500"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注" label-width="120px">
<el-input v-model="dataForm.remark" <el-input v-model="dataForm.remark"
placeholder="备注"></el-input> placeholder="备注"
maxlength="500"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="图标" <el-form-item label="图标"
v-loading="loading" v-loading="loading"
prop="imgUrl"> prop="imgUrl" label-width="120px">
<el-upload class="avatar-uploader" <el-upload class="avatar-uploader"
:action="this.uploadUrl" :action="this.uploadUrl"
:show-file-list="false" :show-file-list="false"

2
src/views/modules/custom/majorfunctionconf.vue
View File

@ -14,7 +14,7 @@
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="success" <el-button type="primary"
@click="addOrUpdateHandle()">{{ $t('add') }}</el-button> @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item> <!-- <el-form-item>

4
src/views/modules/events/category-add-or-update.vue
View File

@ -2,10 +2,10 @@
<el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
<el-form-item prop="categoryName" label="分类名称"> <el-form-item prop="categoryName" label="分类名称">
<el-input v-model="dataForm.categoryName" placeholder="分类名称"></el-input> <el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="500"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="categoryCode" label="分类编码"> <el-form-item prop="categoryCode" label="分类编码">
<el-input v-model="dataForm.categoryCode" placeholder="分类编码"></el-input> <el-input v-model="dataForm.categoryCode" placeholder="分类编码" maxlength="50"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="parentName" label="上级分类" class="category-list"> <el-form-item prop="parentName" label="上级分类" class="category-list">
<el-popover v-model="categoryListVisible" ref="categoryListPopover" placement="bottom-start" trigger="click"> <el-popover v-model="categoryListVisible" ref="categoryListPopover" placement="bottom-start" trigger="click">

20
src/views/modules/events/issue-process-list.vue
View File

@ -256,19 +256,19 @@
ids: [], ids: [],
options: [], options: [],
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: (time) => {
let beginDateVal = this.dataForm.startTime let beginDateVal = this.dataForm.endTime
if (beginDateVal) { if (beginDateVal) {
return time.getTime() > new Date(beginDateVal).getTime() return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
} }
} }
}, },
pickerBeginDateAfter: { pickerBeginDateAfter: {
disabledDate: time => { disabledDate: (time) => {
let EndDateVal = this.dataForm.endTime let EndDateVal = this.dataForm.startTime
if (EndDateVal) { if (EndDateVal) {
return time.getTime() < new Date(EndDateVal).getTime() return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
} }
} }
} }
} }

14
src/views/modules/user/partymembers-add-or-update.vue
View File

@ -2,7 +2,8 @@
<el-dialog :visible.sync="visible" <el-dialog :visible.sync="visible"
:title="!dataForm.id ? $t('add') : $t('update')" :title="!dataForm.id ? $t('add') : $t('update')"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false"> :close-on-press-escape="false"
customClass="customWidth">
<el-form :model="dataForm" <el-form :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@ -11,17 +12,17 @@
<el-form-item label="姓名" <el-form-item label="姓名"
prop="realName"> prop="realName">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="姓名"></el-input> placeholder="姓名" style="width:90%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" <el-form-item label="手机号"
prop="mobile"> prop="mobile">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="手机号"></el-input> placeholder="手机号" style="width:90%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="身份证号"
prop="identityNo"> prop="identityNo">
<el-input v-model="dataForm.identityNo" <el-input v-model="dataForm.identityNo"
placeholder="身份证号"></el-input> placeholder="身份证号" style="width:90%;"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="街道党工委" <!-- <el-form-item label="街道党工委"
label-width='auto' label-width='auto'
@ -258,3 +259,8 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.customWidth {
width:35%
}
</style>

Write Preview
Loading…
Cancel
Save