From cc9ddf2ecaf3ad935374f49c842227f7eb15779d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 十一月 2022 10:21:15 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/images/index.vue | 355 ++++++++++++++++------------------------------------------
1 files changed, 101 insertions(+), 254 deletions(-)
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index dd18d97..558d931 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -5,17 +5,24 @@
<div class="search">
<span>绫诲瀷鏌ヨ:</span>
<div class="option">
- <el-input v-model="info.type" placeholder="璇疯緭鍏ラ棶棰樼被鍨�"></el-input>
+ <el-input v-model="type" placeholder="璇疯緭鍏ョ被鍨�"></el-input>
</div>
<span>涓婁紶鏃堕棿:</span>
<div class="option">
- <el-input v-model="info.startTime" placeholder="閫夋嫨涓婁紶鏃堕棿"></el-input>
+ <el-date-picker
+ v-model="datePicked"
+ type="datetimerange"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
</div>
<div class="findBtn">
- <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
+ <el-button type="primary" @click="getImageResourceList">鏌ヨ</el-button>
</div>
<div class="findBtn">
- <el-button type="primary" @click="addImages">娣诲姞鍥剧墖</el-button>
+ <el-button type="primary" @click="handleUpdateImageResource(null, 'create')">娣诲姞鍥剧墖</el-button>
</div>
</div>
</div>
@@ -23,7 +30,7 @@
<main>
<div class="mainContent">
<div class="type-nav">
- <div @click="changeTypeChecked(index)" v-for="(item, index) in typeList" :key="item.name"
+ <div @click="changeTypeChecked(item.value)" v-for="item in typeList" :key="item.name"
:class="[item.checked ? 'is-active' : '', 'type-item']">{{ item.name }}</div>
</div>
<!-- 鏁版嵁灞曠ず -->
@@ -33,88 +40,37 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column prop="code" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
+ <el-table-column prop="baseId" label="鎵�灞炰簨浠剁紪鍙�" min-width="18">
</el-table-column>
- <el-table-column prop="questionType" label="闂绫诲瀷" min-width="8">
+ <el-table-column prop="category" label="闂绫诲瀷" min-width="8">
</el-table-column>
- <el-table-column prop="bigType" label="澶х被鍚嶇О" min-width="8">
+ <el-table-column prop="eventSource" label="澶х被鍚嶇О" min-width="8">
</el-table-column>
- <el-table-column prop="smallType" label="灏忕被鍚嶇О" min-width="8">
+ <el-table-column prop="regionName" label="灏忕被鍚嶇О" min-width="8">
</el-table-column>
- <el-table-column prop="imagesId" label="鍥剧墖Id" min-width="8">
+ <el-table-column prop="id" label="鍥剧墖Id" min-width="8">
</el-table-column>
- <el-table-column prop="uploadTime" label="涓婁紶鏃堕棿" min-width="15" v-if="mystatus === 1">
+ <el-table-column prop="createTime" label="涓婁紶鏃堕棿" min-width="15" v-if="mystatus === 1">
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="operation">
- <span @click="handleFind(scope.row)">鏌ョ湅</span>
+ <span @click="handleUpdateImageResource(scope.row, 'view')">鏌ョ湅</span>
<span class="line">|</span>
- <span @click="handleUpdate(scope.row)">淇敼</span>
+ <span @click="handleUpdateImageResource(scope.row, 'update')">淇敼</span>
<span class="line">|</span>
<span @click="handleDelete(scope.row)">鍒犻櫎</span>
</div>
</template>
</el-table-column>
</el-table>
- <!-- 璇︽儏椤靛睍绀� -->
- <el-dialog :visible.sync="dialogView" width="80%" title="鍩虹淇℃伅(浜哄伐)" v-if="dialogView"
- :before-close="handleClose">
- <MyDetail :info=info v-if="mystatus == 1 ? true : false"></MyDetail>
- <MyIllDetail :info=info v-else></MyIllDetail>
+ <el-dialog
+ :visible.sync="isShowUploadDialog"
+ width="40%"
+ :title="getDialogTitle"
+ >
+ <updateUser @closeDialog="closeDialog" :dialogType="dialogType" :originalData="originalData" />
</el-dialog>
- <!-- 涓婁紶椤甸潰 -->
- <!-- <el-dialog :visible.sync="dialogUpload" width="80%" title="涓婁紶澶勭疆缁撴灉" v-if="dialogUpload"
- :before-close="handleClose"> -->
- <!-- <uploadVio v-if="mystatus === 1" :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadVio>
- <uploadIll v-else :caseId="caseId" :mycode="caseCode" @closeDialog="closeDialog"></uploadIll> -->
- <!-- </el-dialog> -->
- <!-- tools -->
- <!-- 鏌ョ湅淇敼椤甸潰 -->
- <el-dialog
- :visible.sync="dialogUpdate"
- width="40%"
- title="淇敼"
- v-if="dialogUpdate"
- :before-close="handleClose"
- >
- <updateUser
- />
- <!-- :updateFlag="updateFlag"
- :userInfo="userInfo"
- :getDepartList="context === '' ? getUserList : search"
- @changeDialog="changMyDialog" -->
- </el-dialog>
- <el-dialog
- :visible.sync="dialogcheck"
- width="40%"
- title="鏌ョ湅"
- v-if="dialogcheck"
- :before-close="handleClose"
- >
- <detailUser
- />
- <!-- :updateFlag="updateFlag"
- :userInfo="userInfo"
- :getDepartList="context === '' ? getUserList : search"
- @changeDialog="changMyDialog" -->
- </el-dialog>
-
- <el-dialog
- :visible.sync="dialogAdd"
- width="40%"
- title="娣诲姞"
- v-if="dialogAdd"
- :before-close="handleClose"
- >
- <createUser
- />
- <!-- :updateFlag="updateFlag"
- :userInfo="userInfo"
- :getDepartList="context === '' ? getUserList : search"
- @changeDialog="changMyDialog" -->
- </el-dialog>
-
<div class="tools">
<div class="funs">
<div class="funsItem funs-sp">
@@ -133,8 +89,7 @@
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
- :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
- @prev-click="handlePrev" @next-click="handleNext">
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -143,58 +98,38 @@
</div>
</template>
<script>
-// import uploadVio from './updateUser/uploadResult/vio'
-// import uploadIll from "./updateUser/uploadResult/ill"
-import createUser from "./createUser";
import updateUser from "./updateUser";
-import detailUser from "./detailUser";
+import imageManagement from "@/api/operate/imageManagement";
+
export default {
- components: {
- // updateUser,
- // uploadVio, uploadIll,
- updateUser, createUser,detailUser
+ components: { updateUser },
+
+ computed: {
+ getDialogTitle() {
+ if (this.dialogType === 'create') {
+ return '鍒涘缓';
+ }
+
+ if (this.dialogType === 'update') {
+ return '鏇存柊';
+ }
+
+ if (this.dialogType === 'view') {
+ return '鏌ョ湅';
+ }
+ }
},
+
data() {
return {
- dialogUpdate:false,
- dialogcheck:false,
- tableData: [
- {
- code: "IMG202211010001",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- },
- {
- code: "IMG202211010002",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- },
- {
- code: "IMG202211010003",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- },
- {
- code: "IMG202211010004",
- questionType: "杩濊",
- bigType: "杩濆弽鍥藉鏈夊叧鏍囧噯缂栧埗鍩庝埂瑙勫垝",
- smallType: "鍦ㄥ眳姘戜綇瀹呮ゼ銆佹湭閰嶅璁剧珛涓撶敤鐑熼亾鐨勫晢浣忕患鍚堟ゼ銆佸晢浣忕患鍚堟ゼ鍐呬笌灞呬綇灞傜浉閭荤殑鍟嗕笟妤煎眰鍐呮柊寤恒�佹敼寤恒�佹墿寤轰骇鐢熸补鐑熴�佸紓鍛炽�佸簾姘旂殑椁愰ギ鏈嶅姟椤圭洰",
- imagesId: "1",
- uploadTime: "2022-10-31 20:20:01"
- }
- ],
- context: "",
+ isShowUploadDialog:false,
+ dialogType: 'create',
+ originalData: null,
+ type: '',
+ size: '',
+ importTime: null,
+ tableData: [],
dialogUpload: false,
- // dialogUpdate: false,
dialogView: false,
updateFlag:false,
userInfo:{},
@@ -238,55 +173,36 @@
checked: false,
},
],
- statusArr: [],
mystatus: 1,
caseId: '',
caseCode: null,
- dialogAdd:false,
+ dialogAdd: false,
+ datePicked: null
}
},
created() {
- this.statusArr[0] = 6;
- this.typeList.forEach(item => {
- if (item.checked) {
- this.statusArr[1] = item.value;
- }
- })
- this.getUserList();
+ this.size = this.typeList.find(item => item.checked).value;
+ this.getImageResourceList();
},
methods: {
//淇敼
- handleUpdate(){
- this.dialogUpdate=true;
+ handleUpdateImageResource(data, type){
+ this.dialogType = type;
+ this.originalData = data;
+ this.isShowUploadDialog = true;
},
- // 鏌ョ湅
- handleFind(){
- this.dialogcheck=true;
- },
- // 椤堕儴涓嬫媺妗�
- setMystatus(value) {
- console.log(value);
- this.statusArr[1] = value;
- this.changeTypeChecked(value - 1);
- this.getUserList();
- },
+
// 鎵归噺鍒犻櫎
mulDelete(idArr) {
- console.log(idArr);
- this.$axios({
- method: 'delete',
- url: 'sccg/violations/batch_delete?ids=' + idArr,
- }).then(res => {
- this.getUserList();
- this.$message({
- message: res.message,
- type: res.code === 200 ? 'success' : 'warning'
- })
- })
+ imageManagement.deleteImageResources({ ids: idArr })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getImageResourceList();
+ })
+ .catch(err => this.$message.error(`${err}`))
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
if (list === 3) {
this.preMyIdx = list;
@@ -306,11 +222,7 @@
list.forEach(item => {
this.tempList.push(item.code);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 鍏ㄩ��
selectAll() {
@@ -323,127 +235,60 @@
})
},
// 鍒犻櫎鍗曟潯鏁版嵁
- handleDelete({ number }) {
- console.log(number);
+ handleDelete({ id }) {
this.$confirm('纭鍒犻櫎锛�')
- .then(_ => {
- console.log(1);
- this.$axios({
- method: 'delete',
- url: `sccg/violations/delete?id=${number}`,
- })
- .then(res => {
- console.log(res);
- this.$message({
- type: res.code === 200 ? 'success' : 'warning',
- message: res.message
- })
-
- this.getUserList();
- })
+ .then(() => {
+ imageManagement.deleteImageResource({ id: id })
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ })
+ .catch(err => this.$message.error(`${err}`))
})
- .catch(_ => { console.log(2) });
},
- // 鑾峰彇鐢ㄦ埛鍒楄〃
- getUserList() {
- const { currentPage, pageSize, context, statusArr } = this;
- console.log(statusArr);
- // this.$axios({
- // method: 'get',
- // url: `sccg/base_case/query?state=${statusArr[0]}¤t=${currentPage}&size=${pageSize}&resource=2&type=${statusArr[1]}`
- // }).then(res => {
- // this.totalNum = res.data.total;
- // this.tableData = res.data.records;
- // console.log(res);
- // })
+
+ getImageResourceList() {
+ const dateParams = {};
+ if (this.datePicked) {
+ dateParams.startTime = dateParams[0];
+ dateParams.endTime = dateParams[1]
+ }
+ imageManagement.getImageResources({ current: this.currentPage, size: this.size, type: this.type, ...dateParams })
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch(err => this.$message({ type: 'error', message: err }))
},
// 鏇存敼杩濊/杩濆缓
changeTypeChecked(idx) {
this.typeList.forEach((item, index) => {
- if (index === idx) {
- item.checked = true;
- } else {
- item.checked = false;
- }
+ item.checked = index === idx;
})
this.mystatus = idx + 1;
- console.log(this.mystatus);
- this.statusArr[1] = this.typeList[idx].value;
- this.getUserList();
+ this.size = idx;
+ this.getImageResourceList();
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.getUserList();
- },
- // 涓婁竴椤电偣鍑讳簨浠�
- handlePrev(page) {
- this.currentPage = page;
- this.getUserList();
- },
- // 涓嬩竴椤电偣鍑讳簨浠�
- handleNext(page) {
- this.currentPage = page;
- this.getUserList();
- },
- addImages(){
- this.dialogAdd=true;
- },
- handleClose(done) {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
- this.dialogUpload = false;
- // this.dialogUpdate = false;
- done();
- })
- .catch(_ => { });
- },
- handleClose(done) {
- this.$confirm('纭鍏抽棴锛�')
- .then(_ => {
- this.dialogUpload = false;
- // this.dialogUpdate = false;
- done();
- })
- .catch(_ => { });
- },
- async JumpView(data) {
- await this.getEventInfo(data.code);
- },
- // 鑾峰彇妗堜欢淇℃伅
- async getEventInfo(code) {
- await this.$axios({
- method: 'get',
- url: `sccg/base_case/baseCaseDetail/${code}`
- })
- .then(res => {
- this.info = res.data;
- this.dialogView = true;
- })
+ this.getImageResourceList();
},
opernDialog(data) {
this.dialogUpload = true;
this.caseId = data.id;
this.caseCode = data.code
- // console.log(data);
},
- // 鍏抽棴涓婁紶鐣岄潰
- closeDialog({ flag }) {
- this.dialogUpload = flag;
- this.getUserList();
- },
- // 澶勭悊鏃堕棿
- filterTime(time) {
- return helper(time);
+
+ closeDialog() {
+ this.isShowUploadDialog = false;
}
}
}
@@ -456,7 +301,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.headerContent {
padding: 0 40px;
@@ -516,7 +360,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.btn span:hover {
cursor: pointer;
@@ -637,5 +480,9 @@
.line {
padding: 0 5px;
}
+
+ :deep(.el-range-input) {
+ background-color: #09152f;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0