| src/layout/components/Navbar.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/device/peripheralUnit/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/user/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/layout/components/Navbar.vue
@@ -18,9 +18,12 @@ <!--</template>--> <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <div class="avatar-wrapper"> <img :src="avatar" class="user-avatar"> <i class="el-icon-caret-bottom" /> <div class="avatar-wrapper" style="float: left; font-size: 14px;"> <!--<img :src="avatar" class="user-avatar">--> <!--<i class="el-icon-caret-bottom" />--> <i class="el-icon-user" style="margin-right: 5px;"></i> <span style="margin-right: 5px;">{{ user.nickName }}</span> <i class="el-icon-arrow-down"></i> </div> <el-dropdown-menu slot="dropdown"> <router-link to="/user/profile"> @@ -48,6 +51,7 @@ import Search from '@/components/HeaderSearch' import RuoYiGit from '@/components/RuoYi/Git' import RuoYiDoc from '@/components/RuoYi/Doc' import { getUserProfile } from "@/api/system/user"; export default { components: { @@ -64,7 +68,8 @@ ...mapGetters([ 'sidebar', 'avatar', 'device' 'device', 'name' ]), setting: { get() { @@ -83,7 +88,20 @@ } } }, data() { return { user: {} } }, created() { this.getUser(); }, methods: { getUser() { getUserProfile().then(response => { this.user = response.data.user; }); }, toggleSideBar() { this.$store.dispatch('app/toggleSideBar') }, src/views/device/peripheralUnit/index.vue
@@ -121,7 +121,7 @@ </el-table-column> <el-table-column label="外设代码" width="80" align="center" prop="code"/> <el-table-column label="外设名称" align="center" prop="name" show-overflow-tooltip/> <el-table-column label="规格型号" align="center" prop="model" min-width="80"/> <el-table-column label="规格型号" align="center" prop="model" min-width="60"/> <el-table-column label="生产厂商" align="center" prop="manufacturer_dictText"/> <el-table-column label="厂商代码" width="100" align="center" prop="vendorCode_dictText"/> <el-table-column label="波特率" width="100" align="center" prop="baudRate"> @@ -129,7 +129,7 @@ <dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/> </template> </el-table-column> <el-table-column label="问询指令" align="center" width="180" prop="readInstruction"/> <el-table-column label="问询指令" align="center" width="220" prop="readInstruction"/> <el-table-column label="指令长度" width="80" align="center" prop="orderLength"/> <el-table-column label="返回长度" width="80" align="center" prop="loopLength"/> <!-- <el-table-column label="解析说明" align="center" min-width="300" show-overflow-tooltip prop="description"/>--> @@ -224,7 +224,7 @@ <el-input v-model="form.loopLength" type='number' placeholder="请输入返回长度" :disabled="disabled"/> </el-form-item> <el-form-item label="解析说明" prop="description"> <el-input v-model="form.description" type="textarea" placeholder="请输入内容" :disabled="disabled"/> <el-input v-model="form.description" type="textarea" placeholder="请输入内容" maxlength="512" show-word-limit :disabled="disabled"/> </el-form-item> <el-form-item label="附件"> <fileUpload v-model="form.filePath" :disabled="disabled"/> @@ -355,7 +355,7 @@ {required: true, message: "附件不能为空", trigger: "blur"} ], description: [ {max: 128, message: '最多输入256个字符', trigger: 'blur' } {max: 512, message: '最多输入512个字符', trigger: 'blur' } ] }, disabled: false, src/views/system/user/index.vue
@@ -141,9 +141,9 @@ <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="50" align="center" /> <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" /> <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户账户" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" /> <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" /> <el-table-column label="所在部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" /> <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible"> <template slot-scope="scope"> @@ -213,8 +213,8 @@ <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-row> <el-col :span="12"> <el-form-item v-if="form.userId == undefined" label="账号" prop="userName"> <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" /> <el-form-item v-if="form.userId == undefined" label="用户账户" prop="userName"> <el-input v-model="form.userName" placeholder="请输入用户账户" maxlength="30" /> </el-form-item> </el-col> <el-col :span="12">
