From 5cd763edc85f3b14bc98af906828521d65276f48 Mon Sep 17 00:00:00 2001 From: “dzb” <2632970487@qq.com> Date: 星期四, 13 十月 2022 17:57:11 +0800 Subject: [PATCH] 修改系统框架、消息管理新增 --- src/views/operate/disposal/casepool/pool/index.vue | 86 +++++++++++-------------------------------- 1 files changed, 22 insertions(+), 64 deletions(-) diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue index f45c45c..e49a982 100644 --- a/src/views/operate/disposal/casepool/pool/index.vue +++ b/src/views/operate/disposal/casepool/pool/index.vue @@ -24,7 +24,7 @@ </el-dialog> <!-- 浜嬩欢鐧昏 --> <el-dialog :before-close="handleClose" :visible.sync="dialogNewAdd" - :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="60%" v-if="dialogNewAdd"> + :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏' " width="80%" v-if="dialogNewAdd"> <!-- 杩濆缓鐧昏 --> <MyIll v-if="newAddType === 1" :refresh="getUserList" :mytype=newAddType @changeDialog=changeDialog /> @@ -52,29 +52,36 @@ @selection-change="tableChange"> <el-table-column type="selection" min-width="5"> </el-table-column> - <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="10"> + <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18"> <template slot-scope="scope"> <el-link @click="JumpView(scope.row)">{{scope.row.code}}</el-link> </template> </el-table-column> - <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="10"> + <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8"> <template slot-scope="scope"> <span>{{scope.row.eventSource === 2 ? '浜哄伐涓婃姤' : '瑙嗛涓婁紶'}}</span> </template> </el-table-column> - <el-table-column prop="category" label="澶х被鍚嶇О" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'category' :'category'" :label="mystatus===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="mystatus===1?'10':'20'"> </el-table-column> - <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'type' :'site'" :label="mystatus===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10"> </el-table-column> - <el-table-column prop="actionCause" label="妗堢敱" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'actionCause' :'communityId'" :label="mystatus===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10"> </el-table-column> - <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'site' :''" :label="mystatus===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="mystatus===1?'10' :'20' "> + <template slot-scope="scope"> + <div v-if="mystatus ===2"><span>{{scope.row.buildingLength+'绫�'+'銆�'+ scope.row.buildingWidth+'绫�'+'銆�'+scope.row.buildingHigh+'绫�'}}</span></div> + <div v-else>{{scope.row.site}}</div> + </template> </el-table-column> - <el-table-column prop="streetId" label="鎵�灞炲尯鍩�" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'street' :'buildingArea'" :label="mystatus===1 ? '鎵�灞炲尯鍩�' : '杩濇硶寤虹瓚闈㈢Н'" min-width="10"> </el-table-column> - <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="10"> + <el-table-column prop="alarmTime" label="鎶ヨ鏃堕棿" min-width="15" v-if="mystatus===1"> + <template slot-scope="scope"> + <span>{{filterTime(scope.row.alarmTime)}}</span> + </template> </el-table-column> - <el-table-column prop="continueTime" label="鎸佺画鏃堕棿" min-width="10"> + <el-table-column :prop="mystatus === 1 ? 'continueTime' :'materials'" :label="mystatus===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="10"> </el-table-column> <el-table-column prop="operation" label="鎿嶄綔" min-width="20"> <template slot-scope="scope"> @@ -138,6 +145,7 @@ import MyIll from './createUser/ill' import MyVio from './createUser/vio' import MyDispatch from '@/components/dispatch' +import helper from '@/utils/mydate' export default { components: { createUser, MyIll, MyVio, MyDetail, MyDispatch, MyIllDetail @@ -495,6 +503,10 @@ }) } }) + }, + // 澶勭悊鏃堕棿 + filterTime(time){ + return helper(time); } } } @@ -567,12 +579,6 @@ } } } - - &::v-deep .el-input__inner { - background-color: #09152f; - border: 1px solid #17324c; - } - main { background-color: #09152f; margin-top: 20px; @@ -653,11 +659,6 @@ width: 120px; } - &::v-deep .el-input__inner { - border: none; - background-color: #09152f; - } - &:hover { border: 1px solid #4b9bb7; } @@ -702,15 +703,6 @@ white-space: nowrap; overflow: hidden; } - - &::v-deep .el-table__empty-block { - background-color: #09152f; - } - - &::v-deep .el-table__empty-block { - color: #4b9bb7; - } - .operation { display: flex; @@ -724,40 +716,6 @@ } } - .el-table::v-deep .warning-row { - background: #06122c; - } - - .el-table::v-deep .success-row { - background: #071f39; - } - } - - &::v-deep .el-dialog__header, - &::v-deep .el-dialog__body { - background-color: #06122c; - } - - &::v-deep .el-dialog__header { - display: flex; - align-items: center; - background-color: #fff; - padding: 20px; - line-height: 60px; - } - - &::v-deep .el-dialog__title { - color: #4b9bb7; - } - - &::v-deep .el-dialog__close { - width: 20px; - height: 20px; - // color: #fff; - } - - &::v-deep .el-dialog__body { - padding: 0; } } </style> \ No newline at end of file -- Gitblit v1.8.0