From 92301a6d7283cabf3fddaa4481636193c27b474a Mon Sep 17 00:00:00 2001
From: heimawl <1785969728@qq.com>
Date: 星期五, 16 六月 2023 16:08:21 +0800
Subject: [PATCH] 测试接口
---
vue.config.js | 2
src/main.js | 14 ++++
src/views/system/label/index.vue | 91 +++++++++++++++++++++++-------
package.json | 3 +
src/api/system/label.js | 40 ++++++++++---
5 files changed, 119 insertions(+), 31 deletions(-)
diff --git a/package.json b/package.json
index 6aab3ec..9de619d 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,8 @@
"jsencrypt": "3.0.0-rc.1",
"nprogress": "0.2.0",
"quill": "1.3.7",
+ "quill-image-drop-module": "^1.0.3",
+ "quill-image-resize-module": "^3.0.0",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
"vue": "2.6.12",
@@ -59,6 +61,7 @@
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
+ "vue-quill-editor": "^3.0.6",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0",
diff --git a/src/api/system/label.js b/src/api/system/label.js
index 6e68fc6..d036a8a 100644
--- a/src/api/system/label.js
+++ b/src/api/system/label.js
@@ -2,7 +2,7 @@
import { parseStrEmpty } from "@/utils/ruoyi";//澶勭悊瀛楃涓�,und,null杞崲涓�'';
// 淇敼鏍囩
-export function amendtag(data) {
+export function toamendtag(data) {
return request({
url: '/base/tag',
method: 'put',
@@ -20,13 +20,13 @@
/**
*
- * @param {鏍囩id} userId
+ * @param {鏍囩id} tagid
* 鑾峰彇鏍囩璇︽儏
* @returns
*/
-export function detailstag(userId) {
+export function detailstag(tagid) {
return request({
- url: '/base/tag/'+ userId,
+ url: '/base/tag/'+ tagid,
method: 'get',
})
};
@@ -34,17 +34,22 @@
/**
*
- * @param {鏍囩id} userId
+ * @param {鏍囩id} tagid
* 鍒犻櫎鏍囩
* @returns
*/
-export function deletetag(userId) {
+export function deletetag(tagid) {
return request({
- url: '/base/tag/' + userId,
+ url: '/base/tag/' + tagid,
method: 'delete',
})
};
- // 瀵煎嚭鏍囩鍒楄〃
+ /**
+ *
+ * @param {*} data
+ * 瀵煎嚭鏍囩鍒楄〃
+ * @returns
+ */
export function exporttag(data) {
return request({
url: '/base/tag/export',
@@ -52,11 +57,28 @@
data: data
})
};
- // 鏌ヨ鏍囩鍒楄〃
+ /**
+ *
+ * @param {object}
+ * 鏌ヨ鏍囩鍒楄〃
+ * @returns
+ */
export function listtag(query) {
return request({
url: '/base/tag/list',
method: 'get',
params: query
})
+ };
+ /**
+ * @param {name}
+ * 鑾峰彇鏍囩鍒嗙被鍒楄〃
+ * @returns
+ */
+ export function tagclassifylist(data) {
+ return request({
+ url: '/system/tagcategory/baseTagCategoryByName',
+ method: 'post',
+ data: data
+ })
};
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index c95a818..24ff4bc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,6 +14,18 @@
import directive from './directive' // directive
import plugins from './plugins' // plugins
import { download } from '@/utils/request'
+ //寮曞叆quill-editor缂栬緫鍣�
+// import VueQuillEditor from 'vue-quill-editor'
+// import 'quill/dist/quill.core.css'
+// import 'quill/dist/quill.snow.css'
+// import 'quill/dist/quill.bubble.css'
+ //瀹炵幇quill-editor缂栬緫鍣ㄦ嫋鎷戒笂浼犲浘鐗�
+// import * as Quill from 'quill'
+// import { ImageDrop } from 'quill-image-drop-module'
+// Quill.register('modules/imageDrop', ImageDrop)
+ //瀹炵幇quill-editor缂栬緫鍣ㄨ皟鏁村浘鐗囧昂瀵�
+// import ImageResize from 'quill-image-resize-module'
+// Quill.register('modules/imageResize', ImageResize)
import './assets/icons' // icon
import './permission' // permission control
@@ -77,6 +89,8 @@
Vue.use(VueMeta)
DictData.install()
Vue.use(components)
+// Vue.use(VueQuillEditor)
+
/**
* If you don't want to use mock-server
diff --git a/src/views/system/label/index.vue b/src/views/system/label/index.vue
index a5f3a42..a991d82 100644
--- a/src/views/system/label/index.vue
+++ b/src/views/system/label/index.vue
@@ -14,7 +14,7 @@
size="medium "
>
<el-button
- @click="sidecolumnss"
+ @click="gitclasify"
slot="append"
icon="el-icon-search"
></el-button>
@@ -57,7 +57,7 @@
<div class="leftvlue-top"></div>
<div class="leftvlue-bg">
<el-row :gutter="20">
- <!--鐢ㄦ埛鏁版嵁-->
+ <!--鏍囩鏁版嵁-->
<el-col :span="24" :xs="24">
<el-form
:model="queryParams"
@@ -118,6 +118,21 @@
v-hasPermi="['system:user:remove']"
>鍒犻櫎</el-button
>
+ </el-col>
+ <el-col :span="1.5">
+ <div class="documentf">
+ <div class="document">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="medium"
+ @click="handleExport"
+ v-hasPermi="['system:user:export']"
+ >瀵煎嚭</el-button
+ >
+ </div>
+ </div>
</el-col>
<!-- <el-col :span="1.5"> </el-col> -->
@@ -289,7 +304,15 @@
addUser,
updateUser,
} from "@/api/system/user";
-import { getToken } from "@/utils/auth";
+import {
+ toamendtag,
+ addapitag,
+ detailstag,
+ deletetag,
+ listtag,
+ tagclassifylist,
+} from "@/api/system/label";
+
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
@@ -357,6 +380,7 @@
goQRCodeVisible: false, //浜岀淮鐮佸脊妗�
sidecolumnval: "", //绫诲埆鎼滅储
propss: { multiple: true },
+ topqueryParams: {}, //瀵煎嚭绛涢�夋潯浠�
optionss: [
{
value: 1,
@@ -406,9 +430,9 @@
},
// 鍒椾俊鎭�
columns: [
- { key: 0, label: `鐢ㄦ埛缂栧彿`, visible: true },
- { key: 1, label: `鐢ㄦ埛鍚嶇О`, visible: true },
- { key: 2, label: `鐢ㄦ埛鏄电О`, visible: true },
+ { key: 0, label: `鏍囩缂栧彿`, visible: true },
+ { key: 1, label: `鏍囩鍚嶇О`, visible: true },
+ { key: 2, label: `鏍囩鏄电О`, visible: true },
{ key: 3, label: `閮ㄩ棬`, visible: true },
{ key: 4, label: `鎵嬫満鍙风爜`, visible: true },
{ key: 5, label: `鐘舵�乣, visible: true },
@@ -417,23 +441,23 @@
// 琛ㄥ崟鏍￠獙
rules: {
userName: [
- { required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "鏍囩鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
{
min: 2,
max: 20,
- message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
+ message: "鏍囩鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿",
trigger: "blur",
},
],
nickName: [
- { required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "鏍囩鏄电О涓嶈兘涓虹┖", trigger: "blur" },
],
password: [
- { required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "鏍囩瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
{
min: 5,
max: 20,
- message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
+ message: "鏍囩瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
trigger: "blur",
},
],
@@ -465,22 +489,31 @@
watch: {},
created() {
this.getList();
+ this.gitclasify();
},
methods: {
- /** 鏌ヨ鐢ㄦ埛鍒楄〃 */
+ /** 鏌ヨ鏍囩鍒楄〃 */
getList() {
// this.loading = true;
+ let forms = {};
+ forms.name = this.sidecolumnval;
+ listtag(forms).then((response) => {
+ console.log(response);
+ });
listUser().then((response) => {
console.log(response);
- // this.userList = response.data;
- // this.total = response.total;
- // this.loading = false;
+
console.log(this.userList);
});
- // const { rows } = await listUser();
- // console.log(rows);
- // this.list = rows;
+ },
+ // 鑾峰彇鏍囩鍒嗙被
+ gitclasify() {
+ let forms = {};
+ forms.name = this.sidecolumnval;
+ tagclassifylist(forms).then((response) => {
+ console.log(response);
+ });
},
// 娣诲姞绫诲埆
submitsidecolumn() {
@@ -496,8 +529,6 @@
this.amendtag = true;
this.dialogFormVisible = true;
},
- //鎼滅储绫诲埆
- sidecolumnss() {},
// 鍒囨崲鍏变韩/鏈湴
tophandleClick() {},
// 鍙栨秷鎸夐挳
@@ -523,7 +554,7 @@
};
this.resetForm("form");
},
- // 鐢ㄦ埛鐘舵�佷慨鏀�
+ // 鏍囩鐘舵�佷慨鏀�
handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
this.$modal
@@ -615,6 +646,16 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
.catch(() => {});
+ },
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ this.download(
+ "basetag/export",
+ {
+ ...this.topqueryParams,
+ },
+ `user_${new Date().getTime()}.xlsx`
+ );
},
},
};
@@ -715,6 +756,14 @@
font-size: 20px;
}
}
+.document {
+ width: 100px;
+ height: 50px;
+}
+.documentf {
+ display: flex;
+ justify-content: flex-end;
+}
.button-text {
color: rgb(70, 204, 238);
}
diff --git a/vue.config.js b/vue.config.js
index 58d5a8b..77b3f39 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target1: `http://116.62.18.175:8080`,
+ target1: `http://192.168.1.4:8080`,
target: `http://localhost:8080`,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3