Commit b2a938ab authored by kzy's avatar kzy

工艺

parent 2e6d06f9
...@@ -46,7 +46,7 @@ export function deleteMes(id) { ...@@ -46,7 +46,7 @@ export function deleteMes(id) {
export function deleteBatch(ids) { export function deleteBatch(ids) {
return request({ return request({
url: `/authority/messages/${ids}`, url: `/authority/messages/${ids}`,
method: 'delete', method: 'delete'
}) })
} }
......
...@@ -28,7 +28,7 @@ export function cleanLogininfo(query) { ...@@ -28,7 +28,7 @@ export function cleanLogininfo(query) {
return request({ return request({
url: '/monitor/loginInfo/clean', url: '/monitor/loginInfo/clean',
method: 'delete', method: 'delete',
params: query, params: query
}) })
} }
......
...@@ -89,7 +89,7 @@ export function updateMenu(data) { ...@@ -89,7 +89,7 @@ export function updateMenu(data) {
const businessId = data.businessId const businessId = data.businessId
data = Qs.stringify(data) data = Qs.stringify(data)
return request({ return request({
url: '/system/menu/update/'+ businessId, url: '/system/menu/update/' + businessId,
method: 'put', method: 'put',
data, data,
headers: { headers: {
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<i slot="suffix" class="el-icon-search el-input__icon" /> <i slot="suffix" class="el-icon-search el-input__icon" />
</el-input> </el-input>
<div class="icon-list"> <div class="icon-list">
<div class="icon__single" v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)"> <div v-for="(item, index) in iconList" :key="index" class="icon__single" @click="selectedIcon(item)">
<svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" /> <svg-icon :icon-class="item" style="height: 30px;width: 16px;display: block;margin-right: 5px" />
<div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{item}}</div> <div :title="item" class="icon__single__text" style="width: calc(100% - 30px)">{{ item }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -23,6 +23,8 @@ export default { ...@@ -23,6 +23,8 @@ export default {
iconList: icons iconList: icons
} }
}, },
mounted() {
},
methods: { methods: {
filterIcons() { filterIcons() {
this.iconList = icons this.iconList = icons
...@@ -38,8 +40,6 @@ export default { ...@@ -38,8 +40,6 @@ export default {
this.name = '' this.name = ''
this.iconList = icons this.iconList = icons
} }
},
mounted() {
} }
} }
</script> </script>
......
...@@ -88,7 +88,7 @@ export default { ...@@ -88,7 +88,7 @@ export default {
case 'getDepts': case 'getDepts':
return { value: 'id', label: 'label', emitPath: false } return { value: 'id', label: 'label', emitPath: false }
default: default:
return {emitPath: false} return { emitPath: false }
} }
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<Header /> <Header />
</div> </div>
<div class="nav-container-two"> <div class="nav-container-two">
<div class="placeholder"></div> <div class="placeholder" />
<tags-view /> <tags-view />
<navbar /> <navbar />
</div> </div>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -22,31 +22,12 @@ ...@@ -22,31 +22,12 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="flag">
<el-select
v-model="queryParams.flag"
placeholder="请选择设备状态"
clearable
size="small"
style="width: 150px"
>
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">查询</el-button>
</el-form-item> </el-form-item>
<div style="float: right"> <div style="float: right">
<el-form-item> <el-form-item>
<coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @btn-click="handleAdd" /><coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" />
<coolbutton style="padding: 8px 7px;" :type="typePrimary" :name="addName" :size="smallSize" :icon="addIcon" :haspermi="addHaspermi" @btn-click="handleAdd" />
<coolbutton style="padding: 8px 7px;" :type="typeSuccess" :name="exportName" :size="smallSize" :icon="exportIcon" :haspermi="exportHaspermi" @btn-click="handleExport" />
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -70,16 +51,6 @@ ...@@ -70,16 +51,6 @@
{{ scope.row.roleSort || '-' }} {{ scope.row.roleSort || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" align="center" width="100">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
active-value="1"
inactive-value="0"
@change="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime"> <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span> <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
...@@ -164,8 +135,6 @@ ...@@ -164,8 +135,6 @@
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -508,7 +477,7 @@ export default { ...@@ -508,7 +477,7 @@ export default {
this.reset() this.reset()
this.getMenuTreeselect() this.getMenuTreeselect()
this.open = true this.open = true
this.title = '添加角色' this.title = '添加设备'
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
...@@ -524,7 +493,7 @@ export default { ...@@ -524,7 +493,7 @@ export default {
this.$refs.menu.setCheckedKeys(res.data.checkedKeys) this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
}) })
}) })
this.title = '修改角色' this.title = '修改设备'
}) })
}, },
/** 分配数据权限操作 选择菜单 */ /** 分配数据权限操作 选择菜单 */
......
This diff is collapsed.
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="header-container"> <div class="header-container">
<filter-fields <filter-fields
:filter-fields="filterFields" :filter-fields="filterFields"
:optionDic = "optionDic" :option-dic="optionDic"
@search="fileSearch" @search="fileSearch"
@reset="fileSearch" @reset="fileSearch"
/> />
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50"> width="50"
</el-table-column> />
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column <el-table-column
...@@ -232,7 +232,7 @@ export default { ...@@ -232,7 +232,7 @@ export default {
processId: processId, processId: processId,
flowType: 4, flowType: 4,
instanceId: instanceId, instanceId: instanceId,
processName: this.processName, processName: this.processName
} }
}) })
}, },
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="instance-template-title-container-title"> <div class="instance-template-title-container-title">
{{ getTitle }} {{ getTitle }}
</div> </div>
<!-- <el-button v-show="showDownLoad" type="primary" class="download-btn" @click="downFile">下载</el-button>--> <!-- <el-button v-show="showDownLoad" type="primary" class="download-btn" @click="downFile">下载</el-button>-->
</div> </div>
<!-- 主容器 --> <!-- 主容器 -->
<div class="instance-template-main-container"> <div class="instance-template-main-container">
......
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50"> width="50"
</el-table-column> />
<el-table-column prop="actName" label="操作步骤" /> <el-table-column prop="actName" label="操作步骤" />
<el-table-column prop="updateBy" label="操作人" /> <el-table-column prop="updateBy" label="操作人" />
<el-table-column prop="transition" label="操作" /> <el-table-column prop="transition" label="操作" />
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
// 需要提交的表单 // 需要提交的表单
submitForm: { submitForm: {
// 加签类型 // 加签类型
type: '1', type: '1'
}, },
// 多选选中的数据 // 多选选中的数据
multipleSelection: [] multipleSelection: []
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
class="instance-todo-list-search-param" class="instance-todo-list-search-param"
> >
<el-form-item label="申请人"> <el-form-item label="申请人">
<el-input v-model.trim="searchForm.user" :maxlength="30"/> <el-input v-model.trim="searchForm.user" :maxlength="30" />
</el-form-item> </el-form-item>
<el-form-item label="申请人所属部门"> <el-form-item label="申请人所属部门">
<el-cascader <el-cascader
......
<template> <template>
<div class="login"> <div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <img class="fy-logo" src="../../assets/image/denglu_logo.png">--> <!-- <img class="fy-logo" src="../../assets/image/denglu_logo.png">-->
<h3 class="title">信息化管理系统</h3> <h3 class="title">信息化管理系统</h3>
<div class="login-form-content"> <div class="login-form-content">
<el-form-item prop="username"> <el-form-item prop="username">
...@@ -20,20 +20,20 @@ ...@@ -20,20 +20,20 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" /> <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input> </el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="code">--> <!-- <el-form-item prop="code">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="loginForm.code"--> <!-- v-model="loginForm.code"-->
<!-- auto-complete="off"--> <!-- auto-complete="off"-->
<!-- placeholder="验证码"--> <!-- placeholder="验证码"-->
<!-- style="width: 63%"--> <!-- style="width: 63%"-->
<!-- @keyup.enter.native="handleLogin"--> <!-- @keyup.enter.native="handleLogin"-->
<!-- >--> <!-- >-->
<!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />--> <!-- <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- &lt;!&ndash;<div class="login-code">--> <!-- &lt;!&ndash;<div class="login-code">-->
<!-- <img :src="codeUrl" @click="getCode">--> <!-- <img :src="codeUrl" @click="getCode">-->
<!-- </div>&ndash;&gt;--> <!-- </div>&ndash;&gt;-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item style="width:80%;margin-bottom: 20px"> <el-form-item style="width:80%;margin-bottom: 20px">
<el-button <el-button
class="blue-btn" class="blue-btn"
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
class="buttons-content" class="buttons-content"
> >
<el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox> <el-checkbox v-model="loginForm.rememberMe" class="rem-code">记住密码</el-checkbox>
<!-- <el-link--> <!-- <el-link-->
<!-- :underline="false"--> <!-- :underline="false"-->
<!-- @click="goDetail('/forgetPwd')"--> <!-- @click="goDetail('/forgetPwd')"-->
<!-- >--> <!-- >-->
<!-- <router-link to="/forgetPwd">忘记密码</router-link>--> <!-- <router-link to="/forgetPwd">忘记密码</router-link>-->
<!-- </el-link>--> <!-- </el-link>-->
</div> </div>
</div> </div>
</el-form> </el-form>
......
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<el-checkbox v-model="scope.row.isChecked" @change="(val) => { setOrRemoveUser(val, scope.row) }" /> <el-checkbox v-model="scope.row.isChecked" @change="(val) => { setOrRemoveUser(val, scope.row) }" />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column type="selection" width="55" :reserve-selection="true" />--> <!-- <el-table-column type="selection" width="55" :reserve-selection="true" />-->
<el-table-column type="index" label="序号" width="55" /> <el-table-column type="index" label="序号" width="55" />
<!-- <el-table-column property="userId" label="人员编号" width="150" />--> <!-- <el-table-column property="userId" label="人员编号" width="150" />-->
<el-table-column label="姓名" width="200"> <el-table-column label="姓名" width="200">
......
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
<el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline"> <el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline">
<el-form-item label="标题"> <el-form-item label="标题">
<el-input <el-input
placeholder="请输入消息标题"
v-model.trim="queryParams.TITLE" v-model.trim="queryParams.TITLE"
placeholder="请输入消息标题"
:maxlength="30" :maxlength="30"
clearable clearable
/> />
</el-form-item> </el-form-item>
<el-form-item label="接收人"> <el-form-item label="接收人">
<el-input <el-input
placeholder="请输入接收人"
v-model.trim="queryParams.recipientName" v-model.trim="queryParams.recipientName"
placeholder="请输入接收人"
:maxlength="30" :maxlength="30"
clearable clearable
/> />
...@@ -33,19 +33,19 @@ ...@@ -33,19 +33,19 @@
border border
> >
<el-table-column type="index" width="50" label="序号" /> <el-table-column type="index" width="50" label="序号" />
<el-table-column :show-overflow-tooltip="true" prop="fromSystem" label="系统" > <el-table-column :show-overflow-tooltip="true" prop="fromSystem" label="系统">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.fromSystem || '-'}} {{ scope.row.fromSystem || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true" > <el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.title || '-'}} {{ scope.row.title || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true" > <el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.content || '-'}} {{ scope.row.content || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="type" label="类型"> <el-table-column prop="type" label="类型">
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="recipientName" label="接收人" > <el-table-column :show-overflow-tooltip="true" prop="recipientName" label="接收人">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.recipientName || '-'}} {{ scope.row.recipientName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createTime"> <el-table-column :show-overflow-tooltip="true" label="创建时间" align="center" prop="createTime">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="body"> <div class="body">
<!-- 条件查询 --> <!-- 条件查询 -->
<section class="search-group"> <section class="search-group">
<el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline"> <el-form style="padding: 0 0 0 10px" :inline="true" size="small" class="demo-form-inline">
<el-form-item label="标题"> <el-form-item label="标题">
<el-input v-model.trim="queryParams.TITLE" clearable :maxlength="30" placeholder="请输入消息标题" /> <el-input v-model.trim="queryParams.TITLE" clearable :maxlength="30" placeholder="请输入消息标题" />
</el-form-item> </el-form-item>
...@@ -24,29 +24,29 @@ ...@@ -24,29 +24,29 @@
style="width: 100%;" style="width: 100%;"
> >
<el-table-column type="index" width="50" label="序号" /> <el-table-column type="index" width="50" label="序号" />
<el-table-column prop="fromSystem" label="系统" > <el-table-column prop="fromSystem" label="系统">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.fromSystem || '-'}} {{ scope.row.fromSystem || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true" > <el-table-column prop="title" label="标题" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.title || '-'}} {{ scope.row.title || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true" > <el-table-column prop="content" label="内容" width="300" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.content || '-'}} {{ scope.row.content || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="receiveMail" label="接收人邮箱" show-overflow-tooltip> <el-table-column prop="receiveMail" label="接收人邮箱" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.receiveMail || '-'}} {{ scope.row.receiveMail || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="createTime" width="180" label="创建时间" show-overflow-tooltip> <el-table-column prop="createTime" width="180" label="创建时间" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm')}} {{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="操作" width="250">--> <!-- <el-table-column label="操作" width="250">-->
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
/> />
<span style="font-size: 12px;">${name}代表员工姓名,${item}代表物品名称,${tel}代表电话号码</span> <span style="font-size: 12px;">${name}代表员工姓名,${item}代表物品名称,${tel}代表电话号码</span>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="pcIcon" label="PC图标" :show-overflow-tooltip="true"> <el-table-column prop="pcIcon" label="PC图标" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 图片预览--> <!-- 图片预览-->
<template v-if="scope.row.pcIcon"> <template v-if="scope.row.pcIcon">
<viewer :images="[]"> <viewer :images="[]">
<img style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.pcIcon"> <img style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.pcIcon">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="mobileIcon" label="mobile图标" width="150"> <el-table-column prop="mobileIcon" label="mobile图标" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 图片预览--> <!-- 图片预览-->
<template v-if="scope.row.mobileIcon"> <template v-if="scope.row.mobileIcon">
<viewer :images="[]"> <viewer :images="[]">
<img v-if="scope.row.mobileIcon" style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.mobileIcon"> <img v-if="scope.row.mobileIcon" style="height: 34px;width: 40px;margin-top: 2.5px;cursor: pointer" :src="scope.row.mobileIcon">
......
...@@ -392,22 +392,22 @@ export default { ...@@ -392,22 +392,22 @@ export default {
// const query = Object.assign({}, this.queryParams) // const query = Object.assign({}, this.queryParams)
// query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYYMM') : '' // query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYYMM') : ''
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => { list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.list = response.rows.map(item => { this.list = response.rows.map(item => {
const title = item.title const title = item.title
if (title) { if (title) {
const temp = title.split('-') const temp = title.split('-')
const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-') const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
item.systemMode = systemMode item.systemMode = systemMode
item.optionName = temp[temp.length - 1] item.optionName = temp[temp.length - 1]
} else { } else {
item.systemMode = undefined item.systemMode = undefined
item.optionName = undefined item.optionName = undefined
} }
return item return item
}) })
this.total = response.total this.total = response.total
this.loading = false this.loading = false
} }
) )
}, },
handleClose() { handleClose() {
......
...@@ -392,22 +392,22 @@ export default { ...@@ -392,22 +392,22 @@ export default {
// const query = Object.assign({}, this.queryParams) // const query = Object.assign({}, this.queryParams)
// query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYY-MM-DD HH:mm:ss') : '' // query.operTime = query.operTime ? this.$parseDate(new Date(query.operTime), 'YYYY-MM-DD HH:mm:ss') : ''
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => { list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.list = response.rows.map(item => { this.list = response.rows.map(item => {
const title = item.title const title = item.title
if (title) { if (title) {
const temp = title.split('-') const temp = title.split('-')
const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-') const systemMode = temp.filter((item, index) => { return index < temp.length - 1 }).join('-')
item.systemMode = systemMode item.systemMode = systemMode
item.optionName = temp[temp.length - 1] item.optionName = temp[temp.length - 1]
} else { } else {
item.systemMode = undefined item.systemMode = undefined
item.optionName = undefined item.optionName = undefined
} }
return item return item
}) })
this.total = response.total this.total = response.total
this.loading = false this.loading = false
} }
) )
}, },
handleClose() { handleClose() {
......
<template> <template>
<div class="user-manage"> <div class="user-manage">
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto"> <el-form v-show="showSearch" ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" :inline="true" label-width="auto">
<!-- <el-form-item label="用户类型" prop="name" class="noMargin">--> <!-- <el-form-item label="用户类型" prop="name" class="noMargin">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.name"--> <!-- v-model="queryParams.name"-->
<!-- placeholder="请输入用户类型"--> <!-- placeholder="请输入用户类型"-->
<!-- clearable--> <!-- clearable-->
<!-- :maxlength="30"--> <!-- :maxlength="30"-->
<!-- size="small"--> <!-- size="small"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="登录名" prop="username"> <el-form-item label="登录名" prop="username">
<el-input <el-input
v-model="queryParams.username" v-model="queryParams.username"
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
</el-form-item> </el-form-item>
<el-form-item style="float: right"> <el-form-item style="float: right">
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:add']" v-hasPermi="['sys:user:add']"
style="padding: 8px 7px;"
type="primary" type="primary"
size="small" size="small"
icon="el-icon-plus" icon="el-icon-plus"
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@click="handleImport" @click="handleImport"
>导入</el-button> >导入</el-button>
<el-button <el-button
style="padding: 8px 7px;"
v-hasPermi="['sys:user:export']" v-hasPermi="['sys:user:export']"
style="padding: 8px 7px;"
type="success" type="success"
size="small" size="small"
icon="el-icon-download" icon="el-icon-download"
...@@ -211,16 +211,17 @@ ...@@ -211,16 +211,17 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="手机号码" prop="phone"> <el-form-item label="手机号码" prop="phone">
<el-input <el-input
value="phone"
v-model.trim="form.phone" v-model.trim="form.phone"
value="phone"
placeholder="请输入手机号码" placeholder="请输入手机号码"
maxlength="11" /> maxlength="11"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="邮箱" prop="email"> <el-form-item label="邮箱" prop="email">
<el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" /> <el-input v-model.trim="form.email" placeholder="请输入邮箱" maxlength="25" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -239,13 +240,13 @@ ...@@ -239,13 +240,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户类型" prop="name"> <el-form-item label="用户类型" prop="name">
<el-input v-model.trim="form.name" placeholder="请输入用户类型" /> <el-input v-model.trim="form.name" placeholder="请输入用户类型" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="身份证号" prop="idNumber"> <el-form-item label="身份证号" prop="idNumber">
<el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" /> <el-input v-model.trim="form.idNumber" placeholder="请输入身份证号" maxlength="18" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
width="120" width="120"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.$index + 1}} {{ scope.$index + 1 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="deptId" label="部门编号"> <el-table-column :show-overflow-tooltip="true" prop="deptId" label="部门编号">
......
...@@ -420,11 +420,11 @@ export default { ...@@ -420,11 +420,11 @@ export default {
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.options = response.rows this.options = response.rows
this.typeList = response.rows this.typeList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
} }
) )
}, },
// 获取当前父字典数据 // 获取当前父字典数据
......
...@@ -266,7 +266,7 @@ import dictCons from '@/utils/dictCons' ...@@ -266,7 +266,7 @@ import dictCons from '@/utils/dictCons'
import Coolbutton from '@/components/coolbutton' import Coolbutton from '@/components/coolbutton'
export default { export default {
name: 'Menu', name: 'Menu',
components: { Treeselect, IconSelect,Coolbutton }, components: { Treeselect, IconSelect, Coolbutton },
data() { data() {
var trueGroupName = (rule, value, callback) => { var trueGroupName = (rule, value, callback) => {
if (!value.trim()) { if (!value.trim()) {
......
...@@ -113,8 +113,7 @@ ...@@ -113,8 +113,7 @@
inactive-value="0" inactive-value="0"
active-value="1" active-value="1"
@click.native="handleStatusChange(scope.row)" @click.native="handleStatusChange(scope.row)"
> />
</el-switch>
</template> </template>
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.flag || '-' }}--> <!-- {{ scope.row.flag || '-' }}-->
...@@ -227,7 +226,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css' ...@@ -227,7 +226,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import dictCons from '@/utils/dictCons' import dictCons from '@/utils/dictCons'
import { listDept } from '@/api/system/dept' import { listDept } from '@/api/system/dept'
import { listRole } from '@/api/system/role' import { listRole } from '@/api/system/role'
import {updateType} from "@/api/system/dict/type"; import { updateType } from '@/api/system/dict/type'
export default { export default {
name: 'Post', name: 'Post',
components: { Treeselect }, components: { Treeselect },
......
...@@ -660,10 +660,10 @@ export default { ...@@ -660,10 +660,10 @@ export default {
getList() { getList() {
this.loading = true this.loading = true
listUser(this.queryParams).then(response => { listUser(this.queryParams).then(response => {
this.userList = response.rows this.userList = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
} }
) )
}, },
roleChange(e) { roleChange(e) {
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
width="50"> width="50"
</el-table-column> />
<el-table-column <el-table-column
prop="date" prop="date"
label="日期" label="日期"
......
This diff is collapsed.
This diff is collapsed.
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