From d69b46a92af5473813d95fe4786464cece69e5a2 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期三, 30 十一月 2022 11:42:24 +0800
Subject: [PATCH] 上传组件修改
---
src/views/operate/management/myIndex/components/closure/index.vue | 12 ---
src/views/operate/viewEvent/index.vue | 2
src/views/systemSetting/device/bayonet/index.vue | 14 ---
src/views/operate/viewEvent/components/illExamine/index.vue | 1
src/views/systemSetting/device/point/index.vue | 15 +--
src/components/myUpload/index.vue | 96 +++++++++++++----------
src/views/video/index.vue | 6 -
src/views/operate/rectification/surveyList/index.vue | 16 ----
src/views/operate/fivepack/threepack/components/aside/index.vue | 19 +++-
src/views/operate/rectification/taskList/index.vue | 28 ------
10 files changed, 75 insertions(+), 134 deletions(-)
diff --git a/src/components/myUpload/index.vue b/src/components/myUpload/index.vue
index 2eba7da..ba7ab88 100644
--- a/src/components/myUpload/index.vue
+++ b/src/components/myUpload/index.vue
@@ -2,26 +2,21 @@
<div class="my-upload">
<div v-if="pictureList.length > 0" class="image-box">
<div v-for="image in pictureList" class="image-box-item">
- <i
- v-if="isShowUpload"
- @click="handleDeletePicture(image)"
- class="el-icon-delete image-delete-icon"
- ></i>
+ <span v-if="isShowUpload" @click="handleDeletePicture(image)" class="image-delete-icon el-icon-delete"></span>
<el-image :key="image" class="image-content" :src="image"></el-image>
</div>
</div>
<el-upload
- v-if="isShowUpload"
+ v-if="isShowUpload && pictureList.length < limit"
:file-list="fileList"
- action="/sccg/file/medias"
+ action=""
:multiple="multiple"
:show-file-list="flag"
- :before-upload="beforeUpload"
:limit="limit"
- :on-success="handleSuccess"
- :on-error="handleError"
:list-type="listType"
- :headers="getToken()"
+ :auto-upload="true"
+ :http-request="handleUpload"
+ style="margin-left: 14px;"
>
<div class="upload-btn">
<i class="el-icon-plus"></i>
@@ -31,6 +26,8 @@
</div>
</template>
<script>
+import imageManagement from "@/api/operate/imageManagement";
+
export default {
data() {
return {
@@ -44,43 +41,48 @@
limit: 4,
// 鏂囦欢鍒楄〃绫诲瀷
listType: "picture-card",
+ loading: false
};
},
methods: {
- // 涓婁紶涔嬪墠鍥炶皟
- beforeUpload(rawFile) {
+ // 楠岃瘉涓婁紶鏂囦欢
+ validateFile(file) {
if (
- rawFile.type !== "image/png" &&
- rawFile.type !== "image/svg+xml" &&
- rawFile.type !== "image/jpg" &&
- rawFile.type !== "image/jpeg"
+ file.type !== "image/png" &&
+ file.type !== "image/svg+xml" &&
+ file.type !== "image/jpg" &&
+ file.type !== "image/jpeg"
) {
this.$message.error("鍥剧墖蹇呴』鏄� jpg/svg/jpeg/png 鏍煎紡!");
- return false;
- } else if (rawFile.size / 1024 / 1024 > 5) {
+ this.loading = false;
+ return false;
+ }
+
+ if (file.size / 1024 / 1024 > 5) {
this.$message.error("涓婁紶鍥剧墖涓嶈兘瓒呰繃 5MB!");
+ this.loading = false;
return false;
}
return true;
},
- // 涓婁紶鎴愬姛鍥炶皟
- handleSuccess(res, file, filelist) {
- if (res.data.url1) {
- this.$emit("setPictureUrl", { url: res.data.url1 });
- } else if (res.data.url2) {
- this.$emit("setPictureUrl", { url: res.data.url2 });
- } else if (res.data.url3) {
- this.$emit("setPictureUrl", { url: res.data.url3 });
- } else {
- this.$emit("setPictureUrl", { url: res.data.url4 });
+
+ handleUpload(data) {
+ this.loading = true;
+ const { file } = data;
+ const validate = this.validateFile(file);
+ if (!validate) {
+ return;
}
- },
- // 涓婁紶澶辫触鍥炶皟
- handleError(err, file, fileList) {
- this.$message({
- type: "error",
- message: err,
- });
+ const formData = new FormData();
+ formData.append('file', file);
+ imageManagement.importImage(formData)
+ .then(({ url1, url2, url3, url4 }) => {
+ const url = url1 ?? url2 ?? url3 ?? url4;
+ this.$emit('setPictureUrl', { url: url });
+ })
+ .catch(err => {
+ this.$message.error(err);
+ })
},
// 鑾峰彇token
getToken() {
@@ -140,27 +142,35 @@
display: flex;
flex-wrap: wrap;
height: 100px;
- margin: 0 10px;
.image-content {
width: 100px;
height: 100px;
}
+
.image-delete-icon {
- position: relative;
- bottom: calc(100% - 50px);
- left: calc(100% - 50px);
+ position: absolute;
+ top: 45px;
+ left: 45px;
opacity: 0;
}
+
.image-box-item {
- padding: 0px 10px;
+ position: sticky;
}
+
.image-box-item:hover {
- color: #ffffff;
- opacity: 0.5;
+ .image-content {
+ box-shadow: #ffffff;
+ opacity: 0.5;
+ }
+
.image-delete-icon {
+ color: red;
+ font-size: 14px;
z-index: 2;
opacity: 1;
+ cursor: pointer;
}
}
}
diff --git a/src/views/operate/fivepack/threepack/components/aside/index.vue b/src/views/operate/fivepack/threepack/components/aside/index.vue
index 4431ca3..57ee434 100644
--- a/src/views/operate/fivepack/threepack/components/aside/index.vue
+++ b/src/views/operate/fivepack/threepack/components/aside/index.vue
@@ -26,11 +26,16 @@
},
created() {
- department.getDepartmentList()
- .then(res => {
- this.areaData = res;
- })
- .catch(err => this.$message.error(err))
+ if (sessionStorage.getItem('area')) {
+ this.areaData = JSON.parse(sessionStorage.getItem('area'));
+ } else {
+ department.getDepartmentList()
+ .then(res => {
+ this.areaData = res;
+ sessionStorage.setItem('area', JSON.stringify(this.areaData));
+ })
+ .catch(err => this.$message.error(err))
+ }
},
methods: {
@@ -43,7 +48,9 @@
return data.regionName.indexOf(value) !== -1;
},
nodeClick(data, node, props) {
- this.$emit('selectedDepartment', data);
+ if (node.level > 1) {
+ this.$emit('selectedDepartment', data);
+ }
}
}
};
diff --git a/src/views/operate/management/myIndex/components/closure/index.vue b/src/views/operate/management/myIndex/components/closure/index.vue
index f7924cc..d04c32d 100644
--- a/src/views/operate/management/myIndex/components/closure/index.vue
+++ b/src/views/operate/management/myIndex/components/closure/index.vue
@@ -308,18 +308,6 @@
}
});
},
- // 鑾峰彇褰撳墠鐢ㄦ埛鐧诲綍淇℃伅
- getUserLoginInfo() {
- // 鑾峰彇鐧诲綍鍚�;
- const username = sessionStorage.getItem("name");
- this.$axios({
- method: "get",
- url: "sccg/admin/info",
- data: {
- name: "username",
- },
- }).then((res) => {});
- },
},
props: ["info", "closeDialog"],
};
diff --git a/src/views/operate/rectification/surveyList/index.vue b/src/views/operate/rectification/surveyList/index.vue
index b94275e..3ec0dfc 100644
--- a/src/views/operate/rectification/surveyList/index.vue
+++ b/src/views/operate/rectification/surveyList/index.vue
@@ -236,25 +236,9 @@
.then((res) => {
});
},
- // // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
- // changeCurrentPage(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓婁竴椤电偣鍑讳簨浠�
- // handlePrev(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓嬩竴椤电偣鍑讳簨浠�
- // handleNext(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
},
};
</script>
-<!-- sccg/system/portal/thirdApp/search -->
<style lang="scss" scoped>
.otherInterface {
header {
diff --git a/src/views/operate/rectification/taskList/index.vue b/src/views/operate/rectification/taskList/index.vue
index 44b9d14..ddd02bf 100644
--- a/src/views/operate/rectification/taskList/index.vue
+++ b/src/views/operate/rectification/taskList/index.vue
@@ -27,7 +27,6 @@
</div>
</div>
<div class="mainContent">
- <!-- @selection-change="handleSelectionChange" -->
<!-- 鏁版嵁娓叉煋 -->
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
:header-cell-style="{background:'#06122c','font-size':'12px',color:'#4b9bb7','font-weight':'650','line-height':'45px'}"
@@ -62,13 +61,6 @@
</template>
</el-table-column>
</el-table>
- <!-- 鍒嗛〉 -->
- <!-- <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">
- </el-pagination>
- </div> -->
</div>
</main>
<footer>
@@ -145,12 +137,11 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 鎵撳紑鏂板鐣岄潰
handleAdd() {
@@ -173,7 +164,6 @@
},
// 鍒犻櫎绗笁鏂规帴鍙�
handleDelete({ id }) {
- console.log(id);
this.$axios.delete('sccg/system/portal/thirdApp/delete', {
params: {
id
@@ -181,25 +171,9 @@
}).then(res => {
})
}
- // // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
- // changeCurrentPage(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓婁竴椤电偣鍑讳簨浠�
- // handlePrev(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
- // // 涓嬩竴椤电偣鍑讳簨浠�
- // handleNext(page) {
- // this.currentPage = page;
- // this.getUserList();
- // },
}
}
</script>
-<!-- sccg/system/portal/thirdApp/search -->
<style lang="scss" scoped>
.otherInterface {
header {
diff --git a/src/views/operate/viewEvent/components/illExamine/index.vue b/src/views/operate/viewEvent/components/illExamine/index.vue
index fb3102c..9f88b7a 100644
--- a/src/views/operate/viewEvent/components/illExamine/index.vue
+++ b/src/views/operate/viewEvent/components/illExamine/index.vue
@@ -158,7 +158,6 @@
},
// 鎻愪氦瀹℃牳鎰忚
handleSubmit(mystatus) {
- // this.getUserLoginInfo();
const { baseCase } = this;
this.$refs.viewForm.validate((valid) => {
if (valid) {
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index b98d707..39171b6 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -53,7 +53,7 @@
:header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px' }"
:data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
@selection-change="tableChange">
- <el-table-column categories="selection" min-width="5">
+ <el-table-column type="selection" min-width="5">
</el-table-column>
<el-table-column prop="code" label="浜嬩欢缂栧彿" min-width="18">
<template slot-scope="scope">
diff --git a/src/views/systemSetting/device/bayonet/index.vue b/src/views/systemSetting/device/bayonet/index.vue
index 05b495f..a96cac8 100644
--- a/src/views/systemSetting/device/bayonet/index.vue
+++ b/src/views/systemSetting/device/bayonet/index.vue
@@ -4,19 +4,7 @@
<div class="header-content">
<div class="search">
<span style="padding-right: 20px">绛涢�夋潯浠�:</span>
- <el-select
- v-model="context"
- placeholder="璇烽�夋嫨"
- @change="getBayonetListData"
- >
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <el-input v-model="context" placeholder="璇疯緭鍏�" @change="getBayonetListData"></el-input>
</div>
</div>
</header>
diff --git a/src/views/systemSetting/device/point/index.vue b/src/views/systemSetting/device/point/index.vue
index 0faebc1..d97ee68 100644
--- a/src/views/systemSetting/device/point/index.vue
+++ b/src/views/systemSetting/device/point/index.vue
@@ -189,7 +189,6 @@
totalNum: 10,
pageSize: 10,
videoData: [],
- value: "",
searchData: null,
};
},
@@ -214,17 +213,11 @@
.catch((err) => this.$message.error(err));
},
selectedDepartment(data) {
-
- if (!data.children) {
- this.searchData = data;
- this.getVideoPointList(data);
- } else {
- data.parentId = data.id;
- data.id = null;
- this.searchData = data;
- this.getVideoPointList(data);
- }
this.currentPage = 1;
+ data.parentId = data.id;
+ data.id = null;
+ this.searchData = data;
+ this.getVideoPointList(data);
},
current_change(e) {
this.currentPage = e;
diff --git a/src/views/video/index.vue b/src/views/video/index.vue
index 5f2e1c6..d12d10d 100644
--- a/src/views/video/index.vue
+++ b/src/views/video/index.vue
@@ -1,7 +1,7 @@
<template>
<el-container style="height: 100%;">
<el-aside heigth="100%" width="200px">
- <department-aside />
+ <department-aside @selectedDepartment="selectedDepartment" />
</el-aside>
<el-container>
@@ -77,9 +77,7 @@
.catch(err => this.$message.error(err))
},
selectedDepartment(data) {
- if (!data.children) {
- this.getVideoPointList(data);
- }
+ this.getVideoPointList(data);
},
currentPageChange(page) {
this.currentPage = page;
--
Gitblit v1.8.0