From 3e60db98fdf6c5b59768ffc81576da3679fafbea Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期一, 14 四月 2025 10:04:42 +0800
Subject: [PATCH] 优化
---
项目代码/client/src/views/tts/DataLogging/Datalogging.vue | 773 ++++++++-----------------------
项目代码/client/src/views/tts/UserManagement/Usermanagement.vue | 650 ++++++---------------------
项目代码/client/dist.7z | 0
3 files changed, 355 insertions(+), 1,068 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/dist.7z" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/dist.7z"
index 32130d9..a01f0cc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/dist.7z"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/dist.7z"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue"
index f2318c7..99343fd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/DataLogging/Datalogging.vue"
@@ -1,52 +1,25 @@
<template>
<div class="Datalogging">
<div class="content">
- <div
- class="checkbox"
- :style="{ width: roleINFO == 1 ? '16rem' : '11rem' }"
- >
- <div
- :class="['item', isactive == 1 ? 'isactive' : '']"
- @click="changeactive(1)"
- >
+ <div class="checkbox" :style="{ width: roleINFO == 1 ? '16rem' : '11rem' }">
+ <div :class="['item', isactive == 1 ? 'isactive' : '']" @click="changeactive(1)">
浠诲姟璁板綍
</div>
- <div
- :class="['item', isactive == 2 ? 'isactive' : '']"
- @click="changeactive(2)"
- >
+ <div :class="['item', isactive == 2 ? 'isactive' : '']" @click="changeactive(2)">
浣滀笟鍗曡褰�
</div>
- <div
- v-if="roleINFO == 1"
- :class="['item', isactive == 3 ? 'isactive' : '']"
- @click="changeactive(3)"
- >
+ <div v-if="roleINFO == 1" :class="['item', isactive == 3 ? 'isactive' : '']" @click="changeactive(3)">
鐧诲綍璁板綍
</div>
</div>
<div class="serch">
<div class="time_box">
- <el-select
- v-if="isactive == 1"
- v-model="queryForm.value"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 6.19rem; height: 2rem; margin-right: 0.98rem"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-if="isactive == 1" v-model="queryForm.value" placeholder="璇烽�夋嫨" size="small"
+ style="width: 8rem; height: 2rem; margin-right: 0.98rem">
+ <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<div class="time">鍒涘缓鏃ユ湡</div>
- <el-date-picker
- v-model="queryForm.selectTime"
- prefix-icon="none"
- clear-icon="none"
- style="
+ <el-date-picker v-model="queryForm.selectTime" prefix-icon="none" clear-icon="none" style="
font-size: 0.75rem !important;
border: 0.06rem solid rgba(222, 222, 222, 1);
border-radius: 0 0.25rem 0.25rem 0;
@@ -54,79 +27,42 @@
width: 19rem;
height: 2rem;
border-left: 0;
- "
- format="YYYY-MM-DD HH:mm:ss"
- type="datetimerange"
- range-separator="~"
- start-placeholder="璧峰鏃ユ湡"
- end-placeholder="鎴鏃ユ湡"
- size="small"
- />
+ " format="YYYY-MM-DD HH:mm:ss" type="datetimerange" range-separator="~" start-placeholder="璧峰鏃ユ湡"
+ end-placeholder="鎴鏃ユ湡" size="small" />
</div>
<div class="serch_box">
<div class="serchb">
- <el-select
- v-model="queryForm.selectType"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100%; height: 100%; font-size: 0.15rem"
- >
- <el-option
- v-for="item in selectoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-model="queryForm.selectType" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%; height: 100%; font-size: 0.15rem">
+ <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
- <input
- v-model="queryForm.selectInput"
- placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
- style="border-left: 0.06rem solid #e2e2e2"
- />
+ <input v-model="queryForm.selectInput" placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储" style="border-left: 0.06rem solid #e2e2e2" />
</div>
- <el-button
- @click="handleQuery"
- type="primary"
- size="small"
- style="margin-left: 0.98rem; height: 2rem"
- >鏌ヨ</el-button
- >
- <el-button size="small" style="height: 2rem" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button @click="handleQuery" type="primary" size="small"
+ style="margin-left: 0.98rem; height: 2rem">鏌ヨ</el-button>
+ <el-button size="small" style="height: 2rem" @click="resetQuery">閲嶇疆</el-button>
</div>
<div class="btns">
<div style="display: flex; align-items: center">
- <el-button
- size="small"
- style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
- @click="printExcel"
- >鎵归噺瀵煎嚭</el-button
- >
+ <el-button size="small" style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
+ @click="printExcel">鎵归噺瀵煎嚭</el-button>
</div>
</div>
<div style="margin-top: 1rem; height: 100%">
<!-- 浠诲姟璁板綍 -->
- <el-table
- empty-text="鏆傛棤鏁版嵁"
- v-if="isactive == 1"
- :data="tableData"
- height="450"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 1" :data="tableData" height="450" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- >
+ }">
<el-table-column type="selection" align="center" />
<el-table-column prop="id" label="搴忓彿" align="center" />
<el-table-column prop="trainNum" label="杞︾粍鍙�" align="center" />
@@ -134,124 +70,74 @@
<el-table-column prop="bogie" label="杞悜鏋�" align="center" />
<el-table-column prop="processDept" label="妫�淇彮缁�" align="center" />
<el-table-column prop="jiShuYuan" label="鎶�鏈憳" align="center" />
- <el-table-column
- prop="zhiJianYuan_LC"
- label="鏈烘璐ㄦ鍛�"
- align="center"
- />
- <el-table-column
- prop="zhiJianYuan_DG"
- label="鍦版矡璐ㄦ鍛�"
- align="center"
- />
- <el-table-column
- prop="zhiJianYuan_DQ"
- label="鐢垫皵璐ㄦ鍛�"
- align="center"
- />
+ <el-table-column prop="zhiJianYuan_LC" label="鏈烘璐ㄦ鍛�" align="center" />
+ <el-table-column prop="zhiJianYuan_DG" label="鍦版矡璐ㄦ鍛�" align="center" />
+ <el-table-column prop="zhiJianYuan_DQ" label="鐢垫皵璐ㄦ鍛�" align="center" />
<el-table-column prop="gongZhang" label="妫�淇伐闀�" align="center" />
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" align="center" />
<el-table-column prop="taskstatus" label="浠诲姟鐘舵��" align="center">
<template #default="scope">
- <span style="color: #ff651a" v-if="scope.row.taskstatus == 0"
- >寰呮淳宸�</span
- >
- <span style="color: #c4ccd5" v-if="scope.row.taskstatus == 1"
- >宸叉淳宸�</span
- >
+ <span style="color: #ff651a" v-if="scope.row.taskstatus == 0">寰呮淳宸�</span>
+ <span style="color: #c4ccd5" v-if="scope.row.taskstatus == 1">宸叉淳宸�</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center">
<template #default="scope">
- <el-button
- size="small"
- type="text"
- @click="Findmore(scope.row.nJtaskID)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <el-button size="small" type="text" @click="Findmore(scope.row.nJtaskID)">鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
<!-- 浣滀笟鍗曡褰� -->
- <el-table
- empty-text="鏆傛棤鏁版嵁"
- v-if="isactive == 2"
- :data="tableData"
- height="450"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 2" :data="tableData" height="450" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- >
+ }">
<el-table-column type="selection" align="center" />
<el-table-column prop="takeName" label="浠诲姟鍚嶇О" align="center" />
<el-table-column prop="jiShuYuan" label="鎶�鏈憳" align="center" />
<el-table-column prop="gongZhang" label="妫�淇伐闀�" align="center" />
- <el-table-column
- prop="dispatchTime"
- label="娲惧伐鏃ユ湡"
- align="center"
- />
+ <el-table-column prop="dispatchTime" label="娲惧伐鏃ユ湡" align="center" />
<el-table-column prop="endTime" label="瀹屾垚鏃ユ湡" align="center" />
<el-table-column label="鏈烘鍔涚煩鍊兼槑缁�" align="center">
<template #default="scope">
- <span
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="LcFindtorque(scope.row.nJtaskID)"
- >鏌ョ湅</span
- >
- </template></el-table-column
- >
+ <span style="color: blue; font-size: 0.88rem; cursor: pointer"
+ @click="LcFindtorque(scope.row.nJtaskID)">鏌ョ湅</span>
+ </template></el-table-column>
<el-table-column prop="address" label="鐢垫皵鍔涚煩鍊兼槑缁�" align="center">
<template #default="scope">
- <span
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="DqFindtorque(scope.row.nJtaskID)"
- >鏌ョ湅</span
- >
+ <span style="color: blue; font-size: 0.88rem; cursor: pointer"
+ @click="DqFindtorque(scope.row.nJtaskID)">鏌ョ湅</span>
</template>
</el-table-column>
<el-table-column prop="address" label="鍦版矡鍔涚煩鍊兼槑缁�" align="center">
<template #default="scope">
- <span
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="DgFindtorque(scope.row.nJtaskID)"
- >鏌ョ湅</span
- >
- </template></el-table-column
- >
+ <span style="color: blue; font-size: 0.88rem; cursor: pointer"
+ @click="DgFindtorque(scope.row.nJtaskID)">鏌ョ湅</span>
+ </template></el-table-column>
</el-table>
<!-- 鐧诲綍璁板綍 -->
- <el-table
- empty-text="鏆傛棤鏁版嵁"
- v-if="isactive == 3"
- :data="tableData"
- height="450"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" v-if="isactive == 3" :data="tableData" height="450" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- >
+ }">
<el-table-column type="selection" align="center" />
<el-table-column prop="account" label="鐧诲綍璐﹀彿" align="center" />
<el-table-column prop="trurName" label="鐪熷疄濮撳悕" align="center" />
@@ -259,695 +145,455 @@
<el-table-column prop="createDate" label="鐧诲綍鏃堕棿" align="center" />
</el-table>
</div>
- <div
- style="
+ <div style="
display: flex;
justify-content: right;
align-self: flex-end;
margin-bottom: 1.19rem;
margin-right: 1.25rem;
- "
- >
- <el-pagination
- size="small"
- background
- layout="prev, pager, next"
- :current-page="pageQuery.page"
- :page-size="pageQuery.rows"
- :total="pageTotal"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ ">
+ <el-pagination size="small" background layout="prev, pager, next" :current-page="pageQuery.page"
+ :page-size="pageQuery.rows" :total="pageTotal" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
</div>
</div>
<!-- 鏌ョ湅璇︽儏寮瑰嚭妗� -->
- <el-dialog
- v-model="dialogVisible"
- title=""
- width="90%"
- :before-close="handleClose"
- :show-close="false"
- >
+ <el-dialog v-model="dialogVisible" title="" width="90%" :before-close="handleClose" :show-close="false">
<template #header="{ close, titleId, titleClass }">
<div class="my-header">
- <h4
- :id="titleId"
- :class="titleClass"
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >
+ <h4 :id="titleId" :class="titleClass" style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold">
鏌ョ湅璇︽儏
</h4>
- <el-icon @click="close" size="15"><CloseBold /></el-icon>
+ <el-icon @click="close" size="15">
+ <CloseBold />
+ </el-icon>
</div>
</template>
<div>
<el-row>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
height: 3.49rem;
background-color: rgba(190, 199, 209, 0.53);
padding-left: 0.5rem;
border: 1px solid #bec7d1;
- "
- >
- <span style="color: #000; font-size: 0.88rem; font-weight: bold"
- >鍩虹淇℃伅</span
- >
+ ">
+ <span style="color: #000; font-size: 0.88rem; font-weight: bold">鍩虹淇℃伅</span>
</el-col>
</el-row>
<el-row>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >杞﹀瀷锛歿{ datildata.trainKind }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">杞﹀瀷锛歿{ datildata.trainKind }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >杞︾粍鍙凤細{{ datildata.trainNum }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">杞︾粍鍙凤細{{ datildata.trainNum }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鑲￠亾锛歿{ datildata.track }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鑲￠亾锛歿{ datildata.track }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >杞﹀帰鍙凤細{{ datildata.coachNum }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">杞﹀帰鍙凤細{{ datildata.coachNum }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >杞悜鏋讹細{{ datildata.bogie }}</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">杞悜鏋讹細{{ datildata.bogie }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >妫�淇彮缁勶細{{ datildata.processDept }}</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">妫�淇彮缁勶細{{ datildata.processDept }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鎶�鏈憳锛歿{ datildata.jiShuYuan }}</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">鎶�鏈憳锛歿{ datildata.jiShuYuan }}</span>
</el-col>
</el-row>
<el-row>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍒涘缓鏃堕棿锛歿{ datildata.createTime }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍒涘缓鏃堕棿锛歿{ datildata.createTime }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >娲惧伐鏃堕棿锛歿{ datildata.dispatchTime }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">娲惧伐鏃堕棿锛歿{ datildata.dispatchTime }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="12"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鎶�鏈憳纭鏃堕棿锛歿{ datildata.confirmTime_JS }}</span
- >
+ " :span="12">
+ <span style="font-size: 0.88rem; color: #000">鎶�鏈憳纭鏃堕棿锛歿{ datildata.confirmTime_JS }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >寮�濮嬫椂闂达細{{ datildata.startTime }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">寮�濮嬫椂闂达細{{ datildata.startTime }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="18"
- >
- <span style="font-size: 0.88rem; color: #000"
- >缁撴潫鏃堕棿锛歿{ datildata.endTime }}</span
- >
+ " :span="18">
+ <span style="font-size: 0.88rem; color: #000">缁撴潫鏃堕棿锛歿{ datildata.endTime }}</span>
</el-col>
</el-row>
- <el-row
- ><el-col
- style="
+ <el-row><el-col style="
display: flex;
align-items: center;
height: 3.49rem;
background-color: rgba(190, 199, 209, 0.53);
padding-left: 0.5rem;
border: 1px solid #bec7d1;
- "
- >
- <span style="color: #000; font-size: 0.88rem; font-weight: bold"
- >璐ㄦ淇℃伅</span
- >
- </el-col></el-row
- >
- <el-row
- ><el-col
- style="
+ ">
+ <span style="color: #000; font-size: 0.88rem; font-weight: bold">璐ㄦ淇℃伅</span>
+ </el-col></el-row>
+ <el-row><el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘璐ㄦ鍛橈細{{ datildata.zhiJianYuan_LC }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘璐ㄦ鍛橈細{{ datildata.zhiJianYuan_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DG }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="8"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DQ }}</span
- >
+ " :span="8">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵璐ㄦ鍛橈細{{ datildata.zhiJianYuan_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >妫�淇伐闀匡細{{ datildata.gongZhang }}</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">妫�淇伐闀匡細{{ datildata.gongZhang }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_LC }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DG }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="8"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DQ }}</span
- >
+ " :span="8">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵璐ㄦ鍛樼‘璁ゆ椂闂达細{{ datildata.confirmTime_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >妫�淇伐闀跨‘璁ゆ椂闂达細{{ datildata.confirmTime_GZ }}</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">妫�淇伐闀跨‘璁ゆ椂闂达細{{ datildata.confirmTime_GZ }}</span>
</el-col>
</el-row>
- <el-row
- ><el-col
- style="
+ <el-row><el-col style="
display: flex;
align-items: center;
height: 3.49rem;
background-color: rgba(190, 199, 209, 0.53);
padding-left: 0.5rem;
border: 1px solid #bec7d1;
- "
- >
- <span style="color: #000; font-size: 0.88rem; font-weight: bold"
- >浣滀笟淇℃伅</span
- >
- </el-col></el-row
- >
- <el-row
- ><el-col
- style="
+ ">
+ <span style="color: #000; font-size: 0.88rem; font-weight: bold">浣滀笟淇℃伅</span>
+ </el-col></el-row>
+ <el-row><el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_LC }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鏈烘鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘杈呭姪鍛橈細{{ datildata.fuZhu_LC }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鏈烘杈呭姪鍛橈細{{ datildata.fuZhu_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DG }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="3"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡杈呭姪鍛橈細{{ datildata.fuZhu_DG }}</span
- >
+ " :span="3">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡杈呭姪鍛橈細{{ datildata.fuZhu_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="4"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DQ }}</span
- >
+ " :span="4">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵鍔涚煩浣滀笟鍛橈細{{ datildata.liJu_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="8"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵杈呭姪鍛橈細{{ datildata.fuZhu_DQ }}</span
- >
+ " :span="8">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵杈呭姪鍛橈細{{ datildata.fuZhu_DQ }}</span>
</el-col>
</el-row>
<el-row>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘寮�濮嬫椂闂达細{{ datildata.startTime_LC }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘寮�濮嬫椂闂达細{{ datildata.startTime_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡寮�濮嬫椂闂达細{{ datildata.startTime_DG }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡寮�濮嬫椂闂达細{{ datildata.startTime_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="12"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵寮�濮嬫椂闂达細{{ datildata.startTime_DQ }}</span
- >
+ " :span="12">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵寮�濮嬫椂闂达細{{ datildata.startTime_DQ }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鏈烘缁撴潫鏃堕棿锛歿{ datildata.endTime_LC }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鏈烘缁撴潫鏃堕棿锛歿{ datildata.endTime_LC }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="6"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鍦版矡缁撴潫鏃堕棿锛歿{ datildata.endTime_DG }}</span
- >
+ " :span="6">
+ <span style="font-size: 0.88rem; color: #000">鍦版矡缁撴潫鏃堕棿锛歿{ datildata.endTime_DG }}</span>
</el-col>
- <el-col
- style="
+ <el-col style="
display: flex;
align-items: center;
border: 1px solid #bec7d1;
height: 3.49rem;
padding-left: 0.7rem;
- "
- :span="12"
- >
- <span style="font-size: 0.88rem; color: #000"
- >鐢垫皵缁撴潫鏃堕棿锛歿{ datildata.endTime_DQ }}</span
- >
+ " :span="12">
+ <span style="font-size: 0.88rem; color: #000">鐢垫皵缁撴潫鏃堕棿锛歿{ datildata.endTime_DQ }}</span>
</el-col>
</el-row>
</div>
</el-dialog>
<!-- 鍔涚煩鍊兼煡鐪� -->
- <el-dialog
- v-model="TorquedialogVisible"
- title=""
- width="55%"
- :before-close="handleClose"
- :show-close="false"
- top="5%"
- >
+ <el-dialog v-model="TorquedialogVisible" title="" width="55%" :before-close="handleClose" :show-close="false"
+ top="5%">
<template #header="{ close, titleId, titleClass }">
<div class="my-header">
- <h4
- :id="titleId"
- :class="titleClass"
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >
+ <h4 :id="titleId" :class="titleClass" style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold">
鍔涚煩鍊兼槑缁嗭紙{{ title }}锛�
</h4>
- <el-icon @click="close" size="15"><CloseBold /></el-icon>
+ <el-icon @click="close" size="15">
+ <CloseBold />
+ </el-icon>
</div>
</template>
<div style="height: 500px; display: flex; align-items: center">
<div style="height: 100%; width: 13.5rem">
- <div
- style="
+ <div style="
width: 17rem;
padding: 0.8rem 2rem;
box-sizing: border-box;
background-color: rgba(247, 247, 247, 1);
- "
- >
- <div
- style="
+ ">
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >浠诲姟鍚嶇О锛�</span
- ><span>{{
+ ">
+ <span style="width: 6rem; text-align: right; display: block">浠诲姟鍚嶇О锛�</span><span>{{
pesonData.length != 0 ? pesonData[0].takename : ""
}}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >鎶�鏈憳锛�</span
- ><span>{{
+ ">
+ <span style="width: 6rem; text-align: right; display: block">鎶�鏈憳锛�</span><span>{{
pesonData.length != 0 ? pesonData[0].jishuyuan : ""
}}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >妫�淇伐闀匡細</span
- ><span>{{
+ ">
+ <span style="width: 6rem; text-align: right; display: block">妫�淇伐闀匡細</span><span>{{
pesonData.length != 0 ? pesonData[0].gonzhang : ""
}}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >璐ㄦ鍛橈細</span
- ><span>{{
+ ">
+ <span style="width: 6rem; text-align: right; display: block">璐ㄦ鍛橈細</span><span>{{
pesonData.length != 0 ? pesonData[0].zhijianyuan : ""
}}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >鍔涚煩浣滀笟鍛橈細</span
- ><span>{{
+ ">
+ <span style="width: 6rem; text-align: right; display: block">鍔涚煩浣滀笟鍛橈細</span><span>{{
pesonData.length != 0 ? pesonData[0].lijuzouyeyuan : ""
}}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >杈呭姪鍛橈細</span
- ><span>{{
+ ">
+ <span style="width: 6rem; text-align: right; display: block">杈呭姪鍛橈細</span><span>{{
pesonData.length != 0 ? pesonData[0].fuzyuan : ""
}}</span>
</div>
- <div
- style="
+ <div style="
color: rgba(16, 16, 16, 1);
font-size: 0.88rem;
display: flex;
margin-top: 0.5rem;
- "
- >
- <span style="width: 6rem; text-align: right; display: block"
- >浠诲姟璇︽儏锛�</span
- >
- <el-popover
- placement="bottom"
- :width="600"
- trigger="click"
- @show="checkTask(pesonData[0].njtakeid)"
- >
+ ">
+ <span style="width: 6rem; text-align: right; display: block">浠诲姟璇︽儏锛�</span>
+ <el-popover placement="bottom" :width="600" trigger="click" @show="checkTask(pesonData[0].njtakeid)">
<template #reference>
- <span style="color: blue; font-size: 0.88rem; cursor: pointer"
- >鏌ョ湅</span
- >
+ <span style="color: blue; font-size: 0.88rem; cursor: pointer">鏌ョ湅</span>
</template>
<el-table :data="taskData" width="100%">
<el-table-column property="trainKind" label="杞﹀瀷" />
@@ -964,31 +610,17 @@
<el-scrollbar height="400px" style="margin-left: 5rem; width: 100%">
<el-timeline>
- <el-timeline-item
- v-for="(activity, index) in activities"
- :key="index"
- :timestamp="
- '鍔涚煩鍊硷細' + activity.torqueOne + '----' + activity.torqueTwo
- "
- >
+ <el-timeline-item v-for="(activity, index) in activities" :key="index" :timestamp="'鍔涚煩鍊硷細' + activity.torqueOne + '----' + activity.torqueTwo
+ ">
{{ activity.craftsStep }}
- <el-popover
- placement="bottom"
- :width="800"
- trigger="click"
- style="margin-left: 0.8rem"
- >
+ <el-popover placement="bottom" :width="800" trigger="click" style="margin-left: 0.8rem">
<template #reference>
- <span
- @click="checkcontent(activity.craftID)"
- style="
+ <span @click="checkcontent(activity.craftID)" style="
color: blue;
font-size: 0.88rem;
cursor: pointer;
border-bottom: 1px solid #4386ff;
- "
- >鏌ョ湅</span
- >
+ ">鏌ョ湅</span>
</template>
<el-table :data="contentData" width="100%">
<el-table-column prop="craftContent" label="宸ヨ壓鍐呭" />
@@ -1495,16 +1127,19 @@
.Datalogging {
display: flex;
background-color: #fff;
+
.content {
width: 100%;
display: flex;
flex-direction: column;
+
.checkbox {
width: 16rem;
display: flex;
justify-content: space-between;
margin-top: 1rem;
margin-left: 1.31rem;
+
.item {
width: 5rem;
height: 1.88rem;
@@ -1516,20 +1151,24 @@
line-height: 1.88rem;
cursor: pointer;
}
+
.isactive {
background-color: rgba(16, 16, 16, 1);
color: rgba(255, 255, 255, 1);
}
}
+
.serch {
display: flex;
margin-top: 1.31rem;
align-items: center;
+
.time_box {
display: flex;
align-items: center;
text-align: center;
margin-left: 0.98rem;
+
.time {
box-sizing: border-box;
width: 6.88rem;
@@ -1543,12 +1182,14 @@
justify-content: center;
}
}
+
.serch_box {
display: flex;
align-items: center;
text-align: center;
margin-left: 0.98rem;
border-radius: 0.38rem;
+
.serchb {
box-sizing: border-box;
width: 6.88rem;
@@ -1559,6 +1200,7 @@
align-items: center;
justify-content: center;
}
+
input {
box-sizing: border-box;
outline: none;
@@ -1571,6 +1213,7 @@
}
}
}
+
.btns {
display: flex;
justify-content: space-between;
@@ -1581,6 +1224,7 @@
box-sizing: border-box;
}
}
+
.my-header {
height: 3.84rem;
display: flex;
@@ -1593,6 +1237,7 @@
.confirmButtonClass {
margin-right: 10px;
}
+
.el-message-box .el-message-box__btns {
flex-direction: row-reverse !important;
justify-content: normal !important;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/UserManagement/Usermanagement.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/UserManagement/Usermanagement.vue"
index ae1bc8d..08bd27d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/UserManagement/Usermanagement.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/UserManagement/Usermanagement.vue"
@@ -2,27 +2,17 @@
<div class="Usermanagement">
<div class="content">
<div class="checkbox">
- <div
- :class="['item', isactive == 1 ? 'isactive' : '']"
- @click="changeactive(1)"
- >
+ <div :class="['item', isactive == 1 ? 'isactive' : '']" @click="changeactive(1)">
鐢ㄦ埛鍒楄〃
</div>
- <div
- :class="['item', isactive == 2 ? 'isactive' : '']"
- @click="changeactive(2)"
- >
+ <div :class="['item', isactive == 2 ? 'isactive' : '']" @click="changeactive(2)">
鐢ㄦ埛瑙掕壊
</div>
</div>
<div class="serch">
<div class="time_box">
<div class="time">鍒涘缓鏃ユ湡</div>
- <el-date-picker
- v-model="queryForm.selectTime"
- prefix-icon="none"
- clear-icon="none"
- style="
+ <el-date-picker v-model="queryForm.selectTime" prefix-icon="none" clear-icon="none" style="
font-size: 0.75rem !important;
border: 0.06rem solid rgba(222, 222, 222, 1);
border-radius: 0 0.25rem 0.25rem 0;
@@ -30,371 +20,178 @@
width: 19rem;
height: 2rem;
border-left: 0;
- "
- format="YYYY-MM-DD HH:mm:ss"
- type="datetimerange"
- range-separator="~"
- start-placeholder="璧峰鏃ユ湡"
- end-placeholder="鎴鏃ユ湡"
- size="small"
- />
+ " format="YYYY-MM-DD HH:mm:ss" type="datetimerange" range-separator="~" start-placeholder="璧峰鏃ユ湡"
+ end-placeholder="鎴鏃ユ湡" size="small" />
</div>
<div class="serch_box">
<div class="serchb">
- <el-select
- v-model="queryForm.selectType"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100%; height: 100%; font-size: 0.15rem"
- >
- <el-option
- v-for="item in selectoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-model="queryForm.selectType" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%; height: 100%; font-size: 0.15rem">
+ <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
- <input
- v-model="queryForm.selectInput"
- placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储"
- style="border-left: 0.06rem solid #e2e2e2"
- />
+ <input v-model="queryForm.selectInput" placeholder="璇疯緭鍏ュ叧閿瘝鎼滅储" style="border-left: 0.06rem solid #e2e2e2" />
</div>
- <el-button
- @click="handleQuery"
- type="primary"
- size="small"
- style="margin-left: 0.98rem; height: 2rem"
- >鏌ヨ</el-button
- >
- <el-button size="small" style="height: 2rem" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button @click="handleQuery" type="primary" size="small"
+ style="margin-left: 0.98rem; height: 2rem">鏌ヨ</el-button>
+ <el-button size="small" style="height: 2rem" @click="resetQuery">閲嶇疆</el-button>
</div>
<div class="btns">
<div style="display: flex; align-items: center">
<!-- 鐢ㄦ埛鍒楄〃鏂板缓 -->
- <el-button
- v-if="isactive == 1"
- type="primary"
- size="small"
- @click="dialogVisible = true"
- style="
+ <el-button v-if="isactive == 1" type="primary" size="small" @click="dialogVisible = true" style="
width: 5.5rem;
height: 2rem;
font-size: 0.88rem;
display: flex;
align-items: center;
- "
- ><el-icon style="margin-right: 0.2rem"> <Plus /> </el-icon
- >鏂板缓</el-button
- >
+ "><el-icon style="margin-right: 0.2rem">
+ <Plus />
+ </el-icon>鏂板缓</el-button>
<!-- 鐢ㄦ埛瑙掕壊鏂板缓 -->
- <el-button
- v-if="isactive == 2"
- type="primary"
- size="small"
- @click="AddRole"
- style="
+ <el-button v-if="isactive == 2" type="primary" size="small" @click="AddRole" style="
width: 5.5rem;
height: 2rem;
font-size: 0.88rem;
display: flex;
align-items: center;
- "
- ><el-icon style="margin-right: 0.2rem"> <Plus /> </el-icon
- >鏂板缓</el-button
- >
- <el-button
- v-if="isactive != 3"
- size="small"
- style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
- @click="printExcel"
- >鎵归噺瀵煎嚭</el-button
- >
- <el-button
- @click="deleteAll"
- size="small"
- style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
- >鎵归噺鍒犻櫎</el-button
- >
+ "><el-icon style="margin-right: 0.2rem">
+ <Plus />
+ </el-icon>鏂板缓</el-button>
+ <el-button v-if="isactive != 3" size="small" style="width: 5.5rem; height: 2rem; font-size: 0.88rem"
+ @click="printExcel">鎵归噺瀵煎嚭</el-button>
+ <el-button @click="deleteAll" size="small"
+ style="width: 5.5rem; height: 2rem; font-size: 0.88rem">鎵归噺鍒犻櫎</el-button>
</div>
</div>
<div style="margin-top: 1rem; height: 100%">
<!-- 鐢ㄦ埛鍒楄〃 -->
- <el-table
- empty-text="鏆傛棤鏁版嵁"
- height="450"
- v-if="isactive == 1"
- :data="tableData"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" height="450" v-if="isactive == 1" :data="tableData" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- @selection-change="UserSelectionChange"
- >
+ }" @selection-change="UserSelectionChange">
<el-table-column type="selection" align="center" min-width="1%" />
- <el-table-column
- prop="userName"
- label="鐧诲綍璐﹀彿"
- align="center"
- min-width="2%"
- />
- <el-table-column
- prop="userTrueName"
- label="鐪熷疄濮撳悕"
- align="center"
- min-width="3%"
- />
- <el-table-column
- prop="phoneNo"
- label="鑱旂郴鏂瑰紡"
- align="center"
- min-width="3%"
- />
- <el-table-column
- prop="role_Id"
- label="鐢ㄦ埛鍒嗙粍"
- align="center"
- min-width="2%"
- />
- <el-table-column
- prop="roleName"
- label="鐢ㄦ埛瑙掕壊"
- align="center"
- min-width="3%"
- />
- <el-table-column
- prop="address"
- label="浜鸿劯鐓х墖"
- align="center"
- min-width="3%"
- >
+ <el-table-column prop="userName" label="鐧诲綍璐﹀彿" align="center" min-width="2%" />
+ <el-table-column prop="userTrueName" label="鐪熷疄濮撳悕" align="center" min-width="3%" />
+ <el-table-column prop="phoneNo" label="鑱旂郴鏂瑰紡" align="center" min-width="3%" />
+ <el-table-column prop="role_Id" label="鐢ㄦ埛鍒嗙粍" align="center" min-width="2%" />
+ <el-table-column prop="roleName" label="鐢ㄦ埛瑙掕壊" align="center" min-width="3%" />
+ <el-table-column prop="address" label="浜鸿劯鐓х墖" align="center" min-width="3%">
<template #default="scope">
- <el-image
- style="width: 70px; height: 70px"
- :src="'http://115.159.85.185:9098' + scope.row.headImageUrl"
- show-progress
- :initial-index="4"
- fit="cover"
- />
+ <el-image style="width: 70px; height: 70px" :src="'http://115.159.85.185:9098' + scope.row.headImageUrl"
+ show-progress :initial-index="4" fit="cover" />
</template>
</el-table-column>
- <el-table-column
- prop="groupID"
- label="鐧惧害浜戝垎缁�"
- align="center"
- min-width="3%"
- />
+ <el-table-column prop="groupID" label="鐧惧害浜戝垎缁�" align="center" min-width="3%" />
<el-table-column label="鏄惁鍚敤" align="center" min-width="2%">
<template #default="scope">
- <el-switch
- :disabled="
- scope.row.userName == 'admin' || scope.row.user_Id == '1'
- "
- v-model="scope.row.enable"
- :active-value="1"
- :inactive-value="0"
- @change="changeSwitch(scope.row)"
- />
+ <el-switch :disabled="(userInfo.userName == 'admin' || userInfo.roleId == '1' ? scope.row.userName == 'admin' || scope.row.user_Id == '1' : scope.row.userName == 'admin' || scope.row.user_Id == '1' || scope.row.userName != userInfo.userName
+ )
+ " v-model="scope.row.enable" :active-value="1" :inactive-value="0" @change="changeSwitch(scope.row)" />
</template>
</el-table-column>
- <el-table-column
- prop="createDate"
- label="鍒涘缓鏃ユ湡"
- align="center"
- min-width="3%"
- />
+ <el-table-column prop="createDate" label="鍒涘缓鏃ユ湡" align="center" min-width="3%" />
<el-table-column label="鎿嶄綔" align="center" min-width="3%">
<template #default="scope">
- <el-button
- size="small"
- type="text"
- @click="Edit(scope.row)"
- :disabled="
- scope.row.userName == 'admin' || scope.row.user_Id == '1'
- "
- >缂栬緫</el-button
- >
- <el-button
- size="small"
- type="text"
- :disabled="
- scope.row.userName == 'admin' || scope.row.user_Id == '1'
- "
- @click="Editpassword(scope.row)"
- >淇敼瀵嗙爜</el-button
- >
- <el-button
- size="small"
- type="text"
- @click="deletUser(scope.row)"
- :disabled="
- scope.row.userName == 'admin' || scope.row.user_Id == '1'
- "
- >鍒犻櫎</el-button
- >
+ <el-button size="small" type="text" @click="Edit(scope.row)" :disabled="scope.row.isdisabled
+ ">缂栬緫</el-button>
+ <el-button size="small" type="text" :disabled="scope.row.isdisabled
+ " @click="Editpassword(scope.row)">淇敼瀵嗙爜</el-button>
+ <el-button size="small" type="text" @click="deletUser(scope.row)" :disabled="scope.row.isdisabled
+ ">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
<!-- 鐢ㄦ埛瑙掕壊 -->
- <el-table
- empty-text="鏆傛棤鏁版嵁"
- height="450"
- v-if="isactive == 2"
- :data="grideData"
- style="width: 100%"
+ <el-table empty-text="鏆傛棤鏁版嵁" height="450" v-if="isactive == 2" :data="grideData" style="width: 100%"
:header-cell-style="{
background: 'rgba(250,250,250,1)',
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
border: 'none',
- }"
- :row-style="{
+ }" :row-style="{
color: '#101010',
fontSize: '0.88rem',
height: '3rem',
- }"
- @selection-change="RoleSelectionChange"
- >
+ }" @selection-change="RoleSelectionChange">
<el-table-column type="selection" align="center" />
<el-table-column prop="roleName" label="瑙掕壊鍚嶇О" align="center" />
<el-table-column prop="name" label="瑙掕壊鏉冮檺" align="center">
<template #default="scope">
- <span
- v-if="
- scope.row.roleName != '瓒呯骇绠＄悊鍛�' || scope.row.roleId != '1'
- "
- @click="toDetail(scope.row)"
- style="color: #4386ff; cursor: pointer"
- >绠＄悊</span
- >
+ <span v-if="!(userInfo.userName == 'admin' || userInfo.roleId == '1' ? scope.row.userName == 'admin' || scope.row.user_Id == '1' : scope.row.userName == 'admin' || scope.row.user_Id == '1' || scope.row.userName != userInfo.userName
+ )
+ " @click="toDetail(scope.row)" style="color: #4386ff; cursor: pointer">绠＄悊</span>
</template>
</el-table-column>
<el-table-column prop="deptName" label="澶囨敞" align="center" />
<el-table-column label="鏄惁鍚敤" align="center">
<template #default="scope">
- <el-switch
- :disabled="
- scope.row.roleName == '瓒呯骇绠＄悊鍛�' || scope.row.roleId == '1'
- "
- v-model="scope.row.enable"
- :active-value="1"
- :inactive-value="0"
- @change="changeRoleSwitch(scope.row)"
- />
+ <el-switch :disabled="!(userInfo.userName == 'admin' || userInfo.roleId == '1'
+ )
+ " v-model="scope.row.enable" :active-value="1" :inactive-value="0"
+ @change="changeRoleSwitch(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃ユ湡" align="center" />
<el-table-column label="鎿嶄綔" align="center">
<template #default="scope">
- <span
- v-if="
- scope.row.roleName != '瓒呯骇绠＄悊鍛�' || scope.row.roleId != '1'
- "
- style="color: blue; font-size: 0.88rem; cursor: pointer"
- @click="EditRole(scope.row)"
- >缂栬緫</span
- >
- </template></el-table-column
- >
+ <span v-if="
+ !(userInfo.userName == 'admin' || userInfo.roleId == '1' ? scope.row.userName == 'admin' || scope.row.user_Id == '1' : scope.row.userName == 'admin' || scope.row.user_Id == '1' || scope.row.userName != userInfo.userName
+ )
+ " style="color: blue; font-size: 0.88rem; cursor: pointer" @click="EditRole(scope.row)">缂栬緫</span>
+ </template></el-table-column>
</el-table>
</div>
- <div
- style="
+ <div style="
display: flex;
justify-content: right;
align-self: flex-end;
margin-bottom: 1.19rem;
margin-right: 1.25rem;
- "
- >
- <el-pagination
- v-if="isactive == 1"
- size="small"
- background
- layout="prev, pager, next"
- :current-page="pageQuery.page"
- :page-size="pageQuery.rows"
- :total="pageTotal"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
- <el-pagination
- v-if="isactive == 2"
- size="small"
- background
- layout="prev, pager, next"
- :current-page="pageQuery.page"
- :page-size="pageQuery.rows"
- :total="pageTotal1"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- />
+ ">
+ <el-pagination v-if="isactive == 1" size="small" background layout="prev, pager, next"
+ :current-page="pageQuery.page" :page-size="pageQuery.rows" :total="pageTotal" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
+ <el-pagination v-if="isactive == 2" size="small" background layout="prev, pager, next"
+ :current-page="pageQuery.page" :page-size="pageQuery.rows" :total="pageTotal1" @size-change="handleSizeChange"
+ @current-change="handleCurrentChange" />
</div>
</div>
<!-- 鐢ㄦ埛淇℃伅鏂板缓缂栬緫寮瑰嚭妗� -->
- <el-dialog
- v-model="dialogVisible"
- title=""
- width="60%"
- :before-close="handleClose"
- :show-close="false"
- :align-center="true"
- @close="resetForm(formUserRef)"
- >
+ <el-dialog v-model="dialogVisible" title="" width="60%" :before-close="handleClose" :show-close="false"
+ :align-center="true" @close="resetForm(formUserRef)">
<template #title>
- <div
- style="
+ <div style="
height: 3.63rem;
display: flex;
border-bottom: 1px solid #e6e6e6;
- "
- >
- <span
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >鐢ㄦ埛淇℃伅</span
- >
+ ">
+ <span style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold">鐢ㄦ埛淇℃伅</span>
</div>
</template>
- <el-form
- :model="formUser"
- label-width="auto"
- label-position="top"
- :rules="rules"
- ref="formUserRef"
- :hide-required-asterisk="true"
- >
+ <el-form :model="formUser" label-width="auto" label-position="top" :rules="rules" ref="formUserRef"
+ :hide-required-asterisk="true">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item prop="username">
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐧诲綍璐﹀彿</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">鐧诲綍璐﹀彿</span>
</div>
</template>
- <el-input
- size="small"
- v-model="formUser.username"
- placeholder="璇疯緭鍏�"
- />
+ <el-input size="small" v-model="formUser.username" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -402,17 +199,10 @@
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐪熷疄濮撳悕</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">鐪熷疄濮撳悕</span>
</div>
</template>
- <el-input
- size="small"
- v-model="formUser.usertruename"
- placeholder="璇疯緭鍏�"
- />
+ <el-input size="small" v-model="formUser.usertruename" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -420,17 +210,10 @@
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鑱旂郴鐢佃瘽</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">鑱旂郴鐢佃瘽</span>
</div>
</template>
- <el-input
- size="small"
- v-model="formUser.phoneno"
- placeholder="璇疯緭鍏�"
- />
+ <el-input size="small" v-model="formUser.phoneno" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
</el-row>
@@ -440,24 +223,13 @@
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢ㄦ埛瑙掕壊
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">鐢ㄦ埛瑙掕壊
</span>
</div>
</template>
- <el-select
- v-model="formUser.roleid"
- placeholder="璇烽�夋嫨"
- size="small"
- >
- <el-option
- :disabled="item.roleId == 20"
- v-for="item in groupOptions"
- :key="item.roleId"
- :label="item.roleName"
- :value="item.roleId"
- />
+ <el-select v-model="formUser.roleid" placeholder="璇烽�夋嫨" size="small">
+ <el-option :disabled="item.roleId == 1" v-for="item in groupOptions" :key="item.roleId"
+ :label="item.roleName" :value="item.roleId" />
</el-select>
</el-form-item>
</el-col>
@@ -466,23 +238,12 @@
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鐢ㄦ埛绫诲瀷
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">鐢ㄦ埛绫诲瀷
</span>
</div>
</template>
- <el-select
- v-model="formUser.rolename"
- placeholder="璇烽�夋嫨"
- size="small"
- >
- <el-option
- v-for="item in roleNameList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-model="formUser.rolename" placeholder="璇烽�夋嫨" size="small">
+ <el-option v-for="item in roleNameList" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -491,23 +252,11 @@
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >鏄惁鍚敤</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">鏄惁鍚敤</span>
</div>
</template>
- <el-select
- v-model="formUser.enable"
- placeholder="璇烽�夋嫨"
- size="small"
- >
- <el-option
- v-for="item in isoptins"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
+ <el-select v-model="formUser.enable" placeholder="璇烽�夋嫨" size="small">
+ <el-option v-for="item in isoptins" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -518,10 +267,7 @@
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span
- style="font-size: 0.88rem; color: black; font-weight: bold"
- >浜鸿劯鍥剧墖</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">浜鸿劯鍥剧墖</span>
<!-- <span
style="
color: rgba(255, 0, 0, 1);
@@ -532,50 +278,26 @@
> -->
</div>
</template>
- <el-upload
- ref="uploadRef"
- name="files"
- class="avatar-uploader"
- action="http://115.159.85.185:9098/api/User/SaveFiles"
- list-type="picture-card"
- limit="1"
- :auto-upload="true"
- @before-upload="beforeAvatarUpload"
- :on-success="handleAvatarSuccess"
- :file-list="fileList != [] ? fileList : []"
- :class="{ hide: showUpload }"
- >
+ <el-upload ref="uploadRef" name="files" class="avatar-uploader"
+ action="http://115.159.85.185:9098/api/User/SaveFiles" list-type="picture-card" limit="1"
+ :auto-upload="true" @before-upload="beforeAvatarUpload" :on-success="handleAvatarSuccess"
+ :file-list="fileList != [] ? fileList : []" :class="{ hide: showUpload }">
<el-icon>
<Plus />
</el-icon>
<template #file="{ file }">
<div>
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- />
+ <img class="el-upload-list__item-thumbnail" :src="file.url" alt="" />
<span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
+ <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<el-icon size="15"><zoom-in /></el-icon>
</span>
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleDownload(file)"
- >
+ <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleDownload(file)">
<el-icon size="15">
<Download />
</el-icon>
</span>
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
+ <span v-if="!disabled" class="el-upload-list__item-delete" @click="handleRemove(file)">
<el-icon size="15">
<Delete />
</el-icon>
@@ -590,19 +312,9 @@
</el-form>
<template #footer>
<div class="dialog-footer" style="text-align: center">
- <el-button
- size="small"
- @click="dialogVisible = false"
- style="height: 2rem; font-size: 0.88rem"
- >鍙栨秷</el-button
- >
+ <el-button size="small" @click="dialogVisible = false" style="height: 2rem; font-size: 0.88rem">鍙栨秷</el-button>
- <el-button
- size="small"
- type="primary"
- @click="saveObj(formUserRef)"
- style="height: 2rem; font-size: 0.88rem"
- >
+ <el-button size="small" type="primary" @click="saveObj(formUserRef)" style="height: 2rem; font-size: 0.88rem">
淇濆瓨
</el-button>
</div>
@@ -610,39 +322,21 @@
</el-dialog>
<!-- 鐢ㄦ埛淇℃伅淇敼瀵嗙爜寮瑰嚭妗� -->
- <el-dialog
- v-model="dialogVisible1"
- title=""
- width="30%"
- :before-close="handleClose"
- :show-close="false"
- :align-center="true"
- >
+ <el-dialog v-model="dialogVisible1" title="" width="30%" :before-close="handleClose" :show-close="false"
+ :align-center="true">
<template #title>
- <div
- style="
+ <div style="
height: 3.63rem;
display: flex;
border-bottom: 1px solid #e6e6e6;
- "
- >
- <span
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >鐢ㄦ埛淇℃伅</span
- >
+ ">
+ <span style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold">鐢ㄦ埛淇℃伅</span>
</div>
</template>
- <el-form
- :model="newobj"
- label-width="auto"
- label-position="top"
- ref="formpasswordRef"
- :rules="passwordrules"
- >
+ <el-form :model="newobj" label-width="auto" label-position="top" ref="formpasswordRef" :rules="passwordrules">
<el-row>
<el-col>
- <div
- style="
+ <div style="
height: 3.63rem;
display: flex;
align-items: center;
@@ -650,40 +344,23 @@
padding: 0 2rem;
box-sizing: border-box;
border-radius: 0.25rem;
- "
- >
- <span style="color: #51b820; font-size: 1rem"
- >璐﹀彿锛歿{ formpassword.userName }}</span
- ><span style="color: #51b820; font-size: 1rem; margin-left: 2rem"
- >鐢ㄦ埛锛歿{ formpassword.roleName }}</span
- >
+ ">
+ <span style="color: #51b820; font-size: 1rem">璐﹀彿锛歿{ formpassword.userName }}</span><span
+ style="color: #51b820; font-size: 1rem; margin-left: 2rem">鐢ㄦ埛锛歿{ formpassword.roleName }}</span>
</div>
</el-col>
</el-row>
<el-form-item prop="newPwd">
- <el-input
- style="margin-top: 1rem"
- size="large"
- v-model="newobj.newPwd"
- placeholder="璇疯緭鍏�"
- />
+ <el-input style="margin-top: 1rem" size="large" v-model="newobj.newPwd" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer" style="text-align: center">
- <el-button
- size="small"
- @click="dialogVisible1 = false"
- style="height: 2rem; font-size: 0.88rem"
- >鍙栨秷</el-button
- >
+ <el-button size="small" @click="dialogVisible1 = false"
+ style="height: 2rem; font-size: 0.88rem">鍙栨秷</el-button>
- <el-button
- size="small"
- type="primary"
- @click="savePassword(formpasswordRef)"
- style="height: 2rem; font-size: 0.88rem"
- >
+ <el-button size="small" type="primary" @click="savePassword(formpasswordRef)"
+ style="height: 2rem; font-size: 0.88rem">
淇濆瓨
</el-button>
</div>
@@ -691,84 +368,44 @@
</el-dialog>
<!-- 鐢ㄦ埛瑙掕壊鏂板缓 -->
- <el-dialog
- v-model="dialogVisible2"
- title=""
- width="20%"
- :before-close="handleClose"
- :show-close="false"
- :align-center="true"
- @close="resetForm1(formRoleRef)"
- >
+ <el-dialog v-model="dialogVisible2" title="" width="20%" :before-close="handleClose" :show-close="false"
+ :align-center="true" @close="resetForm1(formRoleRef)">
<template #title>
- <div
- style="
+ <div style="
height: 3.63rem;
display: flex;
border-bottom: 1px solid #e6e6e6;
- "
- >
- <span
- style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold"
- >鐢ㄦ埛瑙掕壊</span
- >
+ ">
+ <span style="color: rgb(16, 16, 16); font-size: 1rem; font-weight: bold">鐢ㄦ埛瑙掕壊</span>
</div>
</template>
- <el-form
- :model="formRole"
- label-width="auto"
- label-position="top"
- ref="formRoleRef"
- :rules="roleRules"
- :hide-required-asterisk="true"
- >
+ <el-form :model="formRole" label-width="auto" label-position="top" ref="formRoleRef" :rules="roleRules"
+ :hide-required-asterisk="true">
<el-form-item prop="roleName">
<template #label>
<div style="display: flex; align-items: flex-end">
<span style="color: red; margin-right: 0.2rem">*</span>
- <span style="font-size: 0.88rem; color: black; font-weight: bold"
- >瑙掕壊鍚嶇О</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">瑙掕壊鍚嶇О</span>
</div>
</template>
- <el-input
- style="height: 2rem"
- size="small"
- v-model="formRole.roleName"
- placeholder="璇疯緭鍏�"
- />
+ <el-input style="height: 2rem" size="small" v-model="formRole.roleName" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item>
<template #label>
<div style="display: flex; align-items: flex-end">
- <span style="font-size: 0.88rem; color: black; font-weight: bold"
- >澶囨敞</span
- >
+ <span style="font-size: 0.88rem; color: black; font-weight: bold">澶囨敞</span>
</div>
</template>
- <el-input
- style="height: 2rem"
- size="small"
- v-model="formRole.description"
- placeholder="璇疯緭鍏�"
- />
+ <el-input style="height: 2rem" size="small" v-model="formRole.description" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer" style="text-align: center">
- <el-button
- size="small"
- @click="dialogVisible2 = false"
- style="height: 2rem; font-size: 0.88rem"
- >鍙栨秷</el-button
- >
+ <el-button size="small" @click="dialogVisible2 = false"
+ style="height: 2rem; font-size: 0.88rem">鍙栨秷</el-button>
- <el-button
- size="small"
- type="primary"
- @click="saveRole(formRoleRef)"
- style="height: 2rem; font-size: 0.88rem"
- >
+ <el-button size="small" type="primary" @click="saveRole(formRoleRef)"
+ style="height: 2rem; font-size: 0.88rem">
淇濆瓨
</el-button>
</div>
@@ -777,15 +414,13 @@
<!-- 鏉冮檺绠＄悊寮瑰嚭妗� -->
<el-dialog v-model="imgdialogVisible">
- <div
- style="
+ <div style="
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center;
- "
- >
+ ">
<img w-full :src="dialogImageUrl" alt="Preview Image" />
</div>
</el-dialog>
@@ -847,7 +482,7 @@
id: undefined,
username: "",
phoneno: "",
- roleid: 21,
+ roleid: 2,
rolename: "",
enable: 1,
path: "",
@@ -893,6 +528,7 @@
const dialogVisible = ref(false);
const imgdialogVisible = ref(false);
const dialogImageUrl = ref("");
+const userInfo = ref()
//鐢ㄦ埛淇℃伅淇敼瀵嗙爜寮瑰嚭妗�
const dialogVisible1 = ref(false);
//鐢ㄦ埛瑙掕壊鏂板缓
@@ -979,7 +615,12 @@
startDate: startTime,
endDate: endTime,
}).then((res) => {
- tableData.value = res.data.items;
+ tableData.value = res.data.items.map((item) => {
+ return {
+ ...item,
+ isdisabled: userInfo.value.userName == 'admin' || userInfo.value.roleId == "1" ? item.userName == "admin" || item.user_Id == "1" : item.userName == "admin" || item.user_Id == "1" || item.userName != userInfo.value.userName
+ };
+ });
pageTotal.value = res.data.totalCount;
});
};
@@ -1072,7 +713,7 @@
formUser.value = {
username: "",
phoneno: "",
- roleid: 21,
+ roleid: 2,
rolename: "",
enable: 1,
path: "",
@@ -1406,10 +1047,10 @@
const toDetail = (row) => {
router.push({ name: "permission", state: { info: JSON.stringify(row) } });
};
-
onMounted(() => {
initData();
getRole();
+ userInfo.value = JSON.parse(localStorage.getItem("user"));
});
</script>
<style lang="scss" scoped>
@@ -1555,6 +1196,7 @@
text-align: center;
}
}
+
:deep(.hide .el-upload--picture-card) {
display: none;
}
--
Gitblit v1.9.3