From b8670cd94a61846ac63573f724fcf91d8dd7be88 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 29 八月 2023 21:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/collection/index.vue | 268 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 163 insertions(+), 105 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 3bba6cc..c5dbaa9 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -51,11 +51,16 @@
-->
</el-form-item>
- <el-form-item label="鏃堕棿" style="padding-left:190px">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd HH-MM"
+ style="width: 197px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 14px 14px 14px 14px;
+ opacity: 0.5;
+ border: 1px solid rgba(0,0,0,0.25);"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -63,34 +68,14 @@
></el-date-picker>
</el-form-item>
- <el-form-item label="绫诲埆" prop="type" >
- <el-input
- v-model="queryParams.type"
- placeholder="璇疯緭鍏ョ被鍒�"
- clearable
- style="width: 240px"
- @keyup.enter.native="handleQuery">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
-
+ <el-form-item label="绫诲埆" prop="type">
+ <el-select v-model="queryParams.type" placeholder="鎵�鏈夌被鍒�" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </el-select>
</el-form-item>
-<!-- <el-form-item label="绫诲埆" prop="type">-->
-<!-- <el-select-->
-<!-- v-model="queryParams.type"-->
-<!-- placeholder="鎵�鏈夌被鍒�"-->
-<!-- clearable-->
-<!-- style="width: 240px"-->
-<!-- @keyup.enter.native="handleQuery"-->
-<!-- >-->
-<!-- <el-option-->
-<!-- v-for="dict in typeOptions"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- />-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
<el-cntainer>
<el-col :span="9" >
<el-form-item>
@@ -195,17 +180,15 @@
</el-row>
</div>
<el-table v-loading="loading" :data="collectionList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
- <el-table-column type="selection" :reserve-selection="true" width="25" align="center" />
+ <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
<el-table-column label="鑾峰緱鏃堕棿" prop="happenTime" sortable width="100" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-form-item label="绫诲埆" prop="type" width="120">
- <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
- <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
+ <el-table-column label="绫诲埆" prop="type" sortable width="120" align="center">
+<!-- <template slot-scope="scope">{{ getSrc(scope.row.type) }}</template>-->
+ <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>
+ </el-table-column>
<el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
<template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -213,7 +196,7 @@
<template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎷ユ湁鑰�" prop="owner" sortable width="110" align="center">
+ <el-table-column label="鎸佹湁鑰�" prop="owner" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -226,25 +209,30 @@
<el-table-column label="澶囨敞" prop="remark" sortable width="90" align="center">
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<template slot-scope="scope" >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== ',' "
- >
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceA.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url === ','"
- >
+ <div @click="handleCheck(scope.row)">
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
+ >
+ <img
+ v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceA.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+
+ ></div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" >
@@ -292,12 +280,18 @@
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
+<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>
+ <el-input v-model='formDat.happenTime' type='date' clearable placeholder='閫夋嫨鏃ユ湡'></el-input>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" >
- </el-input>
+ <el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ <el-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
<el-input v-model="formDat.name" placeholder="璇疯緭鍏ュ悕绉�" clearable :style="{width: '100%'}" >
@@ -307,8 +301,8 @@
<el-input v-model="formDat.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎷ユ湁鑰�" prop="owner">
- <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ嫢鏈夎��" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎸佹湁鑰�" prop="owner">
+ <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="浠锋牸" prop="price">
@@ -324,7 +318,7 @@
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐢靛瓙鏂囦欢 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
list-type="picture-card"
@@ -369,11 +363,12 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -404,8 +399,8 @@
//瀵煎叆鎺ュ彛鍑芥暟
-import {listCollection, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel} from "@/api/collection/index";
-import {enload} from "@/api/doctor";
+import {listCollection,listType, getCollection, addCollection,updateCollection, delCollection,uploadPic,downloadModel,enload} from "@/api/collection/index";
+
import {Message} from "element-ui";
@@ -431,6 +426,7 @@
total: 0,
// 鏀惰棌涓庤崳瑾夎〃鏍兼暟鎹�
collectionList: [],
+ typeList:[],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -444,16 +440,14 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鏀惰棌涓庤崳瑾夎褰�
id:undefined,
@@ -479,7 +473,7 @@
type:undefined,
owner:undefined,
location:undefined,
- happenTime:undefined,
+ // happenTime:undefined,
},
// searchVal:"",
@@ -498,8 +492,8 @@
trigger: 'blur'
}],
happenTime: [{
- // required: true,
- message: '璇疯緭鍏ユ椂闂�',
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
trigger: 'blur'
}],
name: [{
@@ -534,29 +528,15 @@
trigger: 'blur'
}],
},
- typeOptions: [
- {
- value: '閫夐」1',
- label: '閭エ'
- }, {
- value: '閫夐」2',
- label: '鏃ユ湰鍐涘垁'
- }, {
- value: '閫夐」3',
- label: '鑼呭彴閰�'
- }, {
- value: '閫夐」4',
- label: '绾㈡湪'
- }, {
- value: '閫夐」5',
- label: '绾康鍝�'
- }
- ],
+ typeOptions: [],
+ newOption: undefined,
+ showInput: true
};
},
created() {
this.getList();
- this.getCateInfor()
+ this.getTypeOptions();
+ // this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -579,35 +559,101 @@
return "statistics-warning-row";
}
},
+ //绫诲埆
+ addNewOption() {
+ const newOption = this.newOption.trim();
+ if (newOption && !this.typeOptions.includes(newOption)) {
+ this.typeOptions.push(newOption);
+ this.$set(this.formDat, 'type', newOption); // 鏇存柊formDat.type鐨勫�间负鏂扮殑閫夐」
+ }
+ },
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
// console.log(this.queryParams)
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listCollection(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
this.collectionList = response.data.data;
-
this.total = response.data.total;
this.loading = false;
}
);
+ listType(this.queryParams).then(response => {
+ this.typeList = response.data;
+ this.total = response.data.total;
+ // console.log( this.typeList )
+ // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+ this.getTypeOptions();
+ this.loading = false;
+ }
+ );
},
- /** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
+ getTypeOptions() {
+ const filteredOptions = this.typeList.filter(item => typeof item === 'string' && item !== '');
+ // 鍒涘缓涓�涓┖瀵硅薄鐢ㄤ簬瀛樺偍鍞竴鐨勫瓧绗︿覆閫夐」
+ const uniqueOptions = {};
+ // 鏋勫缓涓嬫媺閫夐」鍒楄〃
+ this.typeOptions = filteredOptions.reduce((options, option) => {
+ if (!uniqueOptions[option]) {
+ uniqueOptions[option] = true;
+ options.push({
+ label: option,
+ value: option
+ });
+ }
+ return options;
+ }, []);
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
},
-
+ // /** 鏌ヨ绫诲埆淇℃伅 */
+ // getCateInfor()
+ // {
+ // let _this = this
+ // getCategory().then(response=>{
+ //
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
+ // },
+ //绫诲埆閫夋嫨
+ getSrc(type) {
+ if (type === '閭エ') {
+ return '閭エ'
+ }else if(type === '鏃ユ湰鍐涘垁'){
+ return '鏃ユ湰鍐涘垁'
+ }else if(type === '鑼呭彴閰�'){
+ return '鑼呭彴閰�'
+ }else if(type === '绾㈡湪'){
+ return '绾㈡湪'
+ }else if(type === '绾康鍝�'){
+ return '绾康鍝�'
+ }else if(type === '鐡峰櫒'){
+ return '鐡峰櫒'
+ }else if(type === '涔︾睄'){
+ return '涔︾睄'
+ } else {
+ return '鍏跺畠'
+ }
+ },
handleRemove(file) {
- alert(323)
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -719,6 +765,17 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
},
requestUpload(params)
{
@@ -726,10 +783,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
--
Gitblit v1.9.1