From 1445c7e1f76c4628f4619cf67150a63d6f8f5e90 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期二, 01 十一月 2022 09:04:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/management/myIndex/index.vue | 133 +++++++++++++++++++++++--------------------
1 files changed, 71 insertions(+), 62 deletions(-)
diff --git a/src/views/operate/management/myIndex/index.vue b/src/views/operate/management/myIndex/index.vue
index c1b5985..075adec 100644
--- a/src/views/operate/management/myIndex/index.vue
+++ b/src/views/operate/management/myIndex/index.vue
@@ -19,10 +19,6 @@
</header>
<main>
<div class="mainContent">
- <div class="type-nav">
- <div @click="changeTypeChecked(index)" v-for="(item,index) in typeList" :key="item.name"
- :class="[item.checked ? 'is-active':'','type-item']">{{item.name}}</div>
- </div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
:header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
@@ -30,33 +26,45 @@
@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="myproblem === 1 ? 'category' :'category'" :label="myproblem===1 ? '澶х被鍚嶇О' : '杩濆缓绫诲埆'" :min-width="myproblem===1?'10':'20'">
</el-table-column>
- <el-table-column prop="type" label="灏忕被鍚嶇О" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'type' :'site'" :label="myproblem===1 ? '灏忕被鍚嶇О' : '杩濆缓鍦扮偣'" min-width="10">
</el-table-column>
- <el-table-column prop="actionCause" label="妗堢敱" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'actionCause' :'communityId'" :label="myproblem===1 ? '妗堢敱' : '鎵�灞炵ぞ鍖�'" min-width="10">
</el-table-column>
- <el-table-column prop="site" label="鎶ヨ鐐逛綅" min-width="10">
+ <el-table-column :prop="myproblem === 1 ? 'site' :''" :label="myproblem===1 ? '鎶ヨ鐐逛綅' : '杩濇硶寤虹瓚闀裤�佸銆侀珮'" :min-width="myproblem===1?'10' :'20' ">
+ <template slot-scope="scope">
+ <div v-if="myproblem ===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="myproblem === 1 ? 'street' :'buildingArea'" :label="myproblem===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="myproblem===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="myproblem === 1 ? 'continueTime' :'materials'" :label="myproblem===1 ? '鎸佺画鏃堕棿' : '杩濇硶寤虹瓚鏉愭枡'" min-width="15">
</el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="btn">
- <span @click="handleExamine(scope.row)" v-if="instatus===7 ? true : false">瀹℃牳</span>
- <span class="line" v-if="instatus===7 ? true : false">|</span>
- <span @click="handleClosure(scope.row)">缁撴</span>
+ <!-- v-if="instatus===7 ? true : false" -->
+ <span @click="handleExamine(scope.row)" v-if="instatus===7">瀹℃牳</span>
+ <span @click="handleClosure(scope.row)" v-if="instatus===8">缁撴</span>
+ <span class="line" v-if="instatus !==9">|</span>
+ <span @click="JumpView(scope.row)">鏌ョ湅</span>
</div>
</template>
</el-table-column>
@@ -64,24 +72,32 @@
<!-- 瀹℃牳椤甸潰 -->
<el-dialog :visible.sync="dialogExamine" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogExamine"
:before-close="handleClose">
- <MyExamine :info="info" @closeDialog="closeDialog"></MyExamine>
+ <MyExamine :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyExamine>
+ <MyIllExamine :info="info" v-else @closeDialog="closeDialog"></MyIllExamine>
</el-dialog>
<!-- 缁撴椤甸潰 -->
<el-dialog :visible.sync="dialogClosure" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogClosure"
:before-close="handleClose">
- <MyClosure :info="info" @closeDialog="closeDialog"></MyClosure>
+ <MyClosure :info="info" v-if="myproblem === 1" @closeDialog="closeDialog"></MyClosure>
+ <MyIllClosure :info="info" v-else @closeDialog="closeDialog"></MyIllClosure>
+ </el-dialog>
+ <!-- 璇︽儏椤甸潰 -->
+ <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
+ :before-close="handleNoClose">
+ <MyDetail :info=info v-if="myproblem==1 ? true:false" :mycode = 'code'></MyDetail>
+ <MyIllDetail :info=info v-else :mycode="code"></MyIllDetail>
</el-dialog>
<!-- tools -->
<div class="tools">
<div class="funs">
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
- <div class="funsItem">
+ <div class="funsItem funs-sp">
<el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
</div>
<div class="funsItem">
- <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange">
+ <el-select v-model="myIdx" placeholder="鎵归噺鎿嶄綔" @change="selectChange" disabled>
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value" :disabled="item.disabled">
</el-option>
@@ -102,15 +118,21 @@
<script>
import MyExamine from './components/examine'
import MyClosure from './components/closure'
+import MyIllExamine from './components/illExamine'
+import MyIllClosure from './components/illclosure'
+import MyDetail from '@/components/detail'
+import MyIllDetail from '@/components/illdetail'
+import helper from '@/utils/mydate'
export default {
components: {
- MyExamine,MyClosure
+ MyExamine,MyClosure,MyDetail,MyIllDetail,MyIllExamine,MyIllClosure
},
data() {
return {
tableData: [],
dialogExamine:false,
dialogClosure:false,
+ dialogView:false,
info: {},
totalNum: null,
pageSize: 10,
@@ -154,6 +176,7 @@
caseId: '',
myproblem: 1,
instatus: 7,
+ code:''
}
},
created() {
@@ -245,18 +268,6 @@
this.tableData = res.data.records;
})
},
- // 鏇存敼杩濊/杩濆缓
- changeTypeChecked(idx) {
- this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
- });
- this.myproblem = idx+1;
- this.getUserList();
- },
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
if ((rowIndex + 1) % 2 == 0) {
@@ -289,12 +300,27 @@
})
.catch(_ => { });
},
+ handleNoClose(done) {
+ done();
+ },
async JumpView(data) {
- console.log(data);
+ this.code = data.code
await this.getEventInfo(data.code);
},
// 鑾峰彇妗堜欢淇℃伅
getEventInfo(code) {
+ this.$axios({
+ method: 'get',
+ url: `sccg/base_case/baseCaseDetail/${code}`
+ })
+ .then(res => {
+ console.log(res);
+ this.info = res.data;
+ this.dialogView = true;
+ })
+ },
+ // 鑾峰彇妗堜欢淇℃伅
+ getEventInfo3(code) {
this.$axios({
method: 'get',
url: `sccg/base_case/baseCaseDetail/${code}`
@@ -319,7 +345,7 @@
},
// 鍘诲鏍�
handleExamine({code}) {
- this.getEventInfo(code);
+ this.getEventInfo3(code);
},
// 鍘荤粨妗�
handleClosure({code}){
@@ -338,6 +364,9 @@
// 瀹℃牳鐘舵��
changeInStatus(val){
this.getUserList();
+ },
+ filterTime(time){
+ return helper(time);
}
}
}
@@ -375,30 +404,9 @@
margin-top: 20px;
padding-bottom: 50px;
border: 1pox solid #fff;
-
- .type-nav {
- display: flex;
- line-height: 40px;
- margin-left: 30px;
- padding-top: 10px;
- margin-bottom: 10px;
-
- .type-item {
- width: 80px;
- text-align: center;
-
- &:hover {
- cursor: pointer;
- }
- }
-
- .is-active {
- background-color: #070f22;
- border-radius: 4px;
- color: #fff;
- }
+ .btn span:hover{
+ cursor: pointer;
}
-
.tools {
display: flex;
justify-content: space-between;
@@ -407,12 +415,13 @@
.funs {
display: flex;
-
+ .funs-sp{
+ border: 1px solid #17324c;
+ }
.funsItem {
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
--
Gitblit v1.8.0