From 2cc2f4f83a90aac000792a3b65aac9c1aeedbdf1 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期一, 13 十一月 2023 17:33:24 +0800 Subject: [PATCH] +1 --- src/views/operate/disposal/casepool/pool/index.vue | 203 ++++++++++++++++++++++++++++---------------------- 1 files changed, 115 insertions(+), 88 deletions(-) diff --git a/src/views/operate/disposal/casepool/pool/index.vue b/src/views/operate/disposal/casepool/pool/index.vue index 15d727b..36b86f6 100644 --- a/src/views/operate/disposal/casepool/pool/index.vue +++ b/src/views/operate/disposal/casepool/pool/index.vue @@ -1,35 +1,11 @@ <template> <div class="userList"> <header> - <MyHeader @dialogCreatepro="dialogCreatepro" @getUserList ="getUserList"></MyHeader> -<!-- <div class="headerContent">--> -<!-- <div class="search">--> -<!-- <span>鏉ユ簮鏌ヨ:</span>--> -<!-- <div class="option">--> -<!-- <el-select clearable v-model="resource" placeholder="璇烽�夋嫨鏉ユ簮">--> -<!-- <el-option--> -<!-- v-for="item in eventSourceOptions"--> -<!-- :key="item.label"--> -<!-- :label="item.label"--> -<!-- :value="item.value"--> -<!-- >--> -<!-- </el-option>--> -<!-- </el-select>--> -<!-- </div>--> -<!-- <div class="findBtn">--> -<!-- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>--> -<!-- </div>--> -<!-- </div>--> -<!-- <div class="addUser">--> -<!-- <el-button--> -<!-- class="addBtn button-addition"--> -<!-- type="primary"--> -<!-- @click="dialogCreate = true"--> -<!-- >娣诲姞</el-button--> -<!-- >--> - -<!-- </div>--> -<!-- </div>--> + <MyHeader + ref="myHeader" + @dialogCreatepro="dialogCreatepro" + @getUserList="getUserList" + ></MyHeader> </header> <main> <div class="mainContent"> @@ -69,7 +45,8 @@ :row-class-name="tableRowClassName" @selection-change="tableChange" > - <el-table-column type="selection" min-width="5"> </el-table-column> + <el-table-column label="搴忓彿" type="index" min-width="10"> + </el-table-column> <el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18"> <template slot-scope="scope"> <el-link @click="JumpView(scope.row)">{{ @@ -80,7 +57,7 @@ <el-table-column prop="eventSource" label="闂鏉ユ簮" min-width="8"> <template slot-scope="scope"> <span>{{ - scope.row.eventSource === 2 ? "浜哄伐涓婁紶" : "瑙嗛宸℃煡" + scope.row.eventSource === 2 ? "缃戞牸宸℃煡" : "瑙嗛宸℃煡" }}</span> </template> </el-table-column> @@ -103,19 +80,19 @@ show-overflow-tooltip > <template slot-scope="scope"> - <div v-if="mystatus === 2"> + <div v-if="mystatus === 2"> <span>{{ - scope.row.buildingLength + - "绫�" + - "銆�" + - scope.row.buildingWidth + - "绫�" + - "銆�" + - scope.row.buildingHigh + - "绫�" - }}</span> - </div> - <div v-else>{{ scope.row.site }}</div> + 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 @@ -143,7 +120,7 @@ <el-table-column prop="operation" label="鎿嶄綔" min-width="20"> <template slot-scope="scope"> <div class="operation" v-if="statusArr[0] === 0"> - <span @click="handleFind(scope.row)">涓婃姤</span> + <span @click="handleUpload(scope.row)">涓婃姤</span> <span class="line">|</span> <span @click="handleDispatch(scope.row)">璋冨害</span> <span class="line">|</span> @@ -159,14 +136,22 @@ </el-table> <!-- 璇︽儏椤靛睍绀� --> <el-dialog + custom-class="customWidth" :visible.sync="dialogView" - width="60%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView" - :before-close="handleClose" + :before-close="handleClose2" > - <MyDetail :info="info" v-if="mystatus === 1"></MyDetail> - <MyIllDetail :info="info" v-else></MyIllDetail> + <MyDetail + style="min-width: 300px" + :info="info" + v-if="mystatus === 1" + ></MyDetail> + <MyIllDetail + style="min-width: 500px" + :info="info" + v-else + ></MyIllDetail> </el-dialog> <!-- 璋冨害 --> <el-dialog @@ -218,35 +203,35 @@ </main> <!-- 閫夋嫨鐧昏绫诲瀷 --> <el-dialog - :before-close="handleClose" - :visible.sync="dialogCreate" - title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" - width="45%" - v-if="dialogCreate" + :before-close="handleClose" + :visible.sync="dialogCreate" + title="璇烽�夋嫨涓婃姤浜嬩欢绫诲瀷" + width="45%" + v-if="dialogCreate" > <createUser @getPageProp="setDialog" /> </el-dialog> <!-- 浜嬩欢鐧昏 --> <el-dialog - :before-close="handleClose" - :visible.sync="dialogNewAdd" - :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'" - width="80%" - v-if="dialogNewAdd" + :before-close="handleClose" + :visible.sync="dialogNewAdd" + :title="newAddType === 0 ? '杩濊浜嬩欢鐧昏' : '杩濆缓浜嬩欢鐧昏'" + width="80%" + v-if="dialogNewAdd" > <!-- 杩濆缓鐧昏 --> <MyIll - v-if="newAddType === 1" - :refresh="getUserList" - :mytype="newAddType" - @changeDialog="changeDialog" + v-if="newAddType === 1" + :refresh="getUserList" + :mytype="newAddType" + @changeDialog="changeDialog" /> <!-- 杩濊鐧昏 --> <myVio - v-else - :refresh="getUserList" - :mytype="newAddType" - @changeDialog="changeDialog" + v-else + :refresh="getUserList" + :mytype="newAddType" + @changeDialog="changeDialog" /> </el-dialog> </div> @@ -261,7 +246,7 @@ import helper from "@/utils/mydate"; import { RESOURCE_OPTIONS } from "@/utils/helper"; import basecase from "@/api/operate/basecase"; -import MyHeader from "@/components/seachHeader/index" +import MyHeader from "@/components/seachHeader/index"; export default { components: { createUser, @@ -270,7 +255,7 @@ MyDetail, MyDispatch, MyIllDetail, - MyHeader + MyHeader, }, data() { return { @@ -367,12 +352,10 @@ }); this.getUserList(undefined); }, - mounted() { - }, + mounted() {}, methods: { - dialogCreatepro(){ - console.log('-------------------') - this.dialogCreate = true + dialogCreatepro() { + this.dialogCreate = true; }, // 璋冨害 handleDispatch(data) { @@ -450,24 +433,47 @@ // 鑾峰彇鐢ㄦ埛鍒楄〃 getUserList(seachData) { // console.log(seachData.seachData.resource) - let params - if (seachData){ - params = { + let params; + if (seachData) { + params = { current: this.currentPage, state: this.statusArr[0] ?? null, size: this.pageSize, - resource: seachData.seachData.resource ==undefined ?null:seachData.seachData.resource, - region:seachData.seachData.region ==undefined?null:seachData.seachData.region, + resource: + seachData.seachData.resource == undefined + ? null + : seachData.seachData.resource, + region: + seachData.seachData.region == undefined + ? null + : seachData.seachData.region, type: this.statusArr[1] ?? null, - code:seachData.seachData.code ==undefined?null:seachData.seachData.code, - categoryBig:seachData.seachData.categoryBig ==undefined?null:seachData.seachData.categoryBig, - categorySmall:seachData.seachData.categorySmall ==undefined?null:seachData.seachData.categorySmall, - site:seachData.seachData.site ==undefined?null:seachData.seachData.site, - street:seachData.seachData.street ==undefined?null:seachData.seachData.street, - alarmTime:seachData.seachData.alarmTime ==undefined?null:seachData.seachData.alarmTime, + code: + seachData.seachData.code == undefined + ? null + : seachData.seachData.code, + categoryBig: + seachData.seachData.categoryBig == undefined + ? null + : seachData.seachData.categoryBig, + categorySmall: + seachData.seachData.categorySmall == undefined + ? null + : seachData.seachData.categorySmall, + site: + seachData.seachData.site == undefined + ? null + : seachData.seachData.site, + street: + seachData.seachData.street == undefined + ? null + : seachData.seachData.street, }; - }else { - + if (seachData.seachData.alarmTime) { + params.startTime = seachData.seachData.alarmTime[0]; + params.endTime = seachData.seachData.alarmTime[1]; + } + } else { params = { current: this.currentPage, state: this.statusArr[0] ?? null, @@ -492,8 +498,16 @@ return "success-row"; } }, - // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼) - handleFind(rowData) {}, + + handleUpload(rowData) { + debugger; + basecase + .uploadEvent(rowData.id) + .then((res) => { + debugger; + }) + .catch((err) => this.$message.error(err)); + }, // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠� changeCurrentPage(page) { this.currentPage = page; @@ -505,6 +519,12 @@ this.dialogCreate = flag; this.dialogView = flag; this.dialogDispatch = flag; + }, + handleClose2(done) { + this.dialogCreate = false; + this.dialogNewAdd = false; + this.dialogDispatch = false; + this.dialogView = false; }, handleClose(done) { this.$confirm("纭鍏抽棴锛�") @@ -528,6 +548,7 @@ this.statusArr[0] = this.tagList[idx].value; this.statusArr[1] = 1; this.getUserList(); + this.$refs.myHeader.seachData = {}; }, // 鏇存敼杩濊/杩濆缓 changeTypeChecked(idx) { @@ -537,6 +558,7 @@ this.mystatus = idx + 1; this.statusArr[1] = this.typeList[idx].value; this.getUserList(); + this.$refs.myHeader.seachData = {}; }, async JumpView(data) { await this.getEventInfo(data.code); @@ -812,3 +834,8 @@ } } </style> +<style> +.customWidth { + width: 1000px !important; +} +</style> -- Gitblit v1.8.0