Skip to content

B
bill-manager-ui
Commit 15017fd2 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

perf: 格式化

parent 3eeb7834
Hide whitespace changes
Inline Side-by-side
Showing with 1937 additions and 2486 deletions
admin_2/src/pages/404/404.vue
View file @ 15017fd2
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
> --> > -->
</div> </div>
<!-- <div class="bullshit__headline">{{ message }}</div> --> <!-- <div class="bullshit__headline">{{ message }}</div> -->
<div class="bullshit__info"> <div class="bullshit__info">请检查您输入的网址是否正确，或点击下面的按钮返回。</div>
请检查您输入的网址是否正确，或点击下面的按钮返回。
</div>
<a class="bullshit__return-home" @click="handleGoHome">返回</a> <a class="bullshit__return-home" @click="handleGoHome">返回</a>
</div> </div>
</div> </div>
...@@ -30,15 +28,15 @@ ...@@ -30,15 +28,15 @@
<script> <script>
export default { export default {
name: "Page404", name: 'Page404',
data() { data() {
return {}; return {};
}, },
methods: { methods: {
handleGoHome() { handleGoHome() {
this.$router.back(); this.$router.back();
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/engine/Engine.vue
View file @ 15017fd2
...@@ -17,9 +17,7 @@ ...@@ -17,9 +17,7 @@
class="search-box top-radius flex h-full items-center gap-5" class="search-box top-radius flex h-full items-center gap-5"
v-hasPermi="['engine:query']" v-hasPermi="['engine:query']"
> >
<div class="text-[14px] text-[#395EBF]"> <div class="text-[14px] text-[#395EBF]">统计时段：{{ time[0] }}~{{ time[1] }}</div>
统计时段：{{ time[0] }}~{{ time[1] }}
</div>
<y-date-picker <y-date-picker
v-model="time" v-model="time"
align="right" align="right"
...@@ -28,9 +26,7 @@ ...@@ -28,9 +26,7 @@
end-placeholder="结束日期" end-placeholder="结束日期"
> >
</y-date-picker> </y-date-picker>
<el-button size="small" type="primary" @click="handleDate" <el-button size="small" type="primary" @click="handleDate">搜索</el-button>
>搜索</el-button
>
</div> </div>
<div <div
class="engine-btn top-radius" class="engine-btn top-radius"
...@@ -49,25 +45,22 @@ ...@@ -49,25 +45,22 @@
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex';
export default { export default {
data() { data() {
return { return {
time: [ time: [this.$moment().format('YYYY-MM-DD'), this.$moment().format('YYYY-MM-DD')]
this.$moment().format("YYYY-MM-DD"),
this.$moment().format("YYYY-MM-DD"),
],
}; };
}, },
watch: { watch: {
"$route.path"() { '$route.path'() {
this.$nextTick(() => { this.$nextTick(() => {
this.handleDate(); this.handleDate();
}); });
}, }
}, },
computed: { computed: {
...mapGetters("user", ["secondaryRoutes"]), ...mapGetters('user', ['secondaryRoutes'])
}, },
created() { created() {
this.$nextTick(() => { this.$nextTick(() => {
...@@ -77,8 +70,8 @@ export default { ...@@ -77,8 +70,8 @@ export default {
methods: { methods: {
handleDate() { handleDate() {
this.$refs.Page.getDate(this.time); this.$refs.Page.getDate(this.time);
}, }
}, }
}; };
</script> </script>
...@@ -133,11 +126,7 @@ export default { ...@@ -133,11 +126,7 @@ export default {
.engine-btn { .engine-btn {
width: 220px; width: 220px;
color: #fff; color: #fff;
background: linear-gradient( background: linear-gradient(270deg, rgba(139, 87, 249, 1) 0%, rgba(5, 149, 253, 1) 100%);
270deg,
rgba(139, 87, 249, 1) 0%,
rgba(5, 149, 253, 1) 100%
);
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
display: flex; display: flex;
......
admin_2/src/pages/engine/EvaluateSystem.vue
View file @ 15017fd2
...@@ -106,23 +106,23 @@ ...@@ -106,23 +106,23 @@
</template> </template>
<script> <script>
import DoubleTable from "./components/DoubleTable.vue"; import DoubleTable from './components/DoubleTable.vue';
import { getEvaSystemList } from "@/api/engine"; import { getEvaSystemList } from '@/api/engine';
import { export2Excel } from "@/utils/exportExcel"; import { export2Excel } from '@/utils/exportExcel';
import { dataSection } from "@/utils"; import { dataSection } from '@/utils';
import storage from "@/utils/storage"; import storage from '@/utils/storage';
export default { export default {
components: { components: {
DoubleTable, DoubleTable
}, },
data() { data() {
return { return {
dict: {}, dict: {},
dateForm: { dateForm: {
timeStart: this.$moment().format("YYYY-MM-DD"), timeStart: this.$moment().format('YYYY-MM-DD'),
timeEnd: this.$moment().format("YYYY-MM-DD"), timeEnd: this.$moment().format('YYYY-MM-DD')
}, },
siteId: storage.get(2, "siteId"), siteId: storage.get(2, 'siteId'),
hallLoading: false, hallLoading: false,
pjOptionLoading: false, pjOptionLoading: false,
deptLoading: false, deptLoading: false,
...@@ -131,112 +131,112 @@ export default { ...@@ -131,112 +131,112 @@ export default {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
hallNameNotList: [""], hallNameNotList: ['']
}, },
pjOptionSearch: { pjOptionSearch: {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
pjOptionNotList: [""], pjOptionNotList: [''],
pjOptionList: [], pjOptionList: [],
groupList: ["pjOption"], groupList: ['pjOption']
}, },
deptSearch: { deptSearch: {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
sectionNameNotList: [""], sectionNameNotList: [''],
sectionNameList: [], sectionNameList: []
}, },
windowSearch: { windowSearch: {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
windowFromnumNotList: [""], windowFromnumNotList: [''],
windowFromnumList: [], windowFromnumList: []
}, },
hallColumn: [ hallColumn: [
{ {
label: "大厅名称", label: '大厅名称',
prop: "hallName", prop: 'hallName',
align: "center", align: 'center',
showOverflowTooltip: true, showOverflowTooltip: true
}, },
{ {
label: "评价数量", label: '评价数量',
prop: "pjCount", prop: 'pjCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
pjOptionColumn: [ pjOptionColumn: [
{ {
label: "评价选项", label: '评价选项',
prop: "pjOption", prop: 'pjOption',
align: "center", align: 'center',
showOverflowTooltip: true, showOverflowTooltip: true,
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span>{cellValue}</span>; return <span>{cellValue}</span>;
} }
}, }
}, },
{ {
label: "评价数量", label: '评价数量',
prop: "pjCount", prop: 'pjCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
deptColumn: [ deptColumn: [
{ {
label: "部门名称", label: '部门名称',
prop: "sectionName", prop: 'sectionName',
showOverflowTooltip: true, showOverflowTooltip: true,
align: "center", align: 'center'
}, },
{ {
label: "评价数量", label: '评价数量',
prop: "pjCount", prop: 'pjCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
windowColumn: [ windowColumn: [
{ {
label: "窗口编号", label: '窗口编号',
prop: "windowFromnum", prop: 'windowFromnum',
showOverflowTooltip: true, showOverflowTooltip: true,
align: "center", align: 'center'
}, },
{ {
label: "评价数量", label: '评价数量',
prop: "pjCount", prop: 'pjCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
hallTableData: [], hallTableData: [],
pjOptionTableData: [], pjOptionTableData: [],
deptTableData: [], deptTableData: [],
windowTableData: [], windowTableData: []
}; };
}, },
created() {}, created() {},
...@@ -259,7 +259,7 @@ export default { ...@@ -259,7 +259,7 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.hallSearch, ...this.hallSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -267,13 +267,13 @@ export default { ...@@ -267,13 +267,13 @@ export default {
return { return {
data: data, data: data,
total: total, total: total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -292,7 +292,7 @@ export default { ...@@ -292,7 +292,7 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.pjOptionSearch, ...this.pjOptionSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -300,13 +300,13 @@ export default { ...@@ -300,13 +300,13 @@ export default {
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -324,20 +324,20 @@ export default { ...@@ -324,20 +324,20 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.deptSearch, ...this.deptSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -356,20 +356,20 @@ export default { ...@@ -356,20 +356,20 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.windowSearch, ...this.windowSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -388,14 +388,14 @@ export default { ...@@ -388,14 +388,14 @@ export default {
let filterVal = this.hallColumn.map((v) => v.prop); let filterVal = this.hallColumn.map((v) => v.prop);
dataSection(this.hallEvaFn, {}, (data) => { dataSection(this.hallEvaFn, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"大厅评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '大厅评价量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -410,14 +410,14 @@ export default { ...@@ -410,14 +410,14 @@ export default {
} }
dataSection(this.pjOptionEva, searchForm, (data) => { dataSection(this.pjOptionEva, searchForm, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"评价选项统计报表" + this.$moment().format("YYYYMMDDHHmmss") '评价选项统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -432,14 +432,14 @@ export default { ...@@ -432,14 +432,14 @@ export default {
} }
dataSection(this.deptEva, searchForm, (data) => { dataSection(this.deptEva, searchForm, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"部门评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '部门评价量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -454,14 +454,14 @@ export default { ...@@ -454,14 +454,14 @@ export default {
} }
dataSection(this.windowEva, searchForm, (data) => { dataSection(this.windowEva, searchForm, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"窗口评价量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '窗口评价量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -476,30 +476,15 @@ export default { ...@@ -476,30 +476,15 @@ export default {
searchMethod(); searchMethod();
}; };
if (type === "pjOption") { if (type === 'pjOption') {
setupSearch( setupSearch(this.pjOptionSearch, 'pjOptionList', pjOption, this.getPjOptionEva);
this.pjOptionSearch, } else if (type === 'dept') {
"pjOptionList", setupSearch(this.deptSearch, 'sectionNameList', deptName, this.getDeptEva);
pjOption, } else if (type === 'window') {
this.getPjOptionEva setupSearch(this.windowSearch, 'windowFromnumList', windowNum, this.getWindowEva);
);
} else if (type === "dept") {
setupSearch(
this.deptSearch,
"sectionNameList",
deptName,
this.getDeptEva
);
} else if (type === "window") {
setupSearch(
this.windowSearch,
"windowFromnumList",
windowNum,
this.getWindowEva
);
} }
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/engine/QueueUpSystem.vue
View file @ 15017fd2
...@@ -106,23 +106,23 @@ ...@@ -106,23 +106,23 @@
</template> </template>
<script> <script>
import DoubleTable from "./components/DoubleTable.vue"; import DoubleTable from './components/DoubleTable.vue';
import { getQueueSystemList } from "@/api/engine"; import { getQueueSystemList } from '@/api/engine';
import { export2Excel } from "@/utils/exportExcel"; import { export2Excel } from '@/utils/exportExcel';
import { dataSection } from "@/utils"; import { dataSection } from '@/utils';
import storage from "@/utils/storage"; import storage from '@/utils/storage';
export default { export default {
components: { components: {
DoubleTable, DoubleTable
}, },
data() { data() {
return { return {
dict: {}, dict: {},
dateForm: { dateForm: {
timeStart: this.$moment().format("YYYY-MM-DD"), timeStart: this.$moment().format('YYYY-MM-DD'),
timeEnd: this.$moment().format("YYYY-MM-DD"), timeEnd: this.$moment().format('YYYY-MM-DD')
}, },
siteId: storage.get(2, "siteId"), siteId: storage.get(2, 'siteId'),
hallLoading: false, hallLoading: false,
businessLoading: false, businessLoading: false,
deptLoading: false, deptLoading: false,
...@@ -131,112 +131,112 @@ export default { ...@@ -131,112 +131,112 @@ export default {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
hallNameNotList: [""], hallNameNotList: ['']
}, },
businessSearch: { businessSearch: {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
businessNotList: [""], businessNotList: [''],
businessList: [], businessList: [],
groupList: ["business"], groupList: ['business']
}, },
deptSearch: { deptSearch: {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
sectionNameNotList: [""], sectionNameNotList: [''],
sectionNameList: [], sectionNameList: []
}, },
windowSearch: { windowSearch: {
total: 0, total: 0,
page: 1, page: 1,
size: 10, size: 10,
windowFromnumNotList: [""], windowFromnumNotList: [''],
windowFromnumList: [], windowFromnumList: []
}, },
hallColumn: [ hallColumn: [
{ {
label: "大厅名称", label: '大厅名称',
prop: "hallName", prop: 'hallName',
align: "center", align: 'center',
showOverflowTooltip: true, showOverflowTooltip: true
}, },
{ {
label: "排队数量", label: '排队数量',
prop: "phCount", prop: 'phCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
businessColumn: [ businessColumn: [
{ {
label: "业务名称", label: '业务名称',
prop: "business", prop: 'business',
align: "center", align: 'center',
showOverflowTooltip: true, showOverflowTooltip: true,
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span>{cellValue}</span>; return <span>{cellValue}</span>;
} }
}, }
}, },
{ {
label: "排队数量", label: '排队数量',
prop: "phCount", prop: 'phCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
deptColumn: [ deptColumn: [
{ {
label: "部门名称", label: '部门名称',
prop: "sectionName", prop: 'sectionName',
showOverflowTooltip: true, showOverflowTooltip: true,
align: "center", align: 'center'
}, },
{ {
label: "排队数量", label: '排队数量',
prop: "phCount", prop: 'phCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
windowColumn: [ windowColumn: [
{ {
label: "窗口编号", label: '窗口编号',
prop: "windowFromnum", prop: 'windowFromnum',
showOverflowTooltip: true, showOverflowTooltip: true,
align: "center", align: 'center'
}, },
{ {
label: "排队数量", label: '排队数量',
prop: "phCount", prop: 'phCount',
align: "center", align: 'center',
formatter: (row, column, cellValue) => { formatter: (row, column, cellValue) => {
if (cellValue) { if (cellValue) {
return <span class="table-num">{cellValue}</span>; return <span class="table-num">{cellValue}</span>;
} }
}, }
}, }
], ],
hallTableData: [], hallTableData: [],
businessTableData: [], businessTableData: [],
deptTableData: [], deptTableData: [],
windowTableData: [], windowTableData: []
}; };
}, },
created() { created() {
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.hallSearch, ...this.hallSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -272,13 +272,13 @@ export default { ...@@ -272,13 +272,13 @@ export default {
return { return {
data: data, data: data,
total: total, total: total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.businessSearch, ...this.businessSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -305,13 +305,13 @@ export default { ...@@ -305,13 +305,13 @@ export default {
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -329,20 +329,20 @@ export default { ...@@ -329,20 +329,20 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.deptSearch, ...this.deptSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -361,20 +361,20 @@ export default { ...@@ -361,20 +361,20 @@ export default {
siteId: this.siteId, siteId: this.siteId,
...this.windowSearch, ...this.windowSearch,
...this.dateForm, ...this.dateForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -393,14 +393,14 @@ export default { ...@@ -393,14 +393,14 @@ export default {
let filterVal = this.hallColumn.map((v) => v.prop); let filterVal = this.hallColumn.map((v) => v.prop);
dataSection(this.hallQueueFn, {}, (data) => { dataSection(this.hallQueueFn, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"大厅取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '大厅取号量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -415,14 +415,14 @@ export default { ...@@ -415,14 +415,14 @@ export default {
} }
dataSection(this.businessQueue, searchForm, (data) => { dataSection(this.businessQueue, searchForm, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"业务取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '业务取号量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -437,14 +437,14 @@ export default { ...@@ -437,14 +437,14 @@ export default {
} }
dataSection(this.deptQueue, searchForm, (data) => { dataSection(this.deptQueue, searchForm, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"部门取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '部门取号量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -459,14 +459,14 @@ export default { ...@@ -459,14 +459,14 @@ export default {
} }
dataSection(this.windowQueue, searchForm, (data) => { dataSection(this.windowQueue, searchForm, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"窗口取号量统计报表" + this.$moment().format("YYYYMMDDHHmmss") '窗口取号量统计报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
}, },
...@@ -480,18 +480,18 @@ export default { ...@@ -480,18 +480,18 @@ export default {
searchObj[listKey] = value ? [value] : []; searchObj[listKey] = value ? [value] : [];
}; };
if (type === "business") { if (type === 'business') {
setupSearch(this.businessSearch, "businessList", businessName); setupSearch(this.businessSearch, 'businessList', businessName);
this.getBusinessQueue(); this.getBusinessQueue();
} else if (type === "dept") { } else if (type === 'dept') {
setupSearch(this.deptSearch, "sectionNameList", deptName); setupSearch(this.deptSearch, 'sectionNameList', deptName);
this.getDeptQueue(); this.getDeptQueue();
} else if (type === "window") { } else if (type === 'window') {
setupSearch(this.windowSearch, "windowFromnumList", windowNum); setupSearch(this.windowSearch, 'windowFromnumList', windowNum);
this.getWindowQueue(); this.getWindowQueue();
} }
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/engineSearch/EvaluateData.vue
View file @ 15017fd2
...@@ -45,86 +45,86 @@ ...@@ -45,86 +45,86 @@
</template> </template>
<script> <script>
import Search from "./components/Search.vue"; import Search from './components/Search.vue';
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import { getEvaStatList } from "@/api/engine"; import { getEvaStatList } from '@/api/engine';
import { formatSeconds, dataSection } from "@/utils"; import { formatSeconds, dataSection } from '@/utils';
import { export2Excel } from "@/utils/exportExcel"; import { export2Excel } from '@/utils/exportExcel';
import storage from "@/utils/storage"; import storage from '@/utils/storage';
export default { export default {
components: { components: {
Search, Search,
TableHeader, TableHeader
}, },
data() { data() {
return { return {
loading: false, loading: false,
exportLoading: false, exportLoading: false,
siteId: storage.get(2, "siteId"), siteId: storage.get(2, 'siteId'),
page: 1, page: 1,
size: 10, size: 10,
total: 0, total: 0,
tableData: [], tableData: [],
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "站点名称", label: '站点名称',
prop: "siteName", prop: 'siteName',
align: "center", align: 'center'
}, },
{ {
label: "部门名称", label: '部门名称',
prop: "sectionName", prop: 'sectionName',
align: "center", align: 'center'
}, },
{ {
label: "评价选型", label: '评价选型',
prop: "pjOption", prop: 'pjOption',
align: "center", align: 'center'
}, },
{ {
label: "窗口编号", label: '窗口编号',
prop: "windowFromnum", prop: 'windowFromnum',
align: "center", align: 'center'
}, },
{ {
label: "年份", label: '年份',
prop: "year", prop: 'year',
align: "center", align: 'center'
}, },
{ {
label: "月份", label: '月份',
prop: "month", prop: 'month',
align: "center", align: 'center'
}, },
{ {
label: "日期", label: '日期',
prop: "day", prop: 'day',
align: "center", align: 'center'
}, },
{ {
label: "评价数量", label: '评价数量',
prop: "pjCount", prop: 'pjCount',
align: "center", align: 'center'
}, }
], ],
selectionRows: [], selectionRows: [],
searchForm: { searchForm: {
...@@ -135,11 +135,11 @@ export default { ...@@ -135,11 +135,11 @@ export default {
pjOptionList: [], pjOptionList: [],
sectionNameList: [], sectionNameList: [],
windowFromnumList: [], windowFromnumList: [],
year: "", year: '',
month: "", month: '',
day: "", day: ''
}, },
dict: {}, dict: {}
}; };
}, },
created() { created() {
...@@ -153,20 +153,20 @@ export default { ...@@ -153,20 +153,20 @@ export default {
size: this.size, size: this.size,
siteId: this.siteId, siteId: this.siteId,
...this.searchForm, ...this.searchForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
this.loading = true; this.loading = true;
let { data, total, dict } = await this.evaStatList(); let { data, total, dict } = await this.evaStatList();
data.forEach((v) => { data.forEach((v) => {
v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : ""; v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : '';
}); });
this.total = total; this.total = total;
this.tableData = data; this.tableData = data;
...@@ -189,23 +189,22 @@ export default { ...@@ -189,23 +189,22 @@ export default {
handleSearch(form) { handleSearch(form) {
let { type, pjOption, deptName, windowNum, year, month, day } = form; let { type, pjOption, deptName, windowNum, year, month, day } = form;
this.searchForm.year = ""; this.searchForm.year = '';
this.searchForm.month = ""; this.searchForm.month = '';
this.searchForm.day = ""; this.searchForm.day = '';
if (type === "year") { if (type === 'year') {
this.searchForm.groupList = ["year"]; this.searchForm.groupList = ['year'];
this.searchForm.year = year; this.searchForm.year = year;
} else if (type === "month") { } else if (type === 'month') {
this.searchForm.groupList = ["year", "month"]; this.searchForm.groupList = ['year', 'month'];
if (month) { if (month) {
[this.searchForm.year, this.searchForm.month] = month.split("-"); [this.searchForm.year, this.searchForm.month] = month.split('-');
} }
} else { } else {
this.searchForm.groupList = ["year", "month", "day"]; this.searchForm.groupList = ['year', 'month', 'day'];
if (day) { if (day) {
[this.searchForm.year, this.searchForm.month, this.searchForm.day] = [this.searchForm.year, this.searchForm.month, this.searchForm.day] = day.split('-');
day.split("-");
} }
} }
...@@ -229,28 +228,28 @@ export default { ...@@ -229,28 +228,28 @@ export default {
tHeader, tHeader,
filterVal, filterVal,
data, data,
"排队数据汇总报表" + this.$moment().format("YYYYMMDDHHmmss") '排队数据汇总报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
} else { } else {
dataSection(this.queueStatList, {}, (data) => { dataSection(this.queueStatList, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
data.forEach((v) => { data.forEach((v) => {
v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : ""; v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : '';
}); });
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"排队数据汇总报表" + this.$moment().format("YYYYMMDDHHmmss") '排队数据汇总报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
} }
this.exportLoading = false; this.exportLoading = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/engineSearch/QueueUpData.vue
View file @ 15017fd2
...@@ -45,22 +45,22 @@ ...@@ -45,22 +45,22 @@
</template> </template>
<script> <script>
import Search from "./components/Search.vue"; import Search from './components/Search.vue';
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import { getQueueStatList } from "@/api/engine"; import { getQueueStatList } from '@/api/engine';
import { formatSeconds, dataSection } from "@/utils"; import { formatSeconds, dataSection } from '@/utils';
import { export2Excel } from "@/utils/exportExcel"; import { export2Excel } from '@/utils/exportExcel';
import storage from "@/utils/storage"; import storage from '@/utils/storage';
export default { export default {
components: { components: {
Search, Search,
TableHeader, TableHeader
}, },
data() { data() {
return { return {
loading: false, loading: false,
exportLoading: false, exportLoading: false,
siteId: storage.get(2, "siteId"), siteId: storage.get(2, 'siteId'),
dict: {}, dict: {},
page: 1, page: 1,
size: 10, size: 10,
...@@ -68,68 +68,68 @@ export default { ...@@ -68,68 +68,68 @@ export default {
tableData: [], tableData: [],
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "站点名称", label: '站点名称',
prop: "siteName", prop: 'siteName',
align: "center", align: 'center'
}, },
{ {
label: "业务名称", label: '业务名称',
prop: "business", prop: 'business',
align: "center", align: 'center'
}, },
{ {
label: "部门名称", label: '部门名称',
prop: "sectionName", prop: 'sectionName',
align: "center", align: 'center'
}, },
{ {
label: "窗口编号", label: '窗口编号',
prop: "windowFromnum", prop: 'windowFromnum',
align: "center", align: 'center'
}, },
{ {
label: "年份", label: '年份',
prop: "year", prop: 'year',
align: "center", align: 'center'
}, },
{ {
label: "月份", label: '月份',
prop: "month", prop: 'month',
align: "center", align: 'center'
}, },
{ {
label: "日期", label: '日期',
prop: "day", prop: 'day',
align: "center", align: 'center'
}, },
{ {
label: "办理量", label: '办理量',
prop: "phCount", prop: 'phCount',
align: "center", align: 'center'
}, },
{ {
label: "平均等待时长", label: '平均等待时长',
prop: "waitTime", prop: 'waitTime',
align: "center", align: 'center'
}, }
], ],
selectionRows: [], selectionRows: [],
searchForm: { searchForm: {
...@@ -140,10 +140,10 @@ export default { ...@@ -140,10 +140,10 @@ export default {
businessList: [], businessList: [],
sectionNameList: [], sectionNameList: [],
windowFromnumList: [], windowFromnumList: [],
year: "", year: '',
month: "", month: '',
day: "", day: ''
}, }
}; };
}, },
created() { created() {
...@@ -157,20 +157,20 @@ export default { ...@@ -157,20 +157,20 @@ export default {
size: this.size, size: this.size,
siteId: this.siteId, siteId: this.siteId,
...this.searchForm, ...this.searchForm,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
return { return {
data, data,
total, total,
dict, dict
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0,
dict: {}, dict: {}
}; };
} }
}, },
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
this.loading = true; this.loading = true;
let { data, total, dict } = await this.queueStatList(); let { data, total, dict } = await this.queueStatList();
data.forEach((v) => { data.forEach((v) => {
v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : ""; v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : '';
}); });
this.dict = dict; this.dict = dict;
this.total = total; this.total = total;
...@@ -191,22 +191,21 @@ export default { ...@@ -191,22 +191,21 @@ export default {
}, },
handleSearch(form) { handleSearch(form) {
let { type, businessName, deptName, windowNum, year, month, day } = form; let { type, businessName, deptName, windowNum, year, month, day } = form;
this.searchForm.year = ""; this.searchForm.year = '';
this.searchForm.month = ""; this.searchForm.month = '';
this.searchForm.day = ""; this.searchForm.day = '';
if (type == "year") { if (type == 'year') {
this.searchForm.groupList = ["year"]; this.searchForm.groupList = ['year'];
this.searchForm.year = year; this.searchForm.year = year;
} else if (type == "month") { } else if (type == 'month') {
this.searchForm.groupList = ["year", "month"]; this.searchForm.groupList = ['year', 'month'];
if (month) { if (month) {
[this.searchForm.year, this.searchForm.month] = month.split("-"); [this.searchForm.year, this.searchForm.month] = month.split('-');
} }
} else { } else {
this.searchForm.groupList = ["year", "month", "day"]; this.searchForm.groupList = ['year', 'month', 'day'];
if (day) { if (day) {
[this.searchForm.year, this.searchForm.month, this.searchForm.day] = [this.searchForm.year, this.searchForm.month, this.searchForm.day] = day.split('-');
day.split("-");
} }
} }
this.searchForm.businessList = businessName ? [businessName] : []; this.searchForm.businessList = businessName ? [businessName] : [];
...@@ -228,28 +227,28 @@ export default { ...@@ -228,28 +227,28 @@ export default {
tHeader, tHeader,
filterVal, filterVal,
data, data,
"排队数据汇总报表" + this.$moment().format("YYYYMMDDHHmmss") '排队数据汇总报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
} else { } else {
dataSection(this.queueStatList, {}, (data) => { dataSection(this.queueStatList, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
data.forEach((v) => { data.forEach((v) => {
v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : ""; v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : '';
}); });
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"排队数据汇总报表" + this.$moment().format("YYYYMMDDHHmmss") '排队数据汇总报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
} }
this.exportLoading = false; this.exportLoading = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/engineSearch/components/Search.vue
View file @ 15017fd2
<template> <template>
<div <div class="search mb-[15px] flex h-[170px] w-full flex-col items-center justify-around">
class="search mb-[15px] flex h-[170px] w-full flex-col items-center justify-around"
>
<div class="flex gap-10"> <div class="flex gap-10">
<router-link v-for="(v, i) in subMenus" :key="i" :to="v.path"> <router-link v-for="(v, i) in subMenus" :key="i" :to="v.path">
{{ v.meta.title }} {{ v.meta.title }}
...@@ -12,11 +10,7 @@ ...@@ -12,11 +10,7 @@
<div class="flex gap-2"> <div class="flex gap-2">
<div class="item border"> <div class="item border">
<span class="pl-[15px] text-[14px]">选择时间</span> <span class="pl-[15px] text-[14px]">选择时间</span>
<el-popover <el-popover trigger="click" placement="bottom-start" popper-class="search-popover">
trigger="click"
placement="bottom-start"
popper-class="search-popover"
>
<div class="flex flex-col items-center"> <div class="flex flex-col items-center">
<div class="tab-box"> <div class="tab-box">
<div <div
...@@ -75,10 +69,7 @@ ...@@ -75,10 +69,7 @@
></el-input> ></el-input>
</el-popover> </el-popover>
</div> </div>
<div <div class="item border" v-if="$route.path == '/enginesearch/queueupdata'">
class="item border"
v-if="$route.path == '/enginesearch/queueupdata'"
>
<span class="pl-[15px] text-[14px]">选择业务</span> <span class="pl-[15px] text-[14px]">选择业务</span>
<el-popover <el-popover
trigger="click" trigger="click"
...@@ -103,13 +94,8 @@ ...@@ -103,13 +94,8 @@
</div> </div>
</div> </div>
</div> </div>
<div <div v-else class="flex h-full w-full items-center justify-center">
v-else <el-empty :image="require('@/assets/img/empty.png')"></el-empty>
class="flex h-full w-full items-center justify-center"
>
<el-empty
:image="require('@/assets/img/empty.png')"
></el-empty>
</div> </div>
</div> </div>
<el-input <el-input
...@@ -131,12 +117,7 @@ ...@@ -131,12 +117,7 @@
filterable filterable
size="small" size="small"
> >
<el-option <el-option v-for="(v, i) in pjOption" :key="i" :label="v" :value="v"></el-option>
v-for="(v, i) in pjOption"
:key="i"
:label="v"
:value="v"
></el-option>
</el-select> </el-select>
</div> </div>
<div class="item border"> <div class="item border">
...@@ -164,13 +145,8 @@ ...@@ -164,13 +145,8 @@
</div> </div>
</div> </div>
</div> </div>
<div <div v-else class="flex h-full w-full items-center justify-center">
v-else <el-empty :image="require('@/assets/img/empty.png')"></el-empty>
class="flex h-full w-full items-center justify-center"
>
<el-empty
:image="require('@/assets/img/empty.png')"
></el-empty>
</div> </div>
</div> </div>
<el-input <el-input
...@@ -210,13 +186,8 @@ ...@@ -210,13 +186,8 @@
</div> </div>
</div> </div>
</div> </div>
<div <div v-else class="flex h-full w-full items-center justify-center">
v-else <el-empty :image="require('@/assets/img/empty.png')"></el-empty>
class="flex h-full w-full items-center justify-center"
>
<el-empty
:image="require('@/assets/img/empty.png')"
></el-empty>
</div> </div>
</div> </div>
<el-input <el-input
...@@ -238,14 +209,14 @@ ...@@ -238,14 +209,14 @@
</template> </template>
<script> <script>
import { findBottomSubarrays } from "@/utils"; import { findBottomSubarrays } from '@/utils';
export default { export default {
components: {}, components: {},
props: { props: {
dict: { dict: {
required: true, required: true,
default: () => {}, default: () => {}
}, }
}, },
data() { data() {
return { return {
...@@ -258,15 +229,15 @@ export default { ...@@ -258,15 +229,15 @@ export default {
sectionList: [], sectionList: [],
windowList: [], windowList: [],
form: { form: {
type: "year", type: 'year',
businessName: "", businessName: '',
deptName: "", deptName: '',
windowNum: "", windowNum: '',
year: "", year: '',
month: "", month: '',
day: "", day: '',
pjOption: "", pjOption: ''
}, }
}; };
}, },
computed: { computed: {
...@@ -274,9 +245,9 @@ export default { ...@@ -274,9 +245,9 @@ export default {
return this.$route.path; return this.$route.path;
}, },
dateInputVal() { dateInputVal() {
if (this.form.type == "year") { if (this.form.type == 'year') {
return this.form.year; return this.form.year;
} else if (this.form.type == "month") { } else if (this.form.type == 'month') {
return this.form.month; return this.form.month;
} else { } else {
return this.form.day; return this.form.day;
...@@ -288,7 +259,7 @@ export default { ...@@ -288,7 +259,7 @@ export default {
}, },
set(val) { set(val) {
this.calcBusiness = val; this.calcBusiness = val;
}, }
}, },
calcDeptList: { calcDeptList: {
get() { get() {
...@@ -296,7 +267,7 @@ export default { ...@@ -296,7 +267,7 @@ export default {
}, },
set(val) { set(val) {
this.calcDept = val; this.calcDept = val;
}, }
}, },
calcWindowList: { calcWindowList: {
get() { get() {
...@@ -304,8 +275,8 @@ export default { ...@@ -304,8 +275,8 @@ export default {
}, },
set(val) { set(val) {
this.calcWindow = val; this.calcWindow = val;
}, }
}, }
}, },
watch: { watch: {
dict: { dict: {
...@@ -313,8 +284,8 @@ export default { ...@@ -313,8 +284,8 @@ export default {
this.changeOptions(newVal); this.changeOptions(newVal);
}, },
deep: true, deep: true,
immediate: true, immediate: true
}, }
}, },
created() { created() {
this.getSubMenus(); this.getSubMenus();
...@@ -327,14 +298,10 @@ export default { ...@@ -327,14 +298,10 @@ export default {
// 获取当前顶层路由下的所有子路由 // 获取当前顶层路由下的所有子路由
getSubMenus() { getSubMenus() {
let path = this.$route?.meta.parentPath let path = this.$route?.meta.parentPath ? this.$route.meta.parentPath : this.$route.path;
? this.$route.meta.parentPath
: this.$route.path;
let options = this.$router.options.routes[0].children; let options = this.$router.options.routes[0].children;
let curRouters = options.filter((v) => v.path == path); let curRouters = options.filter((v) => v.path == path);
this.subMenus = findBottomSubarrays(curRouters).filter( this.subMenus = findBottomSubarrays(curRouters).filter((v) => !v.meta.hidden);
(v) => !v.meta.hidden
);
}, },
getTopKeyList(arr) { getTopKeyList(arr) {
...@@ -343,33 +310,29 @@ export default { ...@@ -343,33 +310,29 @@ export default {
// 获取搜索配置 // 获取搜索配置
changeOptions(dict) { changeOptions(dict) {
if (JSON.stringify(dict) == "{}") return; if (JSON.stringify(dict) == '{}') return;
let { businessList, sectionNameList, windowFromnumList, pjOption } = dict; let { businessList, sectionNameList, windowFromnumList, pjOption } = dict;
this.pjOption = pjOption ? pjOption : []; this.pjOption = pjOption ? pjOption : [];
this.calcBusiness = this.businessList = businessList this.calcBusiness = this.businessList = businessList ? this.getTopKeyList(businessList) : [];
? this.getTopKeyList(businessList) this.calcDept = this.sectionList = sectionNameList ? this.getTopKeyList(sectionNameList) : [];
: [];
this.calcDept = this.sectionList = sectionNameList
? this.getTopKeyList(sectionNameList)
: [];
this.calcWindow = this.windowList = windowFromnumList this.calcWindow = this.windowList = windowFromnumList
? this.getTopKeyList(windowFromnumList) ? this.getTopKeyList(windowFromnumList)
: []; : [];
}, },
changeTab(key) { changeTab(key) {
this.form.year = ""; this.form.year = '';
this.form.month = ""; this.form.month = '';
this.form.day = ""; this.form.day = '';
this.form.type = key; this.form.type = key;
}, },
handleClearDate() { handleClearDate() {
this.form.year = ""; this.form.year = '';
this.form.month = ""; this.form.month = '';
this.form.day = ""; this.form.day = '';
}, },
handleBusinessNameInput(name) { handleBusinessNameInput(name) {
if (name != "") { if (name != '') {
let list = this.businessList.filter((v) => v.includes(name)); let list = this.businessList.filter((v) => v.includes(name));
this.calcBusinessList = list.slice(0, 10); this.calcBusinessList = list.slice(0, 10);
} else { } else {
...@@ -377,7 +340,7 @@ export default { ...@@ -377,7 +340,7 @@ export default {
} }
}, },
handleDeptNameInput(name) { handleDeptNameInput(name) {
if (name != "") { if (name != '') {
let list = this.deptList.filter((v) => v.includes(name)); let list = this.deptList.filter((v) => v.includes(name));
this.calcDeptList = list.slice(0, 10); this.calcDeptList = list.slice(0, 10);
} else { } else {
...@@ -385,7 +348,7 @@ export default { ...@@ -385,7 +348,7 @@ export default {
} }
}, },
handleWindowInput(value) { handleWindowInput(value) {
if (value != "") { if (value != '') {
let list = this.windowList.filter((v) => v.includes(value)); let list = this.windowList.filter((v) => v.includes(value));
this.calcWindowList = list.slice(0, 10); this.calcWindowList = list.slice(0, 10);
} else { } else {
...@@ -393,29 +356,28 @@ export default { ...@@ -393,29 +356,28 @@ export default {
} }
}, },
handleSearch() { handleSearch() {
this.$emit("search", this.form); this.$emit('search', this.form);
}, },
handleShowPopper(type) { handleShowPopper(type) {
switch (type) { switch (type) {
case "business": case 'business':
this.calcBusinessList = this.businessList.slice(0, 10); this.calcBusinessList = this.businessList.slice(0, 10);
break; break;
case "deptName": case 'deptName':
this.calcDeptList = this.sectionList.slice(0, 10); this.calcDeptList = this.sectionList.slice(0, 10);
break; break;
case "window": case 'window':
this.calcWindowList = this.windowList.slice(0, 10); this.calcWindowList = this.windowList.slice(0, 10);
} }
}, }
}, }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.search { .search {
flex-shrink: 0; flex-shrink: 0;
background: url("@/assets/img/engineSearch_bg.svg") no-repeat center / 100% background: url('@/assets/img/engineSearch_bg.svg') no-repeat center / 100% 100%;
100%;
a { a {
color: rgba(254, 254, 254, 0.65); color: rgba(254, 254, 254, 0.65);
} }
......
admin_2/src/pages/home/components/AreaCard.vue
View file @ 15017fd2
<template> <template>
<div <div
:class="[ :class="['area-card', 'is-hover', tag.length ? 'cursor-pointer' : 'cursor-not-allowed']"
'area-card',
'is-hover',
tag.length ? 'cursor-pointer' : 'cursor-not-allowed',
]"
@click="handleClick" @click="handleClick"
> >
<div class="banner"> <div class="banner">
...@@ -14,9 +10,7 @@ ...@@ -14,9 +10,7 @@
<!-- 对接时间 --> <!-- 对接时间 -->
<div class="w-full"> <div class="w-full">
<span class="time" v-if="isAccess"> <span class="time" v-if="isAccess">
对接时间：<span v-if="data.accessTime">{{ 对接时间：<span v-if="data.accessTime">{{ data.accessTime | dateDayFormat }}</span>
data.accessTime | dateDayFormat
}}</span>
</span> </span>
</div> </div>
<!-- name --> <!-- name -->
...@@ -36,8 +30,8 @@ export default { ...@@ -36,8 +30,8 @@ export default {
type: Object, type: Object,
default() { default() {
return {}; return {};
}, }
}, }
}, },
data() { data() {
return {}; return {};
...@@ -45,7 +39,7 @@ export default { ...@@ -45,7 +39,7 @@ export default {
computed: { computed: {
tag() { tag() {
if (this.data.tag) { if (this.data.tag) {
return this.data.tag.split(","); return this.data.tag.split(',');
} else { } else {
return []; return [];
} }
...@@ -58,21 +52,21 @@ export default { ...@@ -58,21 +52,21 @@ export default {
} else { } else {
return false; return false;
} }
}, }
}, },
methods: { methods: {
handleClick() { handleClick() {
if (this.tag.length) { if (this.tag.length) {
this.$emit("click", this.data); this.$emit('click', this.data);
this.$router.push({ this.$router.push({
name: "queueupreport", name: 'queueupreport',
params: { params: {
siteId: this.data.siteId + "", siteId: this.data.siteId + ''
}, }
}); });
} }
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/home/components/Card.vue
View file @ 15017fd2
<template> <template>
<div <div
:class="[ :class="['card', info.systemList.length ? 'cursor-pointer' : 'cursor-not-allowed']"
'card',
info.systemList.length ? 'cursor-pointer' : 'cursor-not-allowed',
]"
@click="handleClick" @click="handleClick"
> >
<div>{{ info.name }}</div> <div>{{ info.name }}</div>
<el-tag <el-tag size="small" type="danger" color="#fff" v-if="!info.systemList.length">
size="small"
type="danger"
color="#fff"
v-if="!info.systemList.length"
>
<i class="el-icon-link"></i> <i class="el-icon-link"></i>
等待对接</el-tag 等待对接</el-tag
> >
<div class="cur flex gap-2" v-else> <div class="cur flex gap-2" v-else>
<el-tag v-for="(v, i) in info.systemList" :key="i" size="small">{{ <el-tag v-for="(v, i) in info.systemList" :key="i" size="small">{{ v }}</el-tag>
v
}}</el-tag>
</div>
<div class="card-date" v-if="info.systemList.length">
对接时间：{{ info.date }}
</div> </div>
<div class="card-date" v-if="info.systemList.length">对接时间：{{ info.date }}</div>
<div class="mask" v-else></div> <div class="mask" v-else></div>
</div> </div>
</template> </template>
...@@ -35,8 +23,8 @@ export default { ...@@ -35,8 +23,8 @@ export default {
type: Object, type: Object,
default() { default() {
return {}; return {};
}, }
}, }
}, },
data() { data() {
return {}; return {};
...@@ -44,10 +32,10 @@ export default { ...@@ -44,10 +32,10 @@ export default {
methods: { methods: {
handleClick() { handleClick() {
if (this.info.systemList.length) { if (this.info.systemList.length) {
this.$emit("click", this.info); this.$emit('click', this.info);
} }
}, }
}, }
}; };
</script> </script>
...@@ -56,7 +44,7 @@ export default { ...@@ -56,7 +44,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
color: #fff; color: #fff;
background: url("@/assets/img/changningxian.png") no-repeat center / 100% 100%; background: url('@/assets/img/changningxian.png') no-repeat center / 100% 100%;
border-radius: 4px; border-radius: 4px;
color: #fff; color: #fff;
position: relative; position: relative;
......
admin_2/src/pages/home/components/Carousel.vue
View file @ 15017fd2
...@@ -2,37 +2,32 @@ ...@@ -2,37 +2,32 @@
<div class="carousel"> <div class="carousel">
<div class="swiper-container"> <div class="swiper-container">
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<img <img class="swiper-slide" v-for="(v, index) in ImageArray" :key="index" :src="v" />
class="swiper-slide"
v-for="(v, index) in ImageArray"
:key="index"
:src="v"
/>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Swiper from "swiper"; import Swiper from 'swiper';
export default { export default {
props: { props: {
ImageArray: { ImageArray: {
type: Array, type: Array,
default: () => { default: () => {
return []; return [];
}, }
}, },
speed: { speed: {
type: Number, type: Number,
default: 1500, default: 1500
}, }
}, },
data() { data() {
return { return {
currentIndex: 0, currentIndex: 0,
timer: null, timer: null,
mySwiper: null, mySwiper: null
}; };
}, },
watch: {}, watch: {},
...@@ -41,22 +36,22 @@ export default { ...@@ -41,22 +36,22 @@ export default {
}, },
methods: { methods: {
initSwiper() { initSwiper() {
this.mySwiper = new Swiper(".swiper-container", { this.mySwiper = new Swiper('.swiper-container', {
autoplay: true, autoplay: true,
effect: "fade", effect: 'fade',
fadeEffect: true, fadeEffect: true,
speed: this.speed, speed: this.speed,
loop: true, loop: true,
updateOnWindowResize: true, updateOnWindowResize: true,
watchSlidesProgress: true, watchSlidesProgress: true
}); });
this.mySwiper.init(); this.mySwiper.init();
}, }
}, },
beforeDestroy() { beforeDestroy() {
this.mySwiper.destroy(); this.mySwiper.destroy();
}, }
}; };
</script> </script>
......
admin_2/src/pages/home/components/LineEchart.vue
View file @ 15017fd2
...@@ -7,21 +7,21 @@ export default { ...@@ -7,21 +7,21 @@ export default {
props: { props: {
dataset: { dataset: {
type: Object, type: Object,
default: () => {}, default: () => {}
}, },
endValue: { endValue: {
type: Number, type: Number,
default: 10, default: 10
}, },
color: { color: {
type: String, type: String,
default: "#0857E8", default: '#0857E8'
}, }
}, },
data() { data() {
return { return {
myChart: null, myChart: null,
timer: null, timer: null
}; };
}, },
watch: { watch: {
...@@ -32,8 +32,8 @@ export default { ...@@ -32,8 +32,8 @@ export default {
}); });
}, },
deep: true, deep: true,
immediate: true, immediate: true
}, }
}, },
mounted() {}, mounted() {},
methods: { methods: {
...@@ -52,13 +52,13 @@ export default { ...@@ -52,13 +52,13 @@ export default {
let option = { let option = {
grid: { grid: {
top: "15%", top: '15%',
left: "15%", left: '15%',
right: "5%", right: '5%',
bottom: "12%", bottom: '12%'
}, },
tooltip: { tooltip: {
trigger: "axis", trigger: 'axis',
borderWidth: 0, borderWidth: 0,
formatter: (params) => { formatter: (params) => {
return `${ return `${
...@@ -66,12 +66,10 @@ export default { ...@@ -66,12 +66,10 @@ export default {
}<br/><div style='margin-top:4px;padding:4px 8px;background:${this.hexToRgba( }<br/><div style='margin-top:4px;padding:4px 8px;background:${this.hexToRgba(
this.color, this.color,
0.1 0.1
)};color:${ )};color:${this.color};border-radius:4px'><span style='margin-right:20px'>${
this.color
};border-radius:4px'><span style='margin-right:20px'>${
params[0].seriesName params[0].seriesName
}</span>${params[0].value.value}</div>`; }</span>${params[0].value.value}</div>`;
}, }
}, },
// dataZoom: [ // dataZoom: [
// { // {
...@@ -82,77 +80,77 @@ export default { ...@@ -82,77 +80,77 @@ export default {
// }, // },
// ], // ],
xAxis: { xAxis: {
type: "category", type: 'category',
boundaryGap: false, boundaryGap: false,
axisLabel: { axisLabel: {
color: "#5A5C60", color: '#5A5C60',
formatter: (name) => { formatter: (name) => {
let formatterName = name.split("-"); let formatterName = name.split('-');
return `${formatterName[1]}-${formatterName[2]}`; return `${formatterName[1]}-${formatterName[2]}`;
}, }
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: "#E0E0E0", color: '#E0E0E0'
}, }
}, },
axisTick: { axisTick: {
show: false, show: false
}, },
splitLine: { splitLine: {
show: true, show: true,
lineStyle: { lineStyle: {
type: "dashed", type: 'dashed',
color: "#E0E0E0", color: '#E0E0E0'
}, }
}, },
axisPointer: { axisPointer: {
lineStyle: { lineStyle: {
color: this.hexToRgba(this.color, 1), color: this.hexToRgba(this.color, 1)
}, }
}, }
}, },
yAxis: { yAxis: {
type: "value", type: 'value',
splitNumber: 3, splitNumber: 3,
axisLabel: { axisLabel: {
color: "#666", color: '#666'
}, },
nameTextStyle: { nameTextStyle: {
color: "#5A5C60", color: '#5A5C60',
fontSize: 12, fontSize: 12,
lineHeight: 40, lineHeight: 40
}, },
splitLine: { splitLine: {
lineStyle: { lineStyle: {
type: "dashed", type: 'dashed',
color: "#E0E0E0", color: '#E0E0E0'
}, }
}, },
axisLine: { axisLine: {
show: false, show: false
}, },
axisTick: { axisTick: {
show: false, show: false
}, }
}, },
series: [ series: [
{ {
name: "数据量", name: '数据量',
type: "line", type: 'line',
smooth: true, smooth: true,
showSymbol: false, showSymbol: false,
symbolSize: 8, symbolSize: 8,
lineStyle: { lineStyle: {
color: this.hexToRgba(this.color, 1), color: this.hexToRgba(this.color, 1)
}, },
itemStyle: { itemStyle: {
color: this.hexToRgba(this.color, 1), color: this.hexToRgba(this.color, 1)
}, },
areaStyle: { areaStyle: {
color: { color: {
type: "linear", type: 'linear',
x: 0, x: 0,
y: 0, y: 0,
x2: 0, x2: 0,
...@@ -160,28 +158,28 @@ export default { ...@@ -160,28 +158,28 @@ export default {
colorStops: [ colorStops: [
{ {
offset: 0, offset: 0,
color: this.hexToRgba(this.color, 0.4), color: this.hexToRgba(this.color, 0.4)
}, },
{ {
offset: 0.6, offset: 0.6,
color: this.hexToRgba(this.color, 0.1), color: this.hexToRgba(this.color, 0.1)
}, },
{ {
offset: 1, offset: 1,
color: "#0000", color: '#0000'
}, }
], ]
}, }
}, }
}, }
], ],
dataset, dataset
}; };
this.myChart.setOption(option); this.myChart.setOption(option);
// 适配 // 适配
window.addEventListener("resize", this.adapterEcharts); window.addEventListener('resize', this.adapterEcharts);
// 清除现有定时器，防止多次调用 // 清除现有定时器，防止多次调用
// clearInterval(this.timer); // clearInterval(this.timer);
...@@ -221,20 +219,20 @@ export default { ...@@ -221,20 +219,20 @@ export default {
}, },
hexToRgba(hex, opacity) { hexToRgba(hex, opacity) {
let rgbaColor = ""; let rgbaColor = '';
let reg = /^#[\da-f]{6}$/i; let reg = /^#[\da-f]{6}$/i;
if (reg.test(hex)) { if (reg.test(hex)) {
rgbaColor = `rgba(${parseInt("0x" + hex.slice(1, 3))},${parseInt( rgbaColor = `rgba(${parseInt('0x' + hex.slice(1, 3))},${parseInt(
"0x" + hex.slice(3, 5) '0x' + hex.slice(3, 5)
)},${parseInt("0x" + hex.slice(5, 7))},${opacity})`; )},${parseInt('0x' + hex.slice(5, 7))},${opacity})`;
} }
return rgbaColor; return rgbaColor;
}, }
}, },
beforeDestroy() { beforeDestroy() {
window.removeEventListener("resize", this.adapterEcharts); window.removeEventListener('resize', this.adapterEcharts);
clearInterval(this.timer); clearInterval(this.timer);
}, }
}; };
</script> </script>
......
admin_2/src/pages/login/Login.vue
View file @ 15017fd2
...@@ -3,13 +3,7 @@ ...@@ -3,13 +3,7 @@
<div class="page page-login flex h-full w-full items-center justify-center"> <div class="page page-login flex h-full w-full items-center justify-center">
<div class="flex min-w-[450px] flex-col justify-center bg-white p-[25px]"> <div class="flex min-w-[450px] flex-col justify-center bg-white p-[25px]">
<h1 class="mb-4 text-center text-[24px] font-[500]">{{ systemName }}</h1> <h1 class="mb-4 text-center text-[24px] font-[500]">{{ systemName }}</h1>
<el-form <el-form class="w-full" ref="form" :model="form" :rules="rules" hide-required-asterisk>
class="w-full"
ref="form"
:model="form"
:rules="rules"
hide-required-asterisk
>
<el-form-item l prop="loginName"> <el-form-item l prop="loginName">
<el-input <el-input
clearable clearable
...@@ -38,14 +32,8 @@ ...@@ -38,14 +32,8 @@
v-model="form.securityCode" v-model="form.securityCode"
@keyup.enter="onSubmit" @keyup.enter="onSubmit"
></el-input> ></el-input>
<div <div class="code-box h-[40px] cursor-pointer overflow-hidden rounded-[4px]">
class="code-box h-[40px] cursor-pointer overflow-hidden rounded-[4px]" <img class="h-full w-full" :src="securityUrl" @click="createCode" />
>
<img
class="h-full w-full"
:src="securityUrl"
@click="createCode"
/>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -67,52 +55,48 @@ ...@@ -67,52 +55,48 @@
</template> </template>
<script> <script>
import storage from "@/utils/storage"; import storage from '@/utils/storage';
import { mapMutations } from "vuex"; import { mapMutations } from 'vuex';
import { getHomeData } from "@/api/home"; import { getHomeData } from '@/api/home';
import { generateRoutes, filterBtn } from "@/utils"; import { generateRoutes, filterBtn } from '@/utils';
import { calcMenu } from "@/router"; import { calcMenu } from '@/router';
import { login } from "@/api/login"; import { login } from '@/api/login';
import { systemName } from "@/config"; import { systemName } from '@/config';
export default { export default {
name: "login", name: 'login',
data() { data() {
return { return {
systemName, systemName,
api: process.env.VUE_APP_API_BASE_URL, api: process.env.VUE_APP_API_BASE_URL,
securityUrl: "", securityUrl: '',
originData: [], originData: [],
loading: false, loading: false,
redirect: this.$route.query.redirect || "/", redirect: this.$route.query.redirect || '/',
form: { form: {
loginName: "", loginName: '',
password: "", password: '',
securityCode: "", securityCode: ''
}, },
rules: { rules: {
loginName: [ loginName: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
{ required: true, message: "请输入用户名", trigger: "blur" }, password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
], securityCode: [{ required: true, message: '请输入验证码', trigger: 'blur' }]
password: [{ required: true, message: "请输入密码", trigger: "blur" }], }
securityCode: [
{ required: true, message: "请输入验证码", trigger: "blur" },
],
},
}; };
}, },
created() { created() {
this.createCode(); this.createCode();
}, },
methods: { methods: {
...mapMutations("user", [ ...mapMutations('user', [
"SET_token", 'SET_token',
"SET_sysName", 'SET_sysName',
"SET_sysLogo", 'SET_sysLogo',
"SET_path", 'SET_path',
"SET_userInfo", 'SET_userInfo',
"SET_permissions", 'SET_permissions',
"SET_routes", 'SET_routes',
"SET_menusList", 'SET_menusList'
]), ]),
// 获取验证码 // 获取验证码
...@@ -120,8 +104,7 @@ export default { ...@@ -120,8 +104,7 @@ export default {
// 加时间戳印记用于刷新gif // 加时间戳印记用于刷新gif
let mark = new Date().getTime(); let mark = new Date().getTime();
// this.form.mark = mark; // this.form.mark = mark;
this.securityUrl = this.securityUrl = this.api + '/bill/securitycode/createCode' + `?mark=${mark}`;
this.api + "/bill/securitycode/createCode" + `?mark=${mark}`;
}, },
onSubmit() { onSubmit() {
...@@ -132,17 +115,17 @@ export default { ...@@ -132,17 +115,17 @@ export default {
if (res.data.code == 1) { if (res.data.code == 1) {
let { let {
token, token,
user: { id, loginName, siteIds }, user: { id, loginName, siteIds }
} = res.data.data; } = res.data.data;
let form = { let form = {
token, token,
userInfo: { userInfo: {
id, id,
name: loginName, name: loginName
}, }
}; };
if (siteIds) { if (siteIds) {
let siteid = siteIds.split(",")[0]; let siteid = siteIds.split(',')[0];
form.siteid = siteid; form.siteid = siteid;
} }
await this.getToken(form); await this.getToken(form);
...@@ -157,11 +140,11 @@ export default { ...@@ -157,11 +140,11 @@ export default {
if (token && userInfo) { if (token && userInfo) {
this.SET_userInfo(userInfo); this.SET_userInfo(userInfo);
this.SET_token(token); this.SET_token(token);
storage.set(2, "siteId", siteid); storage.set(2, 'siteId', siteid);
// storage.set(2, "siteName", siteName); // storage.set(2, "siteName", siteName);
await this.getIndixData(); await this.getIndixData();
} else { } else {
this.$message.warning("登录失败,请稍后再试"); this.$message.warning('登录失败,请稍后再试');
} }
}, },
// 获取菜单列表 // 获取菜单列表
...@@ -180,7 +163,7 @@ export default { ...@@ -180,7 +163,7 @@ export default {
let path = routes[0].path; let path = routes[0].path;
this.$router.push(path); this.$router.push(path);
} else { } else {
this.$message.warning("暂无权限，请联系管理员！"); this.$message.warning('暂无权限，请联系管理员！');
} }
} }
}, },
...@@ -191,8 +174,8 @@ export default { ...@@ -191,8 +174,8 @@ export default {
.filter((v) => v.perms) .filter((v) => v.perms)
.map((v) => v.perms); .map((v) => v.perms);
this.SET_permissions(btnPermissions); this.SET_permissions(btnPermissions);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/market/EvaluateReport.vue
View file @ 15017fd2
...@@ -18,10 +18,7 @@ ...@@ -18,10 +18,7 @@
统计时间段：{{ searchForm.time[0] }} ~ {{ searchForm.time[1] }} 统计时间段：{{ searchForm.time[0] }} ~ {{ searchForm.time[1] }}
</div> </div>
</div> </div>
<div <div class="flex items-center" v-hasPermi="['market:evaluatereport:query']">
class="flex items-center"
v-hasPermi="['market:evaluatereport:query']"
>
<el-form ref="searchForm" inline size="small" :model="searchForm"> <el-form ref="searchForm" inline size="small" :model="searchForm">
<el-form-item> <el-form-item>
<el-select style="width: 130px" v-model="searchForm.type"> <el-select style="width: 130px" v-model="searchForm.type">
...@@ -56,11 +53,7 @@ ...@@ -56,11 +53,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-popover <el-popover placement="bottom" trigger="click" v-hasPermi="['market:evaluatereport:query']">
placement="bottom"
trigger="click"
v-hasPermi="['market:evaluatereport:query']"
>
<div class="w-full"> <div class="w-full">
<el-form ref="searchForm2" inline size="small" :model="searchForm2"> <el-form ref="searchForm2" inline size="small" :model="searchForm2">
<el-form-item> <el-form-item>
...@@ -179,26 +172,26 @@ ...@@ -179,26 +172,26 @@
</template> </template>
<script> <script>
import EvaluateDetails from "./components/EvaluateDetails.vue"; import EvaluateDetails from './components/EvaluateDetails.vue';
import { getEvaluateList } from "@/api/market"; import { getEvaluateList } from '@/api/market';
import { getDepartment, getHall } from "@/api/site"; import { getDepartment, getHall } from '@/api/site';
import { dataSection } from "@/utils"; import { dataSection } from '@/utils';
import { export2Excel } from "@/utils/exportExcel"; import { export2Excel } from '@/utils/exportExcel';
import storage from "@/utils/storage"; import storage from '@/utils/storage';
let searchType = { let searchType = {
windowFromnum: "按窗口编号", windowFromnum: '按窗口编号',
peopleName: "按群众姓名", peopleName: '按群众姓名',
peoplePhone: "按群众手机号", peoplePhone: '按群众手机号'
}; };
export default { export default {
components: { components: {
EvaluateDetails, EvaluateDetails
}, },
props: { props: {
curTreeData: { curTreeData: {
required: true, required: true,
default: () => {}, default: () => {}
}, }
}, },
data() { data() {
return { return {
...@@ -210,20 +203,17 @@ export default { ...@@ -210,20 +203,17 @@ export default {
page: 1, page: 1,
total: 0, total: 0,
searchForm: { searchForm: {
type: "windowFromnum", type: 'windowFromnum',
keyword: "", keyword: '',
time: [ time: [this.$moment().format('YYYY-MM-DD'), this.$moment().format('YYYY-MM-DD')],
this.$moment().format("YYYY-MM-DD"), siteId: storage.get(2, 'siteId')
this.$moment().format("YYYY-MM-DD"),
],
siteId: storage.get(2, "siteId"),
}, },
searchForm2: { searchForm2: {
pjOption: "", // 评价选项 pjOption: '', // 评价选项
sectionName: "", // 部门名称 sectionName: '', // 部门名称
hallName: "", // 大厅名称 hallName: '', // 大厅名称
pjSource: "", // 评价来源 pjSource: '', // 评价来源
pjType: "", // 评价指向 pjType: '' // 评价指向
}, },
tableData: [], tableData: [],
dict: {}, dict: {},
...@@ -233,153 +223,153 @@ export default { ...@@ -233,153 +223,153 @@ export default {
hallList: [], // 大厅列表 hallList: [], // 大厅列表
column: [ column: [
{ {
type: "selection", type: 'selection',
width: "50", width: '50',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true,
fixed: "left", fixed: 'left'
}, },
{ {
type: "index", type: 'index',
label: "序号", label: '序号',
width: "50", width: '50',
align: "center", align: 'center',
fixed: "left", fixed: 'left',
index: (index) => { index: (index) => {
return index + 1 + (this.page - 1) * this.size; return index + 1 + (this.page - 1) * this.size;
}, }
}, },
{ {
label: "站点名称", label: '站点名称',
align: "center", align: 'center',
width: "150", width: '150',
prop: "siteName", prop: 'siteName'
}, },
{ {
label: "身份证号", label: '身份证号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peopleIdcard", prop: 'peopleIdcard'
}, },
{ {
label: "姓名", label: '姓名',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peopleName", prop: 'peopleName'
}, },
{ {
label: "性别", label: '性别',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peopleSex", prop: 'peopleSex'
}, },
{ {
label: "手机号", label: '手机号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peoplePhone", prop: 'peoplePhone'
}, },
{ {
label: "评价选项", label: '评价选项',
align: "center", align: 'center',
width: "150", width: '150',
prop: "pjOption", prop: 'pjOption'
}, },
{ {
label: "评价标签", label: '评价标签',
align: "center", align: 'center',
width: "150", width: '150',
prop: "contentTag", prop: 'contentTag'
}, },
{ {
label: "部门", label: '部门',
align: "center", align: 'center',
width: "150", width: '150',
prop: "sectionName", prop: 'sectionName'
}, },
{ {
label: "大厅", label: '大厅',
align: "center", align: 'center',
width: "150", width: '150',
prop: "hallName", prop: 'hallName'
}, },
{ {
label: "评价来源", label: '评价来源',
align: "center", align: 'center',
width: "150", width: '150',
prop: "pjSource", prop: 'pjSource'
}, },
{ {
label: "手输意见", label: '手输意见',
align: "center", align: 'center',
width: "150", width: '150',
prop: "opinion", prop: 'opinion'
}, },
{ {
label: "窗口名", label: '窗口名',
align: "center", align: 'center',
width: "150", width: '150',
prop: "windowName", prop: 'windowName'
}, },
{ {
label: "窗口编号", label: '窗口编号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "windowFromnum", prop: 'windowFromnum'
}, },
{ {
label: "窗口评价", label: '窗口评价',
align: "center", align: 'center',
width: "150", width: '150',
prop: "pjxt", prop: 'pjxt'
}, },
{ {
label: "工作人员", label: '工作人员',
align: "center", align: 'center',
width: "150", width: '150',
prop: "workmanName", prop: 'workmanName'
}, },
{ {
label: "工号", label: '工号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "workmanNumber", prop: 'workmanNumber'
}, },
{ {
label: "评价状态", label: '评价状态',
align: "center", align: 'center',
width: "150", width: '150',
prop: "evaluatestatus", prop: 'evaluatestatus'
}, },
{ {
label: "评价指向", label: '评价指向',
align: "center", align: 'center',
width: "150", width: '150',
prop: "pjType", prop: 'pjType'
}, },
{ {
label: "评价时间", label: '评价时间',
align: "center", align: 'center',
width: "150", width: '150',
prop: "pjTime", prop: 'pjTime'
}, },
{ {
label: "扩展编号", label: '扩展编号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "extNum", prop: 'extNum'
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
fixed: "right", fixed: 'right',
width: "100", width: '100',
formatter: (row) => { formatter: (row) => {
return ( return (
<span <span
class="primary cursor-pointer" class="primary cursor-pointer"
v-hasPermi={["market:evaluatereport:details"]} v-hasPermi={['market:evaluatereport:details']}
onClick={() => { onClick={() => {
this.checkDetails(row); this.checkDetails(row);
}} }}
...@@ -387,9 +377,9 @@ export default { ...@@ -387,9 +377,9 @@ export default {
查看详情 查看详情
</span> </span>
); );
}, }
}, }
], ]
}; };
}, },
created() {}, created() {},
...@@ -399,16 +389,16 @@ export default { ...@@ -399,16 +389,16 @@ export default {
this.getSite(newVal); this.getSite(newVal);
}, },
deep: true, deep: true,
immediate: true, immediate: true
}, }
}, },
methods: { methods: {
// 获取站点 // 获取站点
getSite(data) { getSite(data) {
if (JSON.stringify(data) !== "{}") { if (JSON.stringify(data) !== '{}') {
this.page = 1; this.page = 1;
this.size = 10; this.size = 10;
if (data.type == "site") { if (data.type == 'site') {
this.searchForm.siteId = data.id; this.searchForm.siteId = data.id;
this.getEvaluateList(); this.getEvaluateList();
this.getDepartment(); this.getDepartment();
...@@ -432,7 +422,7 @@ export default { ...@@ -432,7 +422,7 @@ export default {
size: this.size, size: this.size,
pjTimeStart: this.searchForm.time[0], pjTimeStart: this.searchForm.time[0],
pjTimeEnd: this.searchForm.time[1], pjTimeEnd: this.searchForm.time[1],
siteId: this.searchForm.siteId, siteId: this.searchForm.siteId
}; };
let val = `%${this.searchForm.keyword}%`; let val = `%${this.searchForm.keyword}%`;
obj[this.searchForm.type] = val; obj[this.searchForm.type] = val;
...@@ -440,14 +430,14 @@ export default { ...@@ -440,14 +430,14 @@ export default {
let res = await getEvaluateList({ let res = await getEvaluateList({
...obj, ...obj,
...this.searchForm2, ...this.searchForm2,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
return res.data.data; return res.data.data;
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0
}; };
} }
}, },
...@@ -457,7 +447,7 @@ export default { ...@@ -457,7 +447,7 @@ export default {
this.loading = true; this.loading = true;
let { data, total, dict } = await this.getData(form); let { data, total, dict } = await this.getData(form);
data.forEach((v) => { data.forEach((v) => {
v.pjTime = this.$moment(v.pjTime).format("YYYY-MM-DD HH:mm:ss"); v.pjTime = this.$moment(v.pjTime).format('YYYY-MM-DD HH:mm:ss');
}); });
this.tableData = data; this.tableData = data;
this.total = total; this.total = total;
...@@ -470,7 +460,7 @@ export default { ...@@ -470,7 +460,7 @@ export default {
let res = await getDepartment({ let res = await getDepartment({
page: 1, page: 1,
size: -1, size: -1,
siteId: this.searchForm.siteId, siteId: this.searchForm.siteId
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -483,7 +473,7 @@ export default { ...@@ -483,7 +473,7 @@ export default {
let res = await getHall({ let res = await getHall({
page: 1, page: 1,
size: -1, size: -1,
siteId: this.searchForm.siteId, siteId: this.searchForm.siteId
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -501,7 +491,7 @@ export default { ...@@ -501,7 +491,7 @@ export default {
}, },
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getSite(this.curTreeData); this.getSite(this.curTreeData);
}, },
// 导出表格 // 导出表格
...@@ -516,28 +506,28 @@ export default { ...@@ -516,28 +506,28 @@ export default {
tHeader, tHeader,
filterVal, filterVal,
data, data,
"评价数据报表" + this.$moment().format("YYYYMMDDHHmmss") '评价数据报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
} else { } else {
dataSection(this.getData, {}, (data) => { dataSection(this.getData, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
data.forEach((v) => { data.forEach((v) => {
v.pjTime = this.$moment(v.pjTime).format("YYYY-MM-DD HH:mm:ss"); v.pjTime = this.$moment(v.pjTime).format('YYYY-MM-DD HH:mm:ss');
}); });
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"评价数据报表" + this.$moment().format("YYYYMMDDHHmmss") '评价数据报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
} }
this.exportLoading = false; this.exportLoading = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/market/Market.vue
View file @ 15017fd2
<template> <template>
<div class="flex h-full w-full gap-5"> <div class="flex h-full w-full gap-5">
<div <div class="area-tree-box flex h-full w-[20%] flex-col rounded-[4px] bg-white">
class="area-tree-box flex h-full w-[20%] flex-col rounded-[4px] bg-white"
>
<TabHeader icon="el-icon-notebook-2" label="组织架构"></TabHeader> <TabHeader icon="el-icon-notebook-2" label="组织架构"></TabHeader>
<div class="w-full flex-1 overflow-auto p-[20px]"> <div class="w-full flex-1 overflow-auto p-[20px]">
<AreaTree @change="changeSite"></AreaTree> <AreaTree @change="changeSite"></AreaTree>
...@@ -12,10 +10,7 @@ ...@@ -12,10 +10,7 @@
<el-tabs :value="activeKey" @tab-click="changeRouter"> <el-tabs :value="activeKey" @tab-click="changeRouter">
<el-tab-pane v-for="v in secondaryRoutes" :key="v.path" :name="v.path"> <el-tab-pane v-for="v in secondaryRoutes" :key="v.path" :name="v.path">
<template slot="label"> <template slot="label">
<i <i v-if="v.meta.icon" :class="['mr-[5px]', 'primary', v.meta.icon]"></i>
v-if="v.meta.icon"
:class="['mr-[5px]', 'primary', v.meta.icon]"
></i>
<span class="tab-label">{{ v.meta.title }}</span> <span class="tab-label">{{ v.meta.title }}</span>
</template> </template>
</el-tab-pane> </el-tab-pane>
...@@ -28,18 +23,18 @@ ...@@ -28,18 +23,18 @@
</template> </template>
<script> <script>
import { mapGetters } from "vuex"; import { mapGetters } from 'vuex';
export default { export default {
data() { data() {
return { return {
curTreeData: {}, // 当前选择的站点 curTreeData: {} // 当前选择的站点
}; };
}, },
computed: { computed: {
...mapGetters("user", ["secondaryRoutes"]), ...mapGetters('user', ['secondaryRoutes']),
activeKey() { activeKey() {
return this.$route.path; return this.$route.path;
}, }
}, },
created() {}, created() {},
methods: { methods: {
...@@ -51,8 +46,8 @@ export default { ...@@ -51,8 +46,8 @@ export default {
changeSite(data) { changeSite(data) {
this.curTreeData = data; this.curTreeData = data;
// this.$refs.Page.getSite(data); // this.$refs.Page.getSite(data);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/market/QueueUpReport.vue
View file @ 15017fd2
...@@ -18,10 +18,7 @@ ...@@ -18,10 +18,7 @@
统计时间段：{{ searchForm.time[0] }} ~ {{ searchForm.time[1] }} 统计时间段：{{ searchForm.time[0] }} ~ {{ searchForm.time[1] }}
</div> </div>
</div> </div>
<div <div class="flex items-center" v-hasPermi="['market:queueupreport:query']">
class="flex items-center"
v-hasPermi="['market:queueupreport:query']"
>
<el-form ref="searchForm" inline size="small" :model="searchForm"> <el-form ref="searchForm" inline size="small" :model="searchForm">
<el-form-item> <el-form-item>
<el-select style="width: 130px" v-model="searchForm.type"> <el-select style="width: 130px" v-model="searchForm.type">
...@@ -56,11 +53,7 @@ ...@@ -56,11 +53,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-popover <el-popover placement="bottom" trigger="click" v-hasPermi="['market:queueupreport:query']">
placement="bottom"
trigger="click"
v-hasPermi="['market:queueupreport:query']"
>
<div class="w-full"> <div class="w-full">
<el-form ref="searchForm2" inline size="small" :model="searchForm2"> <el-form ref="searchForm2" inline size="small" :model="searchForm2">
<!-- <el-form-item> <!-- <el-form-item>
...@@ -150,27 +143,27 @@ ...@@ -150,27 +143,27 @@
</template> </template>
<script> <script>
import QueueUpDetails from "./components/QueueUpDetails.vue"; import QueueUpDetails from './components/QueueUpDetails.vue';
let searchType = { let searchType = {
business: "按业务", business: '按业务',
windowFromnum: "按窗口编号", windowFromnum: '按窗口编号',
peopleName: "按群众姓名", peopleName: '按群众姓名',
peoplePhone: "按群众手机号", peoplePhone: '按群众手机号'
}; };
import { getQueueList } from "@/api/market"; import { getQueueList } from '@/api/market';
import { getDepartment, getHall } from "@/api/site"; import { getDepartment, getHall } from '@/api/site';
import storage from "@/utils/storage"; import storage from '@/utils/storage';
import { formatSeconds, dataSection } from "@/utils"; import { formatSeconds, dataSection } from '@/utils';
import { export2Excel } from "@/utils/exportExcel"; import { export2Excel } from '@/utils/exportExcel';
export default { export default {
components: { components: {
QueueUpDetails, QueueUpDetails
}, },
props: { props: {
curTreeData: { curTreeData: {
required: true, required: true,
default: () => {}, default: () => {}
}, }
}, },
data() { data() {
return { return {
...@@ -183,183 +176,178 @@ export default { ...@@ -183,183 +176,178 @@ export default {
page: 1, page: 1,
selectionRow: [], selectionRow: [],
searchForm: { searchForm: {
type: "business", type: 'business',
keyword: "", keyword: '',
time: [ time: [this.$moment().format('YYYY-MM-DD'), this.$moment().format('YYYY-MM-DD')],
this.$moment().format("YYYY-MM-DD"), siteId: this.$route.params.siteId ? this.$route.params.siteId : storage.get(2, 'siteId')
this.$moment().format("YYYY-MM-DD"),
],
siteId: this.$route.params.siteId
? this.$route.params.siteId
: storage.get(2, "siteId"),
}, },
searchForm2: { searchForm2: {
wySignin: "", // 取号方式（现场取号,微信取号） wySignin: '', // 取号方式（现场取号,微信取号）
hallName: "", // 大厅名称 hallName: '', // 大厅名称
sectionName: "", // 部门名称 sectionName: '' // 部门名称
}, },
tableData: [], tableData: [],
column: [ column: [
{ {
type: "selection", type: 'selection',
width: "50", width: '50',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true,
fixed: "left", fixed: 'left'
}, },
{ {
type: "index", type: 'index',
label: "序号", label: '序号',
width: "50", width: '50',
align: "center", align: 'center',
fixed: "left", fixed: 'left',
index: (index) => { index: (index) => {
return index + 1 + (this.page - 1) * this.size; return index + 1 + (this.page - 1) * this.size;
}, }
}, },
{ {
label: "站点名称", label: '站点名称',
align: "center", align: 'center',
width: "150", width: '150',
prop: "siteName", prop: 'siteName'
}, },
{ {
label: "业务名称", label: '业务名称',
align: "center", align: 'center',
width: "150", width: '150',
prop: "business", prop: 'business'
}, },
{ {
label: "预约编码", label: '预约编码',
align: "center", align: 'center',
width: "150", width: '150',
prop: "ordernumber", prop: 'ordernumber'
}, },
{ {
label: "叫号状态", label: '叫号状态',
align: "center", align: 'center',
width: "150", width: '150',
prop: "style", prop: 'style'
}, },
{ {
label: "窗口名", label: '窗口名',
align: "center", align: 'center',
width: "150", width: '150',
prop: "windowName", prop: 'windowName'
}, },
{ {
label: "窗口编号", label: '窗口编号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "windowFromnum", prop: 'windowFromnum'
}, },
{ {
label: "流水号", label: '流水号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "flownum", prop: 'flownum'
}, },
{ {
label: "呼叫转移", label: '呼叫转移',
align: "center", align: 'center',
width: "150", width: '150',
prop: "formernum", prop: 'formernum'
}, },
{ {
label: "身份证号", label: '身份证号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peopleIdcard", prop: 'peopleIdcard'
}, },
{ {
label: "姓名", label: '姓名',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peopleName", prop: 'peopleName'
}, },
{ {
label: "手机号", label: '手机号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "peoplePhone", prop: 'peoplePhone'
}, },
{ {
label: "工作人员", label: '工作人员',
align: "center", align: 'center',
width: "150", width: '150',
prop: "workmanName", prop: 'workmanName'
}, },
{ {
label: "工号", label: '工号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "workmanNumber", prop: 'workmanNumber'
}, },
{ {
label: "取号方式", label: '取号方式',
align: "center", align: 'center',
width: "150", width: '150',
prop: "wySignin", prop: 'wySignin'
}, },
{ {
label: "部门名称", label: '部门名称',
align: "center", align: 'center',
width: "150", width: '150',
prop: "sectionName", prop: 'sectionName'
}, },
{ {
label: "大厅名称", label: '大厅名称',
align: "center", align: 'center',
width: "150", width: '150',
prop: "hallName", prop: 'hallName'
}, },
{ {
label: "取号时间", label: '取号时间',
align: "center", align: 'center',
width: "150", width: '150',
prop: "taketime", prop: 'taketime'
}, },
{ {
label: "叫号时间", label: '叫号时间',
align: "center", align: 'center',
width: "150", width: '150',
prop: "calltime", prop: 'calltime'
}, },
{ {
label: "结束时间", label: '结束时间',
align: "center", align: 'center',
width: "150", width: '150',
prop: "endtime", prop: 'endtime'
}, },
{ {
label: "等待时间", label: '等待时间',
align: "center", align: 'center',
width: "150", width: '150',
prop: "waitTime", prop: 'waitTime'
}, },
{ {
label: "办理时间", label: '办理时间',
align: "center", align: 'center',
width: "150", width: '150',
prop: "handleTime", prop: 'handleTime'
}, },
{ {
label: "扩展编号", label: '扩展编号',
align: "center", align: 'center',
width: "150", width: '150',
prop: "extNum", prop: 'extNum'
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
fixed: "right", fixed: 'right',
width: "100", width: '100',
formatter: (row) => { formatter: (row) => {
return ( return (
<span <span
class="primary cursor-pointer" class="primary cursor-pointer"
v-hasPermi={["market:queueupreport:details"]} v-hasPermi={['market:queueupreport:details']}
onClick={() => { onClick={() => {
this.checkDetails(row); this.checkDetails(row);
}} }}
...@@ -367,12 +355,12 @@ export default { ...@@ -367,12 +355,12 @@ export default {
查看详情 查看详情
</span> </span>
); );
}, }
}, }
], ],
detailsInfo: {}, detailsInfo: {},
deptList: [], // 部门列表 deptList: [], // 部门列表
hallList: [], // 大厅列表 hallList: [] // 大厅列表
}; };
}, },
...@@ -382,17 +370,17 @@ export default { ...@@ -382,17 +370,17 @@ export default {
this.getSite(newVal); this.getSite(newVal);
}, },
deep: true, deep: true,
immediate: true, immediate: true
}, }
}, },
created() {}, created() {},
methods: { methods: {
// 获取站点 // 获取站点
getSite(data) { getSite(data) {
if (JSON.stringify(data) !== "{}") { if (JSON.stringify(data) !== '{}') {
this.page = 1; this.page = 1;
this.size = 10; this.size = 10;
if (data.type == "site") { if (data.type == 'site') {
this.searchForm.siteId = data.id; this.searchForm.siteId = data.id;
this.getQueueList(); this.getQueueList();
this.getDepartment(); this.getDepartment();
...@@ -416,7 +404,7 @@ export default { ...@@ -416,7 +404,7 @@ export default {
size: this.size, size: this.size,
taketimeStart: this.searchForm.time[0], taketimeStart: this.searchForm.time[0],
taketimeEnd: this.searchForm.time[1], taketimeEnd: this.searchForm.time[1],
siteId: this.searchForm.siteId, siteId: this.searchForm.siteId
}; };
let val = `%${this.searchForm.keyword}%`; let val = `%${this.searchForm.keyword}%`;
obj[this.searchForm.type] = val; obj[this.searchForm.type] = val;
...@@ -425,12 +413,12 @@ export default { ...@@ -425,12 +413,12 @@ export default {
let { data, count } = res.data.data; let { data, count } = res.data.data;
return { return {
data, data,
total: count, total: count
}; };
} else { } else {
return { return {
data: [], data: [],
total: 0, total: 0
}; };
} }
}, },
...@@ -439,14 +427,11 @@ export default { ...@@ -439,14 +427,11 @@ export default {
this.loading = true; this.loading = true;
let { data, total } = await this.getData(form); let { data, total } = await this.getData(form);
data.forEach((v) => { data.forEach((v) => {
v.taketime = v.taketime = v.taketime && this.$moment(v.taketime).format('YYYY-MM-DD HH:mm:ss');
v.taketime && this.$moment(v.taketime).format("YYYY-MM-DD HH:mm:ss"); v.endtime = v.endtime && this.$moment(v.endtime).format('YYYY-MM-DD HH:mm:ss');
v.endtime = v.calltime = v.calltime && this.$moment(v.calltime).format('YYYY-MM-DD HH:mm:ss');
v.endtime && this.$moment(v.endtime).format("YYYY-MM-DD HH:mm:ss"); v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : '';
v.calltime = v.handleTime = v.handleTime ? formatSeconds(v.handleTime) : '';
v.calltime && this.$moment(v.calltime).format("YYYY-MM-DD HH:mm:ss");
v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : "";
v.handleTime = v.handleTime ? formatSeconds(v.handleTime) : "";
}); });
this.tableData = data; this.tableData = data;
this.total = total; this.total = total;
...@@ -458,7 +443,7 @@ export default { ...@@ -458,7 +443,7 @@ export default {
let res = await getDepartment({ let res = await getDepartment({
page: 1, page: 1,
size: -1, size: -1,
siteId: this.searchForm.siteId, siteId: this.searchForm.siteId
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -471,7 +456,7 @@ export default { ...@@ -471,7 +456,7 @@ export default {
let res = await getHall({ let res = await getHall({
page: 1, page: 1,
size: -1, size: -1,
siteId: this.searchForm.siteId, siteId: this.searchForm.siteId
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -481,7 +466,7 @@ export default { ...@@ -481,7 +466,7 @@ export default {
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getSite(this.curTreeData); this.getSite(this.curTreeData);
}, },
checkDetails(row) { checkDetails(row) {
...@@ -504,38 +489,32 @@ export default { ...@@ -504,38 +489,32 @@ export default {
tHeader, tHeader,
filterVal, filterVal,
data, data,
"排队数据报表" + this.$moment().format("YYYYMMDDHHmmss") '排队数据报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
} else { } else {
dataSection(this.getData, {}, (data) => { dataSection(this.getData, {}, (data) => {
if (!data.length) { if (!data.length) {
this.$message.warning("暂无数据"); this.$message.warning('暂无数据');
return; return;
} }
data.forEach((v) => { data.forEach((v) => {
v.taketime = v.taketime = v.taketime && this.$moment(v.taketime).format('YYYY-MM-DD HH:mm:ss');
v.taketime && v.endtime = v.endtime && this.$moment(v.endtime).format('YYYY-MM-DD HH:mm:ss');
this.$moment(v.taketime).format("YYYY-MM-DD HH:mm:ss"); v.calltime = v.calltime && this.$moment(v.calltime).format('YYYY-MM-DD HH:mm:ss');
v.endtime = v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : '';
v.endtime && v.handleTime = v.handleTime ? formatSeconds(v.handleTime) : '';
this.$moment(v.endtime).format("YYYY-MM-DD HH:mm:ss");
v.calltime =
v.calltime &&
this.$moment(v.calltime).format("YYYY-MM-DD HH:mm:ss");
v.waitTime = v.waitTime ? formatSeconds(v.waitTime) : "";
v.handleTime = v.handleTime ? formatSeconds(v.handleTime) : "";
}); });
export2Excel( export2Excel(
tHeader, tHeader,
filterVal, filterVal,
data, data,
"排队数据报表" + this.$moment().format("YYYYMMDDHHmmss") '排队数据报表' + this.$moment().format('YYYYMMDDHHmmss')
); );
}); });
} }
this.exportLoading = false; this.exportLoading = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/market/components/EvaluateDetails.vue
View file @ 15017fd2
<template> <template>
<el-drawer <el-drawer title="详情" :visible.sync="drawer" size="60%" @close="drawer = false">
title="详情"
:visible.sync="drawer"
size="60%"
@close="drawer = false"
>
<div class="main h-full w-full p-[20px]"> <div class="main h-full w-full p-[20px]">
<el-descriptions <el-descriptions :column="3" border size="medium" labelClassName="label-name">
:column="3"
border
size="medium"
labelClassName="label-name"
>
<template v-for="(v, i) in dataInfo"> <template v-for="(v, i) in dataInfo">
<el-descriptions-item <el-descriptions-item
v-if=" v-if="(v.prop == 'photoautograph' || v.prop == 'picture') && v.content"
(v.prop == 'photoautograph' || v.prop == 'picture') && v.content
"
:key="i" :key="i"
:label="v.title" :label="v.title"
> >
<el-image <el-image style="width: 50px" :src="v.content" :preview-src-list="[v.content]">
style="width: 50px"
:src="v.content"
:preview-src-list="[v.content]"
>
</el-image> </el-image>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-else :key="i" :label="v.title"> <el-descriptions-item v-else :key="i" :label="v.title">
...@@ -41,168 +25,168 @@ export default { ...@@ -41,168 +25,168 @@ export default {
props: { props: {
show: { show: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
info: { info: {
required: true, required: true,
type: Object, type: Object,
default: () => {}, default: () => {}
}, }
}, },
data() { data() {
return { return {
detailsList: [ detailsList: [
{ {
title: "身份证号", title: '身份证号',
prop: "peopleIdcard", prop: 'peopleIdcard',
content: "", content: ''
}, },
{ {
title: "姓名", title: '姓名',
prop: "peopleName", prop: 'peopleName',
content: "", content: ''
}, },
{ {
title: "性别", title: '性别',
prop: "peopleSex", prop: 'peopleSex',
content: "", content: ''
}, },
{ {
title: "手机号", title: '手机号',
prop: "peoplePhone", prop: 'peoplePhone',
content: "", content: ''
}, },
{ {
title: "评价选项", title: '评价选项',
prop: "pjOption", prop: 'pjOption',
content: "", content: ''
}, },
{ {
title: "评价标签", title: '评价标签',
prop: "contentTag", prop: 'contentTag',
content: "", content: ''
}, },
{ {
title: "评价人图片地址", title: '评价人图片地址',
prop: "picUrl", prop: 'picUrl',
content: "", content: ''
}, },
{ {
title: "部门", title: '部门',
prop: "sectionName", prop: 'sectionName',
content: "", content: ''
}, },
{ {
title: "大厅名称", title: '大厅名称',
prop: "hallName", prop: 'hallName',
content: "", content: ''
}, },
{ {
title: "评价来源", title: '评价来源',
prop: "pjSource", prop: 'pjSource',
content: "", content: ''
}, },
{ {
title: "手输意见", title: '手输意见',
prop: "opinion", prop: 'opinion',
content: "", content: ''
}, },
{ {
title: "窗口名称", title: '窗口名称',
prop: "windowName", prop: 'windowName',
content: "", content: ''
}, },
{ {
title: "窗口编号", title: '窗口编号',
prop: "windowFromnum", prop: 'windowFromnum',
content: "", content: ''
}, },
{ {
title: "排队编号", title: '排队编号',
prop: "flounum", prop: 'flounum',
content: "", content: ''
}, },
{ {
title: "窗口评价", title: '窗口评价',
prop: "pjxt", prop: 'pjxt',
content: "", content: ''
}, },
{ {
title: "工作人员姓名", title: '工作人员姓名',
prop: "workmanName", prop: 'workmanName',
content: "", content: ''
}, },
{ {
title: "工作人员工号", title: '工作人员工号',
prop: "workmanNumber", prop: 'workmanNumber',
content: "", content: ''
}, },
{ {
title: "评价器MAC地址", title: '评价器MAC地址',
prop: "devicenum", prop: 'devicenum',
content: "", content: ''
}, },
{ {
title: "评价状态", title: '评价状态',
prop: "evaluatestatus", prop: 'evaluatestatus',
content: "", content: ''
}, },
{ {
title: "截图还是评价", title: '截图还是评价',
prop: "evaluatetype", prop: 'evaluatetype',
content: "", content: ''
}, },
{ {
title: "截图地址", title: '截图地址',
prop: "photobefor", prop: 'photobefor',
content: "", content: ''
}, },
{ {
title: "签字图片", title: '签字图片',
prop: "photoautograph", prop: 'photoautograph',
content: "", content: ''
}, },
{ {
title: "抓拍评价人照片", title: '抓拍评价人照片',
prop: "picture", prop: 'picture',
content: "", content: ''
}, },
{ {
title: "音视频地址", title: '音视频地址',
prop: "process", prop: 'process',
content: "", content: ''
}, },
{ {
title: "评价标记", title: '评价标记',
prop: "eyevaluate", prop: 'eyevaluate',
content: "", content: ''
}, },
{ {
title: "评价指向", title: '评价指向',
prop: "pjType", prop: 'pjType',
content: "", content: ''
}, },
{ {
title: "评价时间", title: '评价时间',
prop: "pjTime", prop: 'pjTime',
content: "", content: ''
}, },
{ {
title: "站点编码", title: '站点编码',
prop: "siteCode", prop: 'siteCode',
content: "", content: ''
}, },
{ {
title: "站点名称", title: '站点名称',
prop: "siteName", prop: 'siteName',
content: "", content: ''
}, },
{ {
title: "扩展编号", title: '扩展编号',
prop: "extNum", prop: 'extNum',
content: "", content: ''
}, }
], ]
}; };
}, },
computed: { computed: {
...@@ -211,17 +195,17 @@ export default { ...@@ -211,17 +195,17 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, },
dataInfo() { dataInfo() {
this.detailsList.forEach((v) => { this.detailsList.forEach((v) => {
v.content = this.info[v.prop]; v.content = this.info[v.prop];
}); });
return this.detailsList; return this.detailsList;
}, }
}, },
methods: {}, methods: {}
}; };
</script> </script>
......
admin_2/src/pages/market/components/QueueUpDetails.vue
View file @ 15017fd2
<template> <template>
<el-drawer <el-drawer title="详情" :visible.sync="drawer" size="60%" @close="drawer = false">
title="详情"
:visible.sync="drawer"
size="60%"
@close="drawer = false"
>
<div class="main h-full w-full p-[20px]"> <div class="main h-full w-full p-[20px]">
<el-descriptions <el-descriptions :column="3" border size="medium" labelClassName="label-name">
:column="3" <el-descriptions-item v-for="(v, i) in dataInfo" :key="i" :label="v.title">
border
size="medium"
labelClassName="label-name"
>
<el-descriptions-item
v-for="(v, i) in dataInfo"
:key="i"
:label="v.title"
>
{{ v.content }} {{ v.content }}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
...@@ -29,158 +15,158 @@ export default { ...@@ -29,158 +15,158 @@ export default {
props: { props: {
show: { show: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
info: { info: {
required: true, required: true,
type: Object, type: Object,
default: () => {}, default: () => {}
}, }
}, },
data() { data() {
return { return {
detailsList: [ detailsList: [
{ {
title: "预约编号", title: '预约编号',
prop: "ordernumber", prop: 'ordernumber',
content: "", content: ''
}, },
{ {
title: "叫号状态", title: '叫号状态',
prop: "style", prop: 'style',
content: "", content: ''
}, },
{ {
title: "业务名称", title: '业务名称',
prop: "business", prop: 'business',
content: "", content: ''
}, },
{ {
title: "窗口名称", title: '窗口名称',
prop: "windowName", prop: 'windowName',
content: "", content: ''
}, },
{ {
title: "窗口编号", title: '窗口编号',
prop: "windowFromnum", prop: 'windowFromnum',
content: "", content: ''
}, },
{ {
title: "流水编号,当天的第xxx号", title: '流水编号,当天的第xxx号',
prop: "flownum", prop: 'flownum',
content: "", content: ''
}, },
{ {
title: "呼叫转移号", title: '呼叫转移号',
prop: "formernum", prop: 'formernum',
content: "", content: ''
}, },
{ {
title: "姓名", title: '姓名',
prop: "peopleName", prop: 'peopleName',
content: "", content: ''
}, },
{ {
title: "身份证号", title: '身份证号',
prop: "peopleIdcard", prop: 'peopleIdcard',
content: "", content: ''
}, },
{ {
title: "性别", title: '性别',
prop: "peopleSex", prop: 'peopleSex',
content: "", content: ''
}, },
{ {
title: "手机号", title: '手机号',
prop: "peoplePhone", prop: 'peoplePhone',
content: "", content: ''
}, },
{ {
title: "工作人员姓名", title: '工作人员姓名',
prop: "workmanName", prop: 'workmanName',
content: "", content: ''
}, },
{ {
title: "工作人员工号", title: '工作人员工号',
prop: "workmanNumber", prop: 'workmanNumber',
content: "", content: ''
}, },
{ {
title: "取号时间", title: '取号时间',
prop: "taketime", prop: 'taketime',
content: "", content: ''
}, },
{ {
title: "叫号时间", title: '叫号时间',
prop: "calltime", prop: 'calltime',
content: "", content: ''
}, },
{ {
title: "结束时间", title: '结束时间',
prop: "endtime", prop: 'endtime',
content: "", content: ''
}, },
{ {
title: "等待时间", title: '等待时间',
prop: "waitTime", prop: 'waitTime',
content: "", content: ''
}, },
{ {
title: "办理时间", title: '办理时间',
prop: "handleTime", prop: 'handleTime',
content: "", content: ''
}, },
{ {
title: "取号设备类型", title: '取号设备类型',
prop: "deviceType", prop: 'deviceType',
content: "", content: ''
}, },
{ {
title: "取号设备名称", title: '取号设备名称',
prop: "deviceName", prop: 'deviceName',
content: "", content: ''
}, },
{ {
title: "呼叫设备", title: '呼叫设备',
prop: "callName", prop: 'callName',
content: "", content: ''
}, },
{ {
title: "事项名称", title: '事项名称',
prop: "matterName", prop: 'matterName',
content: "", content: ''
}, },
{ {
title: "排号队列ID，唯一", title: '排号队列ID，唯一',
prop: "queueid", prop: 'queueid',
content: "", content: ''
}, },
{ {
title: "大厅名称", title: '大厅名称',
prop: "hallName", prop: 'hallName',
content: "测试", content: '测试'
}, },
{ {
title: "站点ID", title: '站点ID',
prop: "siteId", prop: 'siteId',
content: "", content: ''
}, },
{ {
title: "站点编码", title: '站点编码',
prop: "siteCode", prop: 'siteCode',
content: "", content: ''
}, },
{ {
title: "站点名称", title: '站点名称',
prop: "siteName", prop: 'siteName',
content: "", content: ''
}, },
{ {
title: "扩展编号", title: '扩展编号',
prop: "extNum", prop: 'extNum',
content: "", content: ''
}, }
], ]
}; };
}, },
computed: { computed: {
...@@ -189,17 +175,17 @@ export default { ...@@ -189,17 +175,17 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, },
dataInfo() { dataInfo() {
this.detailsList.forEach((v) => { this.detailsList.forEach((v) => {
v.content = this.info[v.prop]; v.content = this.info[v.prop];
}); });
return this.detailsList; return this.detailsList;
}, }
}, },
methods: {}, methods: {}
}; };
</script> </script>
......
admin_2/src/pages/sso/Sso.vue
View file @ 15017fd2
...@@ -5,35 +5,34 @@ ...@@ -5,35 +5,34 @@
</template> </template>
<script> <script>
import storage from "@/utils/storage"; import storage from '@/utils/storage';
import { mapMutations } from "vuex"; import { mapMutations } from 'vuex';
import { getHomeData } from "@/api/home"; import { getHomeData } from '@/api/home';
import { generateRoutes, filterBtn } from "@/utils"; import { generateRoutes, filterBtn } from '@/utils';
import { calcMenu } from "@/router"; import { calcMenu } from '@/router';
export default { export default {
data() { data() {
return { return {
menuList: [], menuList: []
}; };
}, },
created() { created() {
this.getToken(); this.getToken();
}, },
methods: { methods: {
...mapMutations("user", [ ...mapMutations('user', [
"SET_token", 'SET_token',
"SET_sysName", 'SET_sysName',
"SET_sysLogo", 'SET_sysLogo',
"SET_path", 'SET_path',
"SET_userInfo", 'SET_userInfo',
"SET_permissions", 'SET_permissions',
"SET_routes", 'SET_routes',
"SET_menusList", 'SET_menusList'
]), ]),
// 获取token // 获取token
async getToken() { async getToken() {
let { token, userInfo, siteid, siteName, sysName, sysLogo, path } = let { token, userInfo, siteid, siteName, sysName, sysLogo, path } = this.$route.query;
this.$route.query;
if (token && userInfo) { if (token && userInfo) {
userInfo = JSON.parse(userInfo); userInfo = JSON.parse(userInfo);
this.SET_userInfo(userInfo); this.SET_userInfo(userInfo);
...@@ -41,11 +40,11 @@ export default { ...@@ -41,11 +40,11 @@ export default {
this.SET_sysName(sysName); this.SET_sysName(sysName);
this.SET_sysLogo(sysLogo); this.SET_sysLogo(sysLogo);
this.SET_path(path); this.SET_path(path);
storage.set(2, "siteId", siteid); storage.set(2, 'siteId', siteid);
storage.set(2, "siteName", siteName); storage.set(2, 'siteName', siteName);
await this.getIndixData(); await this.getIndixData();
} else { } else {
this.$message.warning("跳转失败,请重新登录"); this.$message.warning('跳转失败,请重新登录');
setTimeout(() => { setTimeout(() => {
location.href = process.env.VUE_APP_API_portal_URL; location.href = process.env.VUE_APP_API_portal_URL;
}, 2000); }, 2000);
...@@ -67,7 +66,7 @@ export default { ...@@ -67,7 +66,7 @@ export default {
let path = routes[0].path; let path = routes[0].path;
this.$router.push(path); this.$router.push(path);
} else { } else {
this.$message.warning("暂无权限，请联系管理员！"); this.$message.warning('暂无权限，请联系管理员！');
} }
} }
}, },
...@@ -78,8 +77,8 @@ export default { ...@@ -78,8 +77,8 @@ export default {
.filter((v) => v.perms) .filter((v) => v.perms)
.map((v) => v.perms); .map((v) => v.perms);
this.SET_permissions(btnPermissions); this.SET_permissions(btnPermissions);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/System.vue
View file @ 15017fd2
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
export default { export default {
data() { data() {
return { return {
subMenus: [], subMenus: []
}; };
}, },
computed: {}, computed: {},
created() {}, created() {},
methods: {}, methods: {}
}; };
</script> </script>
......
admin_2/src/pages/system/access/Access.vue
View file @ 15017fd2
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<div class="h-full w-full"> <div class="h-full w-full">
<TableHeader> <TableHeader>
<div slot="left"> <div slot="left">
<el-button <el-button size="small" type="primary" v-hasPermi="['system:access:add']" @click="handleAdd"
size="small"
type="primary"
v-hasPermi="['system:access:add']"
@click="handleAdd"
>新增</el-button >新增</el-button
> >
<el-button <el-button
...@@ -30,9 +26,7 @@ ...@@ -30,9 +26,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
...@@ -77,63 +71,57 @@ ...@@ -77,63 +71,57 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import AddAccess from "./components/AddAccess.vue"; import AddAccess from './components/AddAccess.vue';
import AccessSystem from "./components/AccessSystem.vue"; import AccessSystem from './components/AccessSystem.vue';
import { getAccessList, delAccess } from "@/api/system"; import { getAccessList, delAccess } from '@/api/system';
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddAccess, AddAccess,
AccessSystem, AccessSystem
}, },
data() { data() {
return { return {
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "区域名称", label: '区域名称',
prop: "areaName", prop: 'areaName',
align: "center", align: 'center'
}, },
{ {
label: "区域编码", label: '区域编码',
prop: "areaCode", prop: 'areaCode',
align: "center", align: 'center'
}, },
{ {
label: "背景图片", label: '背景图片',
prop: "bigPath", prop: 'bigPath',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return ( return <el-image src={row.bigPath} previewSrcList={[row.bigPath]} class="h-[25px]" />;
<el-image }
src={row.bigPath}
previewSrcList={[row.bigPath]}
class="h-[25px]"
/>
);
},
}, },
{ {
label: "接入系统", label: '接入系统',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (row.accessSystemList && row.accessSystemList.length) { if (row.accessSystemList && row.accessSystemList.length) {
return ( return (
...@@ -144,16 +132,16 @@ export default { ...@@ -144,16 +132,16 @@ export default {
</div> </div>
); );
} }
}, }
}, },
{ {
label: "系统标签", label: '系统标签',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (row.tag) { if (row.tag) {
return ( return (
<div class="flex flex-wrap gap-2"> <div class="flex flex-wrap gap-2">
{row.tag.split(",").map((v) => { {row.tag.split(',').map((v) => {
return ( return (
<el-tag type="info" size="small"> <el-tag type="info" size="small">
{v} {v}
...@@ -163,59 +151,59 @@ export default { ...@@ -163,59 +151,59 @@ export default {
</div> </div>
); );
} }
}, }
}, },
{ {
label: "对接时间", label: '对接时间',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (row.accessTime) { if (row.accessTime) {
return this.$moment(row.accessTime).format("YYYY-MM-DD"); return this.$moment(row.accessTime).format('YYYY-MM-DD');
} }
}, }
}, },
{ {
label: "排序", label: '排序',
prop: "sort", prop: 'sort',
width: "100", width: '100',
align: "center", align: 'center'
}, },
{ {
label: "描述", label: '描述',
prop: "content", prop: 'content',
align: "center", align: 'center',
showOverflowTooltip: true, showOverflowTooltip: true
}, },
{ {
label: "备注", label: '备注',
prop: "remark", prop: 'remark',
align: "center", align: 'center',
showOverflowTooltip: true, showOverflowTooltip: true
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "180", width: '180',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span
v-hasPermi={["system:access:accessSystem"]} v-hasPermi={['system:access:accessSystem']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.accessSystem(row)} onClick={() => this.accessSystem(row)}
> >
接入系统 接入系统
</span> </span>
<span <span
v-hasPermi={["system:access:edit"]} v-hasPermi={['system:access:edit']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.handleEdit(row)} onClick={() => this.handleEdit(row)}
> >
编辑 编辑
</span> </span>
<span <span
v-hasPermi={["system:access:remove"]} v-hasPermi={['system:access:remove']}
class="delete cursor-pointer" class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)} onClick={() => this.handleDel(row.id)}
> >
...@@ -223,11 +211,11 @@ export default { ...@@ -223,11 +211,11 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
areaName: "", areaName: ''
}, },
tableData: [], tableData: [],
page: 1, page: 1,
...@@ -236,11 +224,11 @@ export default { ...@@ -236,11 +224,11 @@ export default {
loading: false, loading: false,
selectRows: [], selectRows: [],
show: false, show: false,
title: "新增", title: '新增',
dict: {}, // 字典 dict: {}, // 字典
systemList: [], systemList: [],
accessShow: false, accessShow: false,
areaInfo: {}, areaInfo: {}
}; };
}, },
created() { created() {
...@@ -254,7 +242,7 @@ export default { ...@@ -254,7 +242,7 @@ export default {
let res = await getAccessList({ let res = await getAccessList({
page: this.page, page: this.page,
size: this.size, size: this.size,
areaName: `%${this.searchForm.areaName}%`, areaName: `%${this.searchForm.areaName}%`
}); });
this.loading = false; this.loading = false;
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -271,23 +259,23 @@ export default { ...@@ -271,23 +259,23 @@ export default {
// 批量移除 // 批量移除
handleDelAll() { handleDelAll() {
if (!this.selectRows.length) { if (!this.selectRows.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectRows.map((v) => v.id).join(","); let ids = this.selectRows.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getAccessList(); this.getAccessList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.getAccessList(); this.getAccessList();
}, },
// 选中 // 选中
...@@ -297,24 +285,24 @@ export default { ...@@ -297,24 +285,24 @@ export default {
// 新增 // 新增
handleAdd() { handleAdd() {
this.title = "新增"; this.title = '新增';
this.$refs.AddAccess.onAdd(); this.$refs.AddAccess.onAdd();
this.show = true; this.show = true;
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {
this.title = "编辑"; this.title = '编辑';
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.$refs.AddAccess.onEdit(data); this.$refs.AddAccess.onEdit(data);
this.show = true; this.show = true;
}, },
// 移除 // 移除
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await delAccess({ id }); let res = await delAccess({ id });
...@@ -322,19 +310,19 @@ export default { ...@@ -322,19 +310,19 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getAccessList(); this.getAccessList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, },
accessSystem(row) { accessSystem(row) {
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.$refs.AccessSystem.onAdd(data); this.$refs.AccessSystem.onAdd(data);
this.accessShow = true; this.accessShow = true;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/access/components/AccessSystem.vue
View file @ 15017fd2
...@@ -8,32 +8,18 @@ ...@@ -8,32 +8,18 @@
<div class="main w-full"> <div class="main w-full">
<el-button size="small" type="primary" @click="addSystem">添加</el-button> <el-button size="small" type="primary" @click="addSystem">添加</el-button>
<el-table :data="accessSystemList" style="width: 100%"> <el-table :data="accessSystemList" style="width: 100%">
<el-table-column type="index" :index="1" label="序号" align="center"> <el-table-column type="index" :index="1" label="序号" align="center"> </el-table-column>
</el-table-column>
<el-table-column prop="systemName" align="center" label="系统名称"> <el-table-column prop="systemName" align="center" label="系统名称">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input size="small" placeholder="请输入" v-model="scope.row.systemName"></el-input>
size="small"
placeholder="请输入"
v-model="scope.row.systemName"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="systemCode" align="center" label="系统编码"> <el-table-column prop="systemCode" align="center" label="系统编码">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input size="small" placeholder="请输入" v-model="scope.row.systemCode"></el-input>
size="small"
placeholder="请输入"
v-model="scope.row.systemCode"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="accessTime" align="center" label="接入日期" width="220">
prop="accessTime"
align="center"
label="接入日期"
width="220"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
style="width: 150px" style="width: 150px"
...@@ -46,18 +32,9 @@ ...@@ -46,18 +32,9 @@
</el-date-picker> </el-date-picker>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column width="80" align="center" prop="enabled" label="启\停用">
width="80"
align="center"
prop="enabled"
label="启\停用"
>
<template slot-scope="scope"> <template slot-scope="scope">
<YSwitch <YSwitch active-text="启用" inactive-text="停用" v-model="scope.row.enabled"></YSwitch>
active-text="启用"
inactive-text="停用"
v-model="scope.row.enabled"
></YSwitch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="60" prop="enabled" label="删除"> <el-table-column align="center" width="60" prop="enabled" label="删除">
...@@ -73,42 +50,36 @@ ...@@ -73,42 +50,36 @@
<div class="footer"> <div class="footer">
<el-button size="small" @click="handleClose">取 消</el-button> <el-button size="small" @click="handleClose">取 消</el-button>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
<el-button <el-button size="small" type="primary" :loading="loading" @click="handleOk">确 定</el-button>
size="small"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button
>
</div> </div>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import { saveAccess, deleteSystem } from "@/api/system"; import { saveAccess, deleteSystem } from '@/api/system';
export default { export default {
props: { props: {
show: { show: {
type: Boolean, type: Boolean,
default: false, default: false
}, },
systemList: { systemList: {
required: true, required: true,
type: Array, type: Array,
default: () => [], default: () => []
}, }
}, },
data() { data() {
return { return {
loading: false, loading: false,
form: { form: {
systemName: "", systemName: '',
systemCode: "", systemCode: '',
accessTime: "", accessTime: '',
enabled: 1, enabled: 1
}, },
accessSystemList: [], accessSystemList: [],
areaInfo: {}, areaInfo: {}
}; };
}, },
computed: { computed: {
...@@ -117,9 +88,9 @@ export default { ...@@ -117,9 +88,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
...@@ -128,11 +99,11 @@ export default { ...@@ -128,11 +99,11 @@ export default {
this.accessSystemList.push(row); this.accessSystemList.push(row);
}, },
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.drawer = false; this.drawer = false;
}, },
handleReset() { handleReset() {
this.$resetForm("form"); this.$resetForm('form');
this.drawer = false; this.drawer = false;
}, },
...@@ -150,7 +121,7 @@ export default { ...@@ -150,7 +121,7 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -163,8 +134,8 @@ export default { ...@@ -163,8 +134,8 @@ export default {
} }
} }
this.accessSystemList.splice($index, 1); this.accessSystemList.splice($index, 1);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/access/components/AddAccess.vue
View file @ 15017fd2
...@@ -9,19 +9,9 @@ ...@@ -9,19 +9,9 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" size="medium" label-width="100px">
ref="form"
:model="form"
:rules="rules"
size="medium"
label-width="100px"
>
<el-form-item label="区域" prop="areaName"> <el-form-item label="区域" prop="areaName">
<InputTree <InputTree :treeData="initTree" v-model="form.areaName" @change="changeArea"></InputTree>
:treeData="initTree"
v-model="form.areaName"
@change="changeArea"
></InputTree>
</el-form-item> </el-form-item>
<el-form-item label="系统标签" prop="tag"> <el-form-item label="系统标签" prop="tag">
<div class="flex gap-2"> <div class="flex gap-2">
...@@ -65,11 +55,7 @@ ...@@ -65,11 +55,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input-number <el-input-number v-model="form.sort" controls-position="right" :min="0"></el-input-number>
v-model="form.sort"
controls-position="right"
:min="0"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="描述" prop="content"> <el-form-item label="描述" prop="content">
<el-input <el-input
...@@ -93,11 +79,7 @@ ...@@ -93,11 +79,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" :loading="loading" @click="handleOk"
size="medium"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -106,74 +88,70 @@ ...@@ -106,74 +88,70 @@
</template> </template>
<script> <script>
import { mapState } from "vuex"; import { mapState } from 'vuex';
import { saveAccess } from "@/api/system"; import { saveAccess } from '@/api/system';
import InputTree from "./InputTree.vue"; import InputTree from './InputTree.vue';
export default { export default {
components: { components: {
InputTree, InputTree
}, },
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL, api: process.env.VUE_APP_API_BASE_URL,
loading: false, loading: false,
inputVisible: false, inputVisible: false,
inputValue: "", inputValue: '',
bigPathList: [], bigPathList: [],
form: { form: {
areaName: "", areaName: '',
areaCode: "", areaCode: '',
areaId: "", areaId: '',
siteId: "", siteId: '',
siteCode: "", siteCode: '',
siteName: "", siteName: '',
latitude: "", latitude: '',
longitude: "", longitude: '',
type: "", type: '',
bigPath: "", bigPath: '',
tag: [], tag: [],
sort: 99, sort: 99,
remark: "", remark: '',
icon: "", icon: '',
accessTime: "", // 接入时间 accessTime: '', // 接入时间
content: "", // 内容 content: '', // 内容
accessSystemList: [], accessSystemList: []
}, },
rules: { rules: {
areaName: [ areaName: [{ required: true, message: '请选择区域', trigger: 'change' }],
{ required: true, message: "请选择区域", trigger: "change" }, bigPath: [{ required: true, message: '请上传背景图片', trigger: 'change' }]
], }
bigPath: [
{ required: true, message: "请上传背景图片", trigger: "change" },
],
},
}; };
}, },
computed: { computed: {
...mapState("user", ["areaTree"]), ...mapState('user', ['areaTree']),
Visible: { Visible: {
get() { get() {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, },
initTree() { initTree() {
return this.addAreaNameField(this.areaTree); return this.addAreaNameField(this.areaTree);
}, }
}, },
methods: { methods: {
// 确定 // 确定
...@@ -183,12 +161,12 @@ export default { ...@@ -183,12 +161,12 @@ export default {
this.loading = true; this.loading = true;
let res = await saveAccess({ let res = await saveAccess({
...this.form, ...this.form,
tag: this.form.tag.join(","), tag: this.form.tag.join(',')
}); });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -198,14 +176,14 @@ export default { ...@@ -198,14 +176,14 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
setTimeout(() => { setTimeout(() => {
this.form = row; this.form = row;
if (this.form.tag) { if (this.form.tag) {
this.form.tag = this.form.tag.split(","); this.form.tag = this.form.tag.split(',');
} else { } else {
this.form.tag = []; this.form.tag = [];
} }
...@@ -213,8 +191,8 @@ export default { ...@@ -213,8 +191,8 @@ export default {
this.bigPathList = [ this.bigPathList = [
{ {
name: this.form.bigPath, name: this.form.bigPath,
url: this.form.bigPath, url: this.form.bigPath
}, }
]; ];
} }
}, 10); }, 10);
...@@ -222,33 +200,24 @@ export default { ...@@ -222,33 +200,24 @@ export default {
// 重置 // 重置
handleRest() { handleRest() {
this.bigPathList = []; this.bigPathList = [];
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.bigPathList = []; this.bigPathList = [];
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, },
changeArea(row) { changeArea(row) {
let { let { areaName, areaCode, id, label, siteCode, latitude, longitude, type } = row;
areaName,
areaCode,
id,
label,
siteCode,
latitude,
longitude,
type,
} = row;
this.form.areaId = ""; this.form.areaId = '';
this.form.siteId = ""; this.form.siteId = '';
this.form.siteName = ""; this.form.siteName = '';
if (type === "area") { if (type === 'area') {
this.form.areaId = id; this.form.areaId = id;
} else if (type === "site") { } else if (type === 'site') {
this.form.siteId = id; this.form.siteId = id;
this.form.siteName = label; this.form.siteName = label;
} }
...@@ -280,7 +249,7 @@ export default { ...@@ -280,7 +249,7 @@ export default {
showInput() { showInput() {
if (this.form.tag.length >= 2) { if (this.form.tag.length >= 2) {
this.$message.warning("暂时只能添加两个系统标签"); this.$message.warning('暂时只能添加两个系统标签');
return; return;
} }
this.inputVisible = true; this.inputVisible = true;
...@@ -293,15 +262,15 @@ export default { ...@@ -293,15 +262,15 @@ export default {
let inputValue = this.inputValue; let inputValue = this.inputValue;
if (inputValue) { if (inputValue) {
if (this.form.tag.includes(inputValue)) { if (this.form.tag.includes(inputValue)) {
this.$message.warning("已存在相同标签"); this.$message.warning('已存在相同标签');
return; return;
} }
this.form.tag.push(inputValue); this.form.tag.push(inputValue);
} }
this.inputVisible = false; this.inputVisible = false;
this.inputValue = ""; this.inputValue = '';
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/access/components/InputTree.vue
View file @ 15017fd2
...@@ -23,41 +23,41 @@ ...@@ -23,41 +23,41 @@
<script> <script>
export default { export default {
name: "InputTree", name: 'InputTree',
props: { props: {
treeData: { treeData: {
type: Array, type: Array,
default: () => { default: () => {
return []; return [];
}, }
}, },
value: { value: {
default: "", default: ''
}, },
defaultProps: { defaultProps: {
type: Object, type: Object,
default: () => { default: () => {
return { return {
children: "children", children: 'children',
label: "areaName", label: 'areaName'
}; };
}, }
}, }
}, },
data() { data() {
return {}; return {};
}, },
methods: { methods: {
handleClear() { handleClear() {
this.$emit("input", ""); this.$emit('input', '');
this.$emit("change", {}); this.$emit('change', {});
this.$refs.tree.setCurrentKey(null); this.$refs.tree.setCurrentKey(null);
}, },
handleNodeClick(row) { handleNodeClick(row) {
this.$emit("input", row.areaName); this.$emit('input', row.areaName);
this.$emit("change", row); this.$emit('change', row);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/areaSystem/AreaSystem.vue
View file @ 15017fd2
...@@ -2,12 +2,8 @@ ...@@ -2,12 +2,8 @@
<div class="h-full w-full"> <div class="h-full w-full">
<TableHeader> <TableHeader>
<div slot="left"> <div slot="left">
<el-button size="small" type="primary" @click="handleAdd" <el-button size="small" type="primary" @click="handleAdd">新增</el-button>
>新增</el-button <el-button size="small" type="danger" @click="handleDelAll">批量删除</el-button>
>
<el-button size="small" type="danger" @click="handleDelAll"
>批量删除</el-button
>
</div> </div>
<div slot="right"> <div slot="right">
<el-form ref="searchForm" :model="searchForm" inline> <el-form ref="searchForm" :model="searchForm" inline>
...@@ -22,9 +18,7 @@ ...@@ -22,9 +18,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
...@@ -63,89 +57,83 @@ ...@@ -63,89 +57,83 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import { getSystemList, deleteSystem } from "@/api/system"; import { getSystemList, deleteSystem } from '@/api/system';
import AddAreaSystem from "./components/AddAreaSystem.vue"; import AddAreaSystem from './components/AddAreaSystem.vue';
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddAreaSystem, AddAreaSystem
}, },
data() { data() {
return { return {
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "系统名称", label: '系统名称',
prop: "systemName", prop: 'systemName',
align: "center", align: 'center'
}, },
{ {
label: "系统编码", label: '系统编码',
prop: "systemCode", prop: 'systemCode',
align: "center", align: 'center'
}, },
{ {
label: "创建时间", label: '创建时间',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (row.createTime) { if (row.createTime) {
return this.$moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"); return this.$moment(row.createTime).format('YYYY-MM-DD HH:mm:ss');
} }
}, }
}, },
{ {
label: "排序", label: '排序',
prop: "sort", prop: 'sort',
align: "center", align: 'center'
}, },
{ {
label: "备注", label: '备注',
prop: "remark", prop: 'remark',
align: "center", align: 'center'
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "120", width: '120',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span class="primary cursor-pointer" onClick={() => this.handleEdit(row)}>
class="primary cursor-pointer"
onClick={() => this.handleEdit(row)}
>
编辑 编辑
</span> </span>
<span <span class="delete cursor-pointer" onClick={() => this.handleDel(row.id)}>
class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)}
>
删除 删除
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
systemName: "", systemName: ''
}, },
tableData: [], tableData: [],
page: 1, page: 1,
...@@ -154,8 +142,8 @@ export default { ...@@ -154,8 +142,8 @@ export default {
loading: false, loading: false,
selectRows: [], selectRows: [],
show: false, show: false,
title: "新增", title: '新增',
dict: {}, // 字典 dict: {} // 字典
}; };
}, },
created() { created() {
...@@ -169,7 +157,7 @@ export default { ...@@ -169,7 +157,7 @@ export default {
let res = await getSystemList({ let res = await getSystemList({
page: this.page, page: this.page,
size: this.size, size: this.size,
systemName: `%${this.searchForm.systemName}%`, systemName: `%${this.searchForm.systemName}%`
}); });
this.loading = false; this.loading = false;
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -186,23 +174,23 @@ export default { ...@@ -186,23 +174,23 @@ export default {
// 批量移除 // 批量移除
handleDelAll() { handleDelAll() {
if (!this.selectRows.length) { if (!this.selectRows.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectRows.map((v) => v.id).join(","); let ids = this.selectRows.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getSystemList(); this.getSystemList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.getSystemList(); this.getSystemList();
}, },
// 选中 // 选中
...@@ -212,24 +200,24 @@ export default { ...@@ -212,24 +200,24 @@ export default {
// 新增 // 新增
handleAdd() { handleAdd() {
this.title = "新增"; this.title = '新增';
this.$refs.AddAreaSystem.onAdd(); this.$refs.AddAreaSystem.onAdd();
this.show = true; this.show = true;
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {
this.title = "编辑"; this.title = '编辑';
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.$refs.AddAreaSystem.onEdit(data); this.$refs.AddAreaSystem.onEdit(data);
this.show = true; this.show = true;
}, },
// 移除 // 移除
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await deleteSystem({ id }); let res = await deleteSystem({ id });
...@@ -237,14 +225,14 @@ export default { ...@@ -237,14 +225,14 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getSystemList(); this.getSystemList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/areaSystem/components/AddAreaSystem.vue
View file @ 15017fd2
...@@ -9,31 +9,15 @@ ...@@ -9,31 +9,15 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
ref="form"
:model="form"
:rules="rules"
size="small"
label-width="100px"
>
<el-form-item label="系统名称" prop="systemName"> <el-form-item label="系统名称" prop="systemName">
<el-input <el-input placeholder="请输入系统名称" v-model="form.systemName"></el-input>
placeholder="请输入系统名称"
v-model="form.systemName"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="系统编码" prop="systemCode"> <el-form-item label="系统编码" prop="systemCode">
<el-input <el-input placeholder="请输入系统编码" v-model="form.systemCode"></el-input>
placeholder="请输入系统编码"
v-model="form.systemCode"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="排序" prop="sort"> <el-form-item label="排序" prop="sort">
<el-input-number <el-input-number v-model="form.sort" controls-position="right" :min="0"></el-input-number>
v-model="form.sort"
controls-position="right"
:min="0"
></el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
...@@ -47,11 +31,7 @@ ...@@ -47,11 +31,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="handleRest">重 置</el-button> <el-button size="small" @click="handleRest">重 置</el-button>
<el-button <el-button size="small" type="primary" :loading="loading" @click="handleOk"
size="small"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -60,38 +40,34 @@ ...@@ -60,38 +40,34 @@
</template> </template>
<script> <script>
import { saveSystem } from "@/api/system"; import { saveSystem } from '@/api/system';
export default { export default {
components: {}, components: {},
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
loading: false, loading: false,
form: { form: {
systemName: "", systemName: '',
systemCode: "", systemCode: '',
sort: 99, sort: 99,
remark: "", remark: ''
}, },
rules: { rules: {
systemName: [ systemName: [{ required: true, message: '请输入系统名称', trigger: 'blur' }],
{ required: true, message: "请输入系统名称", trigger: "blur" }, systemCode: [{ required: true, message: '请输入系统编码', trigger: 'blur' }]
], }
systemCode: [
{ required: true, message: "请输入系统编码", trigger: "blur" },
],
},
}; };
}, },
computed: { computed: {
...@@ -100,9 +76,9 @@ export default { ...@@ -100,9 +76,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
// 确定 // 确定
...@@ -114,7 +90,7 @@ export default { ...@@ -114,7 +90,7 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -124,7 +100,7 @@ export default { ...@@ -124,7 +100,7 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
...@@ -134,14 +110,14 @@ export default { ...@@ -134,14 +110,14 @@ export default {
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/menu/Menu.vue
View file @ 15017fd2
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<div class="h-full w-full"> <div class="h-full w-full">
<TableHeader> <TableHeader>
<div slot="left"> <div slot="left">
<el-button <el-button size="small" type="primary" v-hasPermi="['system:menu:add']" @click="handleAdd"
size="small"
type="primary"
v-hasPermi="['system:menu:add']"
@click="handleAdd"
>新增</el-button >新增</el-button
> >
<!-- <el-button size="small" type="danger" @click="handleDelAll" <!-- <el-button size="small" type="danger" @click="handleDelAll"
...@@ -70,19 +66,14 @@ ...@@ -70,19 +66,14 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import AddMenu from "./components/AddMenu.vue"; import AddMenu from './components/AddMenu.vue';
import { import { getMenuList, deleteMenu, saveMenu, changeMenuSort } from '@/api/system';
getMenuList, import { buildTree } from '@/utils';
deleteMenu,
saveMenu,
changeMenuSort,
} from "@/api/system";
import { buildTree } from "@/utils";
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddMenu, AddMenu
}, },
data() { data() {
return { return {
...@@ -109,55 +100,55 @@ export default { ...@@ -109,55 +100,55 @@ export default {
// align: "center", // align: "center",
// }, // },
{ {
label: "菜单名称", label: '菜单名称',
prop: "name", prop: 'name'
// align: "center", // align: "center",
}, },
{ {
label: "ID", label: 'ID',
prop: "id", prop: 'id',
align: "center", align: 'center'
}, },
{ {
label: "图标", label: '图标',
align: "center", align: 'center',
prop: "imgPath", prop: 'imgPath',
formatter: (row) => { formatter: (row) => {
if (row.imgPath) { if (row.imgPath) {
return <i class={row.imgPath}></i>; return <i class={row.imgPath}></i>;
} }
}, }
}, },
{ {
label: "权限类型", label: '权限类型',
prop: "authType", prop: 'authType',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return this.dict.authType[row.authType]; return this.dict.authType[row.authType];
}, }
}, },
{ {
label: "父ID", label: '父ID',
prop: "parentId", prop: 'parentId',
align: "center", align: 'center'
}, },
{ {
label: "地址", label: '地址',
prop: "url", prop: 'url',
align: "center", align: 'center'
}, },
{ {
label: "类型", label: '类型',
prop: "menuType", prop: 'menuType',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return this.dict.menuType[row.menuType]; return this.dict.menuType[row.menuType];
}, }
}, },
{ {
label: "状态", label: '状态',
prop: "status", prop: 'status',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return ( return (
<el-switch <el-switch
...@@ -169,35 +160,35 @@ export default { ...@@ -169,35 +160,35 @@ export default {
}} }}
></el-switch> ></el-switch>
); );
}, }
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "180", width: '180',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex items-center justify-center gap-4"> <div class="flex items-center justify-center gap-4">
<i <i
v-hasPermi={["system:menu:up"]} v-hasPermi={['system:menu:up']}
class="el-icon-top primary cursor-pointer" class="el-icon-top primary cursor-pointer"
onClick={() => this.changeMenuSort(row.id, 0)} onClick={() => this.changeMenuSort(row.id, 0)}
></i> ></i>
<i <i
v-hasPermi={["system:menu:down"]} v-hasPermi={['system:menu:down']}
class="el-icon-bottom primary cursor-pointer" class="el-icon-bottom primary cursor-pointer"
onClick={() => this.changeMenuSort(row.id, 1)} onClick={() => this.changeMenuSort(row.id, 1)}
></i> ></i>
<span <span
v-hasPermi={["system:menu:edit"]} v-hasPermi={['system:menu:edit']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.handleEdit(row)} onClick={() => this.handleEdit(row)}
> >
编辑 编辑
</span> </span>
<span <span
v-hasPermi={["system:menu:remove"]} v-hasPermi={['system:menu:remove']}
class="delete cursor-pointer" class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)} onClick={() => this.handleDel(row.id)}
> >
...@@ -205,11 +196,11 @@ export default { ...@@ -205,11 +196,11 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
name: "", name: ''
}, },
tableData: [], tableData: [],
menuList: [], menuList: [],
...@@ -219,9 +210,9 @@ export default { ...@@ -219,9 +210,9 @@ export default {
loading: false, loading: false,
selectRows: [], selectRows: [],
show: false, show: false,
title: "新增", title: '新增',
dict: {}, // 字典 dict: {}, // 字典
isAllSelected: false, isAllSelected: false
}; };
}, },
created() { created() {
...@@ -235,13 +226,13 @@ export default { ...@@ -235,13 +226,13 @@ export default {
this.menuList = [ this.menuList = [
{ {
id: 0, id: 0,
name: "无", name: '无'
}, }
]; ];
let res = await getMenuList({ let res = await getMenuList({
page: this.page, page: this.page,
size: this.size, size: this.size,
name: `%${this.searchForm.name}%`, name: `%${this.searchForm.name}%`
}); });
this.loading = false; this.loading = false;
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -259,23 +250,23 @@ export default { ...@@ -259,23 +250,23 @@ export default {
// 批量移除 // 批量移除
handleDelAll() { handleDelAll() {
if (!this.selectRows.length) { if (!this.selectRows.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectRows.map((v) => v.id).join(","); let ids = this.selectRows.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getMenuList(); this.getMenuList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.getMenuList(); this.getMenuList();
}, },
// 选中 // 选中
...@@ -285,24 +276,24 @@ export default { ...@@ -285,24 +276,24 @@ export default {
// 新增 // 新增
handleAdd() { handleAdd() {
this.title = "新增"; this.title = '新增';
this.$refs.AddMenu.onAdd(); this.$refs.AddMenu.onAdd();
this.show = true; this.show = true;
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {
this.title = "编辑"; this.title = '编辑';
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.$refs.AddMenu.onEdit(data); this.$refs.AddMenu.onEdit(data);
this.show = true; this.show = true;
}, },
// 移除 // 移除
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await deleteMenu({ id }); let res = await deleteMenu({ id });
...@@ -310,11 +301,11 @@ export default { ...@@ -310,11 +301,11 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getMenuList(); this.getMenuList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, },
async handleStatus(row, status) { async handleStatus(row, status) {
...@@ -330,11 +321,11 @@ export default { ...@@ -330,11 +321,11 @@ export default {
async changeMenuSort(id, type) { async changeMenuSort(id, type) {
let res = await changeMenuSort({ id, type }); let res = await changeMenuSort({ id, type });
if (res.data.code == 1) { if (res.data.code == 1) {
this.$message.success("更改排序成功"); this.$message.success('更改排序成功');
this.getMenuList(); this.getMenuList();
} }
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/menu/components/AddMenu.vue
View file @ 15017fd2
...@@ -9,13 +9,7 @@ ...@@ -9,13 +9,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" size="medium" label-width="130px">
ref="form"
:model="form"
:rules="rules"
size="medium"
label-width="130px"
>
<el-form-item label="父级菜单" prop="parentId"> <el-form-item label="父级菜单" prop="parentId">
<treeselect <treeselect
v-model="form.parentId" v-model="form.parentId"
...@@ -27,36 +21,21 @@ ...@@ -27,36 +21,21 @@
</el-form-item> </el-form-item>
<el-form-item label="菜单类型" prop="menuType"> <el-form-item label="菜单类型" prop="menuType">
<el-radio-group v-model="form.menuType"> <el-radio-group v-model="form.menuType">
<el-radio <el-radio v-for="(item, key) in dict.menuType" :key="key" :label="Number(key)">{{
v-for="(item, key) in dict.menuType" item
:key="key" }}</el-radio>
:label="Number(key)"
>{{ item }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="菜单名称" prop="name"> <el-form-item label="菜单名称" prop="name">
<el-input <el-input placeholder="请输入菜单名称" v-model="form.name" clearable></el-input>
placeholder="请输入菜单名称"
v-model="form.name"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="菜单图标" prop="imgPath" v-if="form.menuType != 2"> <el-form-item label="菜单图标" prop="imgPath" v-if="form.menuType != 2">
<IconSelect v-model="form.imgPath"></IconSelect> <IconSelect v-model="form.imgPath"></IconSelect>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="权限类型" prop="authType" v-if="form.menuType != 2">
label="权限类型" <el-select clearable v-model="form.authType" placeholder="请选择权限类型">
prop="authType"
v-if="form.menuType != 2"
>
<el-select
clearable
v-model="form.authType"
placeholder="请选择权限类型"
>
<el-option <el-option
v-for="(item, key) in dict.authType" v-for="(item, key) in dict.authType"
:key="key" :key="key"
...@@ -73,11 +52,7 @@ ...@@ -73,11 +52,7 @@
</el-tooltip> </el-tooltip>
路由地址 路由地址
</span> </span>
<el-input <el-input clearable placeholder="请输入菜单路由地址" v-model="form.url"></el-input>
clearable
placeholder="请输入菜单路由地址"
v-model="form.url"
></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="component" v-if="form.menuType != 2"> <el-form-item prop="component" v-if="form.menuType != 2">
<span slot="label"> <span slot="label">
...@@ -89,11 +64,7 @@ ...@@ -89,11 +64,7 @@
</el-tooltip> </el-tooltip>
组件路径 组件路径
</span> </span>
<el-input <el-input clearable placeholder="请输入组件路径" v-model="form.component"></el-input>
clearable
placeholder="请输入组件路径"
v-model="form.component"
></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="activeDir" v-if="form.menuType != 2"> <el-form-item prop="activeDir" v-if="form.menuType != 2">
<span slot="label"> <span slot="label">
...@@ -102,57 +73,37 @@ ...@@ -102,57 +73,37 @@
</el-tooltip> </el-tooltip>
激活菜单 激活菜单
</span> </span>
<el-input <el-input clearable placeholder="请输入激活菜单地址" v-model="form.activeDir"></el-input>
clearable
placeholder="请输入激活菜单地址"
v-model="form.activeDir"
></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="perms" v-if="form.menuType == 2"> <el-form-item prop="perms" v-if="form.menuType == 2">
<span slot="label"> <span slot="label">
<el-tooltip <el-tooltip content="控制器中定义的权限字符，如：'system:menu:add'" placement="top">
content="控制器中定义的权限字符，如：'system:menu:add'"
placement="top"
>
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</el-tooltip> </el-tooltip>
权限字符 权限字符
</span> </span>
<el-input <el-input clearable placeholder="请输入权限字符" v-model="form.perms"></el-input>
clearable
placeholder="请输入权限字符"
v-model="form.perms"
></el-input>
</el-form-item> </el-form-item>
<el-row> <el-row>
<el-col :span="12" v-if="form.menuType != 2"> <el-col :span="12" v-if="form.menuType != 2">
<el-form-item prop="visible"> <el-form-item prop="visible">
<span slot="label"> <span slot="label">
<el-tooltip <el-tooltip content="控制路由和子路由是否显示在菜单栏" placement="top">
content="控制路由和子路由是否显示在菜单栏"
placement="top"
>
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</el-tooltip> </el-tooltip>
显示状态 显示状态
</span> </span>
<el-radio-group v-model="form.visible"> <el-radio-group v-model="form.visible">
<el-radio <el-radio v-for="(item, key) in dict.visible" :key="key" :label="Number(key)">{{
v-for="(item, key) in dict.visible" item
:key="key" }}</el-radio>
:label="Number(key)"
>{{ item }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="form.menuType != 2"> <el-col :span="12" v-if="form.menuType != 2">
<el-form-item prop="cache"> <el-form-item prop="cache">
<span slot="label"> <span slot="label">
<el-tooltip <el-tooltip content="选择是则会被`keep-alive`缓存" placement="top">
content="选择是则会被`keep-alive`缓存"
placement="top"
>
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</el-tooltip> </el-tooltip>
是否缓存 是否缓存
...@@ -168,10 +119,7 @@ ...@@ -168,10 +119,7 @@
<el-col :span="12" v-if="form.menuType != 2"> <el-col :span="12" v-if="form.menuType != 2">
<el-form-item prop="hideChildrenInMenu"> <el-form-item prop="hideChildrenInMenu">
<span slot="label"> <span slot="label">
<el-tooltip <el-tooltip content="强制菜单显示为Item而不是SubItem" placement="top">
content="强制菜单显示为Item而不是SubItem"
placement="top"
>
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</el-tooltip> </el-tooltip>
是否隐藏子菜单 是否隐藏子菜单
...@@ -185,12 +133,9 @@ ...@@ -185,12 +133,9 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="菜单状态" prop="status"> <el-form-item label="菜单状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio v-for="(item, key) in dict.status" :key="key" :label="Number(key)">{{
v-for="(item, key) in dict.status" item
:key="key" }}</el-radio>
:label="Number(key)"
>{{ item }}</el-radio
>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -198,11 +143,7 @@ ...@@ -198,11 +143,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" :loading="loading" @click="handleOk"
size="medium"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -211,80 +152,74 @@ ...@@ -211,80 +152,74 @@
</template> </template>
<script> <script>
import { saveMenu } from "@/api/system"; import { saveMenu } from '@/api/system';
import IconSelect from "./IconSelect.vue"; import IconSelect from './IconSelect.vue';
import iconJson from "@/assets/icon.json"; import iconJson from '@/assets/icon.json';
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from '@riophae/vue-treeselect';
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import '@riophae/vue-treeselect/dist/vue-treeselect.css';
export default { export default {
components: { components: {
IconSelect, IconSelect,
Treeselect, Treeselect
}, },
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, },
menuList: { menuList: {
required: true, required: true,
type: Array, type: Array,
default: () => [], default: () => []
}, },
dict: { dict: {
required: true, required: true,
type: Object, type: Object,
default: () => {}, default: () => {}
}, }
}, },
data() { data() {
return { return {
iconJson, iconJson,
loading: false, loading: false,
defaultProps: { defaultProps: {
children: "childList", children: 'childList',
label: "name", label: 'name'
}, },
form: { form: {
name: "", // 菜单名称 name: '', // 菜单名称
url: "", // 路由地址 url: '', // 路由地址
ancestors: "", // 当前激活根目录 ancestors: '', // 当前激活根目录
parentId: 0, // 父菜单ID，一级菜单的该字段值为-1 parentId: 0, // 父菜单ID，一级菜单的该字段值为-1
linkType: 0, // 链接方式 (0.普通，1.弹出，2.脚本) linkType: 0, // 链接方式 (0.普通，1.弹出，2.脚本)
imgPath: "", // 主菜单图标，主菜单图标的css样式名 imgPath: '', // 主菜单图标，主菜单图标的css样式名
buttonImgPath: "", // 按钮图标，按钮图标的css样式名 buttonImgPath: '', // 按钮图标，按钮图标的css样式名
imgCommPath: "", // 常用菜单图标，常用菜单图标的css样式名 imgCommPath: '', // 常用菜单图标，常用菜单图标的css样式名
commMenu: 1, // 是否常用菜单 (0.非常用，1.常用) commMenu: 1, // 是否常用菜单 (0.非常用，1.常用)
component: "", // vue组件路径 component: '', // vue组件路径
menuType: 0, // 菜单类型 (0.目录，1.菜单，2.按钮) menuType: 0, // 菜单类型 (0.目录，1.菜单，2.按钮)
authType: 0, // 权限类型 (0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) authType: 0, // 权限类型 (0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
visible: 0, // 菜单显示状态 (0.显示，1.隐藏) visible: 0, // 菜单显示状态 (0.显示，1.隐藏)
perms: "", // 权限标识，多个逗号分割 perms: '', // 权限标识，多个逗号分割
remark: "", // 备注信息 remark: '', // 备注信息
orderId: "", // 排序编号 orderId: '', // 排序编号
status: 1, // 菜单状态 (0.停用，1.启用) status: 1, // 菜单状态 (0.停用，1.启用)
cache: 0, // 是否缓存 cache: 0, // 是否缓存
activeDir: "", // 激活菜单 activeDir: '', // 激活菜单
hideChildrenInMenu: 1, // 是否隐藏子菜单 hideChildrenInMenu: 1 // 是否隐藏子菜单
}, },
rules: { rules: {
name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }], name: [{ required: true, message: '请输入菜单名称', trigger: 'blur' }],
url: [ url: [{ required: true, message: '请输入菜单访问地址', trigger: 'blur' }],
{ required: true, message: "请输入菜单访问地址", trigger: "blur" }, component: [{ required: true, message: '请输入组件路径', trigger: 'blur' }],
], authType: [{ required: true, message: '请输入选择权限类型', trigger: 'change' }]
component: [ }
{ required: true, message: "请输入组件路径", trigger: "blur" },
],
authType: [
{ required: true, message: "请输入选择权限类型", trigger: "change" },
],
},
}; };
}, },
computed: { computed: {
...@@ -293,9 +228,9 @@ export default { ...@@ -293,9 +228,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
// 确定 // 确定
...@@ -307,7 +242,7 @@ export default { ...@@ -307,7 +242,7 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -317,7 +252,7 @@ export default { ...@@ -317,7 +252,7 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
...@@ -327,11 +262,11 @@ export default { ...@@ -327,11 +262,11 @@ export default {
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, },
/** 转换菜单数据结构 */ /** 转换菜单数据结构 */
...@@ -342,13 +277,13 @@ export default { ...@@ -342,13 +277,13 @@ export default {
return { return {
id: node.id, id: node.id,
label: node.name, label: node.name,
children: node.childList, children: node.childList
}; };
}, },
changeParent(row) { changeParent(row) {
console.log(row); console.log(row);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/menu/components/IconSelect.vue
View file @ 15017fd2
<template> <template>
<el-popover placement="bottom-start" trigger="click" width="100%"> <el-popover placement="bottom-start" trigger="click" width="100%">
<div <div class="content grid max-h-[300px] w-full grid-cols-2 gap-x-4 gap-y-2 overflow-auto">
class="content grid max-h-[300px] w-full grid-cols-2 gap-x-4 gap-y-2 overflow-auto"
>
<div v-for="(v, i) in iconJson" :key="i"> <div v-for="(v, i) in iconJson" :key="i">
<div <div
:class="[ :class="['flex', 'cursor-pointer', 'items-center', 'gap-4', { active: v === value }]"
'flex',
'cursor-pointer',
'items-center',
'gap-4',
{ active: v === value },
]"
@click="handleChange(v)" @click="handleChange(v)"
> >
<i :class="v"></i> <i :class="v"></i>
...@@ -34,32 +26,32 @@ ...@@ -34,32 +26,32 @@
</template> </template>
<script> <script>
import iconJson from "@/assets/icon.json"; import iconJson from '@/assets/icon.json';
export default { export default {
model: { model: {
prop: "value", prop: 'value',
event: "change", event: 'change'
}, },
props: { props: {
value: { value: {
type: String, type: String,
default: "", default: ''
}, },
placeholder: { placeholder: {
type: String, type: String,
default: "点击选择图标", default: '点击选择图标'
}, }
}, },
data() { data() {
return { return {
iconJson, iconJson
}; };
}, },
methods: { methods: {
handleChange(v) { handleChange(v) {
this.$emit("change", v); this.$emit('change', v);
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/parameter/Parameter.vue
View file @ 15017fd2
...@@ -20,11 +20,7 @@ ...@@ -20,11 +20,7 @@
<div slot="right" v-hasPermi="['system:parameter:query']"> <div slot="right" v-hasPermi="['system:parameter:query']">
<el-form ref="searchForm" :model="searchForm" inline> <el-form ref="searchForm" :model="searchForm" inline>
<el-form-item prop="type"> <el-form-item prop="type">
<el-select <el-select size="small" style="width: 150px" v-model="searchForm.type">
size="small"
style="width: 150px"
v-model="searchForm.type"
>
<el-option label="按参数名称" value="name"></el-option> <el-option label="按参数名称" value="name"></el-option>
<el-option label="按二级组织" value="secondOrganize"></el-option> <el-option label="按二级组织" value="secondOrganize"></el-option>
</el-select> </el-select>
...@@ -40,9 +36,7 @@ ...@@ -40,9 +36,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
...@@ -82,63 +76,63 @@ ...@@ -82,63 +76,63 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import AddParameter from "./components/AddParameter.vue"; import AddParameter from './components/AddParameter.vue';
import { getParamList, delParam } from "@/api/system"; import { getParamList, delParam } from '@/api/system';
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddParameter, AddParameter
}, },
data() { data() {
return { return {
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "参数名称", label: '参数名称',
prop: "name", prop: 'name',
align: "center", align: 'center'
}, },
{ {
label: "一级组织", label: '一级组织',
prop: "firstOrganize", prop: 'firstOrganize',
align: "center", align: 'center'
}, },
{ {
label: "二级组织", label: '二级组织',
prop: "secondOrganize", prop: 'secondOrganize',
align: "center", align: 'center'
}, },
{ {
label: "参数键", label: '参数键',
prop: "paramKey", prop: 'paramKey',
align: "center", align: 'center'
}, },
{ {
label: "参数值", label: '参数值',
prop: "paramValue", prop: 'paramValue',
align: "center", align: 'center'
}, },
{ {
label: "参数有效状态", label: '参数有效状态',
prop: "validStatus", prop: 'validStatus',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (this.dict.validStatus) { if (this.dict.validStatus) {
return ( return (
...@@ -147,29 +141,29 @@ export default { ...@@ -147,29 +141,29 @@ export default {
</el-tag> </el-tag>
); );
} }
}, }
}, },
{ {
label: "备注", label: '备注',
prop: "remark", prop: 'remark',
align: "center", align: 'center'
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "120", width: '120',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span
v-hasPermi={["system:parameter:edit"]} v-hasPermi={['system:parameter:edit']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.handleEdit(row)} onClick={() => this.handleEdit(row)}
> >
编辑 编辑
</span> </span>
<span <span
v-hasPermi={["system:parameter:remove"]} v-hasPermi={['system:parameter:remove']}
class="delete cursor-pointer" class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)} onClick={() => this.handleDel(row.id)}
> >
...@@ -177,12 +171,12 @@ export default { ...@@ -177,12 +171,12 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
type: "name", type: 'name',
keyword: "", keyword: ''
}, },
tableData: [], tableData: [],
page: 1, page: 1,
...@@ -191,8 +185,8 @@ export default { ...@@ -191,8 +185,8 @@ export default {
loading: false, loading: false,
selectKeys: [], selectKeys: [],
addVisible: false, addVisible: false,
title: "新增参数", title: '新增参数',
dict: {}, // 字典 dict: {} // 字典
}; };
}, },
created() { created() {
...@@ -204,7 +198,7 @@ export default { ...@@ -204,7 +198,7 @@ export default {
this.loading = true; this.loading = true;
let form = {}; let form = {};
let value = `%${this.searchForm.keyword}%`; let value = `%${this.searchForm.keyword}%`;
if (this.searchForm.type == "name") { if (this.searchForm.type == 'name') {
form.name = value; form.name = value;
} else { } else {
form.secondOrganize = value; form.secondOrganize = value;
...@@ -212,7 +206,7 @@ export default { ...@@ -212,7 +206,7 @@ export default {
let res = await getParamList({ let res = await getParamList({
page: this.page, page: this.page,
size: this.size, size: this.size,
...form, ...form
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
...@@ -230,23 +224,23 @@ export default { ...@@ -230,23 +224,23 @@ export default {
// 批量移除 // 批量移除
handleDelAll() { handleDelAll() {
if (!this.selectKeys.length) { if (!this.selectKeys.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectKeys.map((v) => v.id).join(","); let ids = this.selectKeys.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getParamList(); this.getParamList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.getParamList(); this.getParamList();
}, },
// 选中 // 选中
...@@ -256,23 +250,23 @@ export default { ...@@ -256,23 +250,23 @@ export default {
// 新增 // 新增
handleAdd() { handleAdd() {
this.title = "新增参数"; this.title = '新增参数';
this.$refs.AddParameter.onAdd(); this.$refs.AddParameter.onAdd();
this.addVisible = true; this.addVisible = true;
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {
this.title = "编辑参数"; this.title = '编辑参数';
this.$refs.AddParameter.onEdit(row); this.$refs.AddParameter.onEdit(row);
this.addVisible = true; this.addVisible = true;
}, },
// 移除 // 移除
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await delParam({ id }); let res = await delParam({ id });
...@@ -280,14 +274,14 @@ export default { ...@@ -280,14 +274,14 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getParamList(); this.getParamList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/parameter/components/AddParameter.vue
View file @ 15017fd2
...@@ -9,39 +9,21 @@ ...@@ -9,39 +9,21 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" size="medium" :model="form" :rules="rules" label-width="100px">
ref="form"
size="medium"
:model="form"
:rules="rules"
label-width="100px"
>
<el-form-item label="参数名称" prop="name"> <el-form-item label="参数名称" prop="name">
<el-input v-model="form.name" placeholder="请输入参数名称"></el-input> <el-input v-model="form.name" placeholder="请输入参数名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="一级组织" prop="firstOrganize"> <el-form-item label="一级组织" prop="firstOrganize">
<el-input <el-input v-model="form.firstOrganize" placeholder="请输入一级组织"></el-input>
v-model="form.firstOrganize"
placeholder="请输入一级组织"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="二级组织" prop="secondOrganize"> <el-form-item label="二级组织" prop="secondOrganize">
<el-input <el-input v-model="form.secondOrganize" placeholder="请输入二级组织"></el-input>
v-model="form.secondOrganize"
placeholder="请输入二级组织"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="参数键" prop="paramKey"> <el-form-item label="参数键" prop="paramKey">
<el-input <el-input v-model="form.paramKey" placeholder="请输入参数键"></el-input>
v-model="form.paramKey"
placeholder="请输入参数键"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="参数值" prop="paramValue"> <el-form-item label="参数值" prop="paramValue">
<el-input <el-input v-model="form.paramValue" placeholder="请输入参数值"></el-input>
v-model="form.paramValue"
placeholder="请输入参数值"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="参数修改状态" prop="modStatus"> <el-form-item label="参数修改状态" prop="modStatus">
<el-select v-model="form.modStatus" placeholder="请选择参数有效状态"> <el-select v-model="form.modStatus" placeholder="请选择参数有效状态">
...@@ -67,11 +49,7 @@ ...@@ -67,11 +49,7 @@
</el-form-item> </el-form-item>
<el-form-item label="参数有效状态" prop="validStatus"> <el-form-item label="参数有效状态" prop="validStatus">
<el-radio-group v-model="form.validStatus"> <el-radio-group v-model="form.validStatus">
<el-radio <el-radio v-for="(v, key) in dict.validStatus" :key="key" :label="Number(key)">
v-for="(v, key) in dict.validStatus"
:key="key"
:label="Number(key)"
>
{{ v }} {{ v }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
...@@ -88,11 +66,7 @@ ...@@ -88,11 +66,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" :loading="loading" @click="handleOk"
size="medium"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -101,50 +75,46 @@ ...@@ -101,50 +75,46 @@
</template> </template>
<script> <script>
import { saveParam } from "@/api/system"; import { saveParam } from '@/api/system';
export default { export default {
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, },
dict: { dict: {
type: Object, type: Object,
required: true, required: true,
default: () => { default: () => {
return {}; return {};
}, }
}, }
}, },
data() { data() {
return { return {
loading: false, loading: false,
form: { form: {
name: "", // 参数名称 name: '', // 参数名称
firstOrganize: "", // 一级组织 firstOrganize: '', // 一级组织
secondOrganize: "", // 二级组织 secondOrganize: '', // 二级组织
paramKey: "", // 参数键 paramKey: '', // 参数键
paramValue: "", // 参数值 paramValue: '', // 参数值
modStatus: "", // 参数修改状态 modStatus: '', // 参数修改状态
displayType: "", // 展现类型 displayType: '', // 展现类型
validStatus: 1, // 参数有效状态 validStatus: 1, // 参数有效状态
remark: "", // 备注 remark: '' // 备注
}, },
rules: { rules: {
name: [{ required: true, message: "请输入参数名称", trigger: "blur" }], name: [{ required: true, message: '请输入参数名称', trigger: 'blur' }],
paramKey: [ paramKey: [{ required: true, message: '请输入参数键', trigger: 'blur' }],
{ required: true, message: "请输入参数键", trigger: "blur" }, paramValue: [{ required: true, message: '请输入参数值', trigger: 'blur' }]
], }
paramValue: [
{ required: true, message: "请输入参数值", trigger: "blur" },
],
},
}; };
}, },
computed: { computed: {
...@@ -153,9 +123,9 @@ export default { ...@@ -153,9 +123,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
// 确定 // 确定
...@@ -167,7 +137,7 @@ export default { ...@@ -167,7 +137,7 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -177,7 +147,7 @@ export default { ...@@ -177,7 +147,7 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
...@@ -187,14 +157,14 @@ export default { ...@@ -187,14 +157,14 @@ export default {
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/resourceManage/ResourceManage.vue
View file @ 15017fd2
...@@ -20,11 +20,7 @@ ...@@ -20,11 +20,7 @@
<div slot="right" v-hasPermi="['system:resourcemanage:query']"> <div slot="right" v-hasPermi="['system:resourcemanage:query']">
<el-form ref="searchForm" :model="searchForm" inline> <el-form ref="searchForm" :model="searchForm" inline>
<el-form-item prop="authType"> <el-form-item prop="authType">
<el-select <el-select size="small" style="width: 150px" v-model="searchForm.authType">
size="small"
style="width: 150px"
v-model="searchForm.authType"
>
<el-option label="全部认证类型" value=""></el-option> <el-option label="全部认证类型" value=""></el-option>
<el-option <el-option
v-for="(v, key) in dict.authType" v-for="(v, key) in dict.authType"
...@@ -45,9 +41,7 @@ ...@@ -45,9 +41,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
...@@ -86,55 +80,55 @@ ...@@ -86,55 +80,55 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import { getResourceList, deleteResource } from "@/api/system"; import { getResourceList, deleteResource } from '@/api/system';
import AddResource from "./components/AddResource.vue"; import AddResource from './components/AddResource.vue';
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddResource, AddResource
}, },
data() { data() {
return { return {
loading: false, loading: false,
show: false, show: false,
title: "新增资源", title: '新增资源',
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "所属分组", label: '所属分组',
prop: "groupName", prop: 'groupName',
align: "center", align: 'center'
}, },
{ {
label: "名称", label: '名称',
prop: "name", prop: 'name',
align: "center", align: 'center'
}, },
{ {
label: "资源", label: '资源',
prop: "url", prop: 'url',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (row.url) { if (row.url) {
return row.url.split(",").map((v) => { return row.url.split(',').map((v) => {
return ( return (
<el-tag class="mb-2 mr-2" type="info" size="mini"> <el-tag class="mb-2 mr-2" type="info" size="mini">
{v} {v}
...@@ -142,32 +136,32 @@ export default { ...@@ -142,32 +136,32 @@ export default {
); );
}); });
} }
}, }
}, },
{ {
label: "认证类型", label: '认证类型',
prop: "authType", prop: 'authType',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return this.dict.authType[row.authType]; return this.dict.authType[row.authType];
}, }
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "120", width: '120',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span
v-hasPermi={["system:resourcemanage:edit"]} v-hasPermi={['system:resourcemanage:edit']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.handleEdit(row)} onClick={() => this.handleEdit(row)}
> >
编辑 编辑
</span> </span>
<span <span
v-hasPermi={["system:resourcemanage:remove"]} v-hasPermi={['system:resourcemanage:remove']}
class="delete cursor-pointer" class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)} onClick={() => this.handleDel(row.id)}
> >
...@@ -175,19 +169,19 @@ export default { ...@@ -175,19 +169,19 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
authType: "", authType: '',
name: "", name: ''
}, },
total: 0, total: 0,
size: 10, size: 10,
page: 1, page: 1,
tableData: [], tableData: [],
selectionRows: [], selectionRows: [],
dict: {}, dict: {}
}; };
}, },
created() { created() {
...@@ -201,7 +195,7 @@ export default { ...@@ -201,7 +195,7 @@ export default {
page: this.page, page: this.page,
size: this.size, size: this.size,
...this.searchForm, ...this.searchForm,
name: `%${this.searchForm.name}%`, name: `%${this.searchForm.name}%`
}); });
this.loading = false; this.loading = false;
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -216,7 +210,7 @@ export default { ...@@ -216,7 +210,7 @@ export default {
} }
}, },
handleAdd() { handleAdd() {
this.title = "新增资源"; this.title = '新增资源';
this.$refs.AddResource.onAdd(); this.$refs.AddResource.onAdd();
this.show = true; this.show = true;
}, },
...@@ -225,10 +219,10 @@ export default { ...@@ -225,10 +219,10 @@ export default {
}, },
handleDelAll() { handleDelAll() {
if (!this.selectionRows.length) { if (!this.selectionRows.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectionRows.map((v) => v.id).join(","); let ids = this.selectionRows.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
handleSearch() { handleSearch() {
...@@ -237,23 +231,23 @@ export default { ...@@ -237,23 +231,23 @@ export default {
}, },
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getResourceList(); this.getResourceList();
}, },
handleEdit(row) { handleEdit(row) {
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.title = "编辑资源"; this.title = '编辑资源';
this.$refs.AddResource.onEdit(data); this.$refs.AddResource.onEdit(data);
this.show = true; this.show = true;
}, },
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await deleteResource({ id }); let res = await deleteResource({ id });
...@@ -261,14 +255,14 @@ export default { ...@@ -261,14 +255,14 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getResourceList(); this.getResourceList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/resourceManage/components/AddResource.vue
View file @ 15017fd2
...@@ -9,13 +9,7 @@ ...@@ -9,13 +9,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" size="medium" label-width="100px">
ref="form"
:model="form"
:rules="rules"
size="medium"
label-width="100px"
>
<el-form-item label="资源名称" prop="name"> <el-form-item label="资源名称" prop="name">
<el-input v-model="form.name" placeholder="请输入资源名称"></el-input> <el-input v-model="form.name" placeholder="请输入资源名称"></el-input>
</el-form-item> </el-form-item>
...@@ -35,23 +29,14 @@ ...@@ -35,23 +29,14 @@
v-for="(v, i) in form.urls" v-for="(v, i) in form.urls"
:key="i" :key="i"
:prop="`urls.${i}.value`" :prop="`urls.${i}.value`"
:rules="[ :rules="[{ required: true, validator: validatorUrl, trigger: 'blur' }]"
{ required: true, validator: validatorUrl, trigger: 'blur' },
]"
> >
<el-input <el-input class="mr-[10px]" v-model="v.value" placeholder="请输入链接地址" />
class="mr-[10px]"
v-model="v.value"
placeholder="请输入链接地址"
/>
<div class="flex"> <div class="flex">
<el-button type="primary" @click="changeParams(i, 'add')"> <el-button type="primary" @click="changeParams(i, 'add')">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</el-button> </el-button>
<el-button <el-button type="danger" v-if="i > 0" @click="changeParams(i, 'remove')"
type="danger"
v-if="i > 0"
@click="changeParams(i, 'remove')"
><i class="el-icon-minus"></i ><i class="el-icon-minus"></i
></el-button> ></el-button>
</div> </div>
...@@ -60,11 +45,7 @@ ...@@ -60,11 +45,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" @click="handleOk" :loading="loading"
size="medium"
type="primary"
@click="handleOk"
:loading="loading"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -73,46 +54,44 @@ ...@@ -73,46 +54,44 @@
</template> </template>
<script> <script>
import { saveResource } from "@/api/system"; import { saveResource } from '@/api/system';
export default { export default {
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, },
dict: { dict: {
type: Object, type: Object,
required: true, required: true,
default: () => { default: () => {
return {}; return {};
}, }
}, }
}, },
data() { data() {
return { return {
loading: false, loading: false,
form: { form: {
name: "", name: '',
authType: "", authType: '',
url: "", url: '',
urls: [ urls: [
{ {
value: "", value: ''
}, }
], ]
}, },
rules: { rules: {
name: [{ required: true, message: "请输入资源名称", trigger: "blur" }], name: [{ required: true, message: '请输入资源名称', trigger: 'blur' }],
authType: [ authType: [{ required: true, message: '请选择权限类型', trigger: 'change' }]
{ required: true, message: "请选择权限类型", trigger: "change" }, }
],
},
}; };
}, },
computed: { computed: {
...@@ -121,9 +100,9 @@ export default { ...@@ -121,9 +100,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
created() {}, created() {},
methods: { methods: {
...@@ -134,12 +113,12 @@ export default { ...@@ -134,12 +113,12 @@ export default {
this.loading = true; this.loading = true;
let res = await saveResource({ let res = await saveResource({
...this.form, ...this.form,
url: this.form.urls.map((v) => v.value).join(","), url: this.form.urls.map((v) => v.value).join(',')
}); });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code == 1) { if (code == 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -149,7 +128,7 @@ export default { ...@@ -149,7 +128,7 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
...@@ -157,23 +136,23 @@ export default { ...@@ -157,23 +136,23 @@ export default {
this.form = { ...row }; this.form = { ...row };
let arr = []; let arr = [];
if (this.form.url) { if (this.form.url) {
arr = this.form.url.split(",").map((v) => { arr = this.form.url.split(',').map((v) => {
return { return {
value: v, value: v
}; };
}); });
} }
this.$set(this.form, "urls", arr); this.$set(this.form, 'urls', arr);
}, 10); }, 10);
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
this.$set(this.form, "urls", [{ value: "" }]); this.$set(this.form, 'urls', [{ value: '' }]);
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, },
// 判断是否存在链接 // 判断是否存在链接
...@@ -183,20 +162,20 @@ export default { ...@@ -183,20 +162,20 @@ export default {
// 校验链接地址 // 校验链接地址
validatorUrl(rule, value, callback) { validatorUrl(rule, value, callback) {
if (!value) { if (!value) {
callback(new Error("请输入链接")); callback(new Error('请输入链接'));
} else if (this.isRepeat(value)) { } else if (this.isRepeat(value)) {
callback(new Error("重复的链接地址")); callback(new Error('重复的链接地址'));
} else { } else {
callback(); callback();
} }
}, },
changeParams(index, type) { changeParams(index, type) {
if (type == "add") { if (type == 'add') {
let obj = { let obj = {
value: "", value: ''
}; };
if (this.form.urls.some((v) => !v.value)) { if (this.form.urls.some((v) => !v.value)) {
this.$message.warning("请先完成前面地址的填写"); this.$message.warning('请先完成前面地址的填写');
return; return;
} }
this.form.urls.splice(index + 1, 0, obj); this.form.urls.splice(index + 1, 0, obj);
...@@ -204,8 +183,8 @@ export default { ...@@ -204,8 +183,8 @@ export default {
this.form.urls.splice(index, 1); this.form.urls.splice(index, 1);
} }
// this.$forceUpdate(); // this.$forceUpdate();
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/role/Role.vue
View file @ 15017fd2
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<div class="h-full w-full"> <div class="h-full w-full">
<TableHeader> <TableHeader>
<div slot="left"> <div slot="left">
<el-button <el-button size="small" type="primary" v-hasPermi="['system:role:add']" @click="handleAdd"
size="small"
type="primary"
v-hasPermi="['system:role:add']"
@click="handleAdd"
>新增</el-button >新增</el-button
> >
<el-button <el-button
...@@ -30,9 +26,7 @@ ...@@ -30,9 +26,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
...@@ -61,18 +55,9 @@ ...@@ -61,18 +55,9 @@
@change="getRoleList" @change="getRoleList"
></Pagination> ></Pagination>
<!-- 新增 --> <!-- 新增 -->
<AddRole <AddRole ref="AddRole" :show.sync="show" :title="title" @success="getRoleList"></AddRole>
ref="AddRole"
:show.sync="show"
:title="title"
@success="getRoleList"
></AddRole>
<!-- 分配资源 --> <!-- 分配资源 -->
<ApportionRes <ApportionRes ref="ApportionRes" :show.sync="resShow" @success="getRoleList"></ApportionRes>
ref="ApportionRes"
:show.sync="resShow"
@success="getRoleList"
></ApportionRes>
<!-- 分配菜单 --> <!-- 分配菜单 -->
<ApportionMenu <ApportionMenu
ref="ApportionMenu" ref="ApportionMenu"
...@@ -85,85 +70,85 @@ ...@@ -85,85 +70,85 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import { getRoleList, deleteRole, getMenuTreeselect } from "@/api/system"; import { getRoleList, deleteRole, getMenuTreeselect } from '@/api/system';
import AddRole from "./components/AddRole.vue"; import AddRole from './components/AddRole.vue';
import ApportionRes from "./components/ApportionRes.vue"; import ApportionRes from './components/ApportionRes.vue';
import ApportionMenu from "./components/ApportionMenu.vue"; import ApportionMenu from './components/ApportionMenu.vue';
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddRole, AddRole,
ApportionRes, ApportionRes,
ApportionMenu, ApportionMenu
}, },
data() { data() {
return { return {
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "角色名称", label: '角色名称',
prop: "name", prop: 'name',
align: "center", align: 'center'
}, },
{ {
label: "备注", label: '备注',
prop: "remark", prop: 'remark',
align: "center", align: 'center'
}, },
{ {
label: "创建时间", label: '创建时间',
prop: "createTime", prop: 'createTime',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return this.$moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"); return this.$moment(row.createTime).format('YYYY-MM-DD HH:mm:ss');
}, }
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "260", width: '260',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span
v-hasPermi={["system:role:roleRes"]} v-hasPermi={['system:role:roleRes']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.apportion(row)} onClick={() => this.apportion(row)}
> >
分配资源 分配资源
</span> </span>
<span <span
v-hasPermi={["system:role:roleMenu"]} v-hasPermi={['system:role:roleMenu']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.apportionMenu(row)} onClick={() => this.apportionMenu(row)}
> >
分配菜单 分配菜单
</span> </span>
<span <span
v-hasPermi={["system:role:edit"]} v-hasPermi={['system:role:edit']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.handleEdit(row)} onClick={() => this.handleEdit(row)}
> >
编辑 编辑
</span> </span>
<span <span
v-hasPermi={["system:role:remove"]} v-hasPermi={['system:role:remove']}
class="delete cursor-pointer" class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)} onClick={() => this.handleDel(row.id)}
> >
...@@ -171,11 +156,11 @@ export default { ...@@ -171,11 +156,11 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
name: "", name: ''
}, },
tableData: [], tableData: [],
menuTree: [], // 菜单树 menuTree: [], // 菜单树
...@@ -186,10 +171,10 @@ export default { ...@@ -186,10 +171,10 @@ export default {
selectRows: [], selectRows: [],
show: false, show: false,
menuShow: false, menuShow: false,
title: "新增", title: '新增',
dict: {}, // 字典 dict: {}, // 字典
resShow: false, resShow: false,
roleInfo: {}, roleInfo: {}
}; };
}, },
created() { created() {
...@@ -202,7 +187,7 @@ export default { ...@@ -202,7 +187,7 @@ export default {
async getMenuTreeselect() { async getMenuTreeselect() {
let res = await getMenuTreeselect({ let res = await getMenuTreeselect({
page: 1, page: 1,
size: -1, size: -1
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { result } = res.data.data; let { result } = res.data.data;
...@@ -214,7 +199,7 @@ export default { ...@@ -214,7 +199,7 @@ export default {
let res = await getRoleList({ let res = await getRoleList({
page: this.page, page: this.page,
size: this.size, size: this.size,
name: `%${this.searchForm.name}%`, name: `%${this.searchForm.name}%`
}); });
this.loading = false; this.loading = false;
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -231,23 +216,23 @@ export default { ...@@ -231,23 +216,23 @@ export default {
// 批量移除 // 批量移除
handleDelAll() { handleDelAll() {
if (!this.selectRows.length) { if (!this.selectRows.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectRows.map((v) => v.id).join(","); let ids = this.selectRows.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getRoleList(); this.getRoleList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.getRoleList(); this.getRoleList();
}, },
// 选中 // 选中
...@@ -257,24 +242,24 @@ export default { ...@@ -257,24 +242,24 @@ export default {
// 新增 // 新增
handleAdd() { handleAdd() {
this.title = "新增"; this.title = '新增';
this.$refs.AddRole.onAdd(); this.$refs.AddRole.onAdd();
this.show = true; this.show = true;
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {
this.title = "编辑"; this.title = '编辑';
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.$refs.AddRole.onEdit(data); this.$refs.AddRole.onEdit(data);
this.show = true; this.show = true;
}, },
// 移除 // 移除
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await deleteRole({ id }); let res = await deleteRole({ id });
...@@ -282,11 +267,11 @@ export default { ...@@ -282,11 +267,11 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getRoleList(); this.getRoleList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, },
// 分配资源 // 分配资源
...@@ -299,8 +284,8 @@ export default { ...@@ -299,8 +284,8 @@ export default {
this.roleInfo = row; this.roleInfo = row;
this.$refs.ApportionMenu.onAdd(row); this.$refs.ApportionMenu.onAdd(row);
this.menuShow = true; this.menuShow = true;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/role/components/AddRole.vue
View file @ 15017fd2
...@@ -9,13 +9,7 @@ ...@@ -9,13 +9,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" size="medium" label-width="100px">
ref="form"
:model="form"
:rules="rules"
size="medium"
label-width="100px"
>
<el-form-item label="角色名称" prop="name"> <el-form-item label="角色名称" prop="name">
<el-input placeholder="请输入角色名称" v-model="form.name"></el-input> <el-input placeholder="请输入角色名称" v-model="form.name"></el-input>
</el-form-item> </el-form-item>
...@@ -31,11 +25,7 @@ ...@@ -31,11 +25,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" :loading="loading" @click="handleOk"
size="medium"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -44,31 +34,31 @@ ...@@ -44,31 +34,31 @@
</template> </template>
<script> <script>
import { addRole } from "@/api/system"; import { addRole } from '@/api/system';
export default { export default {
components: {}, components: {},
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
loading: false, loading: false,
form: { form: {
name: "", name: '',
remark: "", remark: ''
}, },
rules: { rules: {
name: [{ required: true, message: "请输入角色名称", trigger: "blur" }], name: [{ required: true, message: '请输入角色名称', trigger: 'blur' }]
}, }
}; };
}, },
computed: { computed: {
...@@ -77,9 +67,9 @@ export default { ...@@ -77,9 +67,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
// 确定 // 确定
...@@ -91,7 +81,7 @@ export default { ...@@ -91,7 +81,7 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -101,7 +91,7 @@ export default { ...@@ -101,7 +91,7 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
...@@ -111,14 +101,14 @@ export default { ...@@ -111,14 +101,14 @@ export default {
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/role/components/ApportionMenu.vue
View file @ 15017fd2
...@@ -14,9 +14,7 @@ ...@@ -14,9 +14,7 @@
<el-input readonly :value="roleInfo.name"></el-input> <el-input readonly :value="roleInfo.name"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="菜单权限"> <el-form-item label="菜单权限">
<el-checkbox v-model="isExpand" @change="handleCheckedTreeExpand" <el-checkbox v-model="isExpand" @change="handleCheckedTreeExpand">展开/折叠</el-checkbox>
>展开/折叠</el-checkbox
>
<el-checkbox v-model="isNodeAll" @change="handleCheckedTreeNodeAll" <el-checkbox v-model="isNodeAll" @change="handleCheckedTreeNodeAll"
>全选/全不选</el-checkbox >全选/全不选</el-checkbox
> >
...@@ -35,11 +33,7 @@ ...@@ -35,11 +33,7 @@
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" :loading="loading" type="primary" @click="handleOk"
size="medium"
:loading="loading"
type="primary"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -48,25 +42,25 @@ ...@@ -48,25 +42,25 @@
</template> </template>
<script> <script>
import { addRoleMenu, getRoleMenuList } from "@/api/system"; import { addRoleMenu, getRoleMenuList } from '@/api/system';
export default { export default {
components: {}, components: {},
props: { props: {
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, },
roleInfo: { roleInfo: {
type: Object, type: Object,
required: true, required: true,
default: () => {}, default: () => {}
}, },
menuTree: { menuTree: {
type: Array, type: Array,
required: true, required: true,
default: () => [], default: () => []
}, }
}, },
data() { data() {
return { return {
...@@ -77,13 +71,13 @@ export default { ...@@ -77,13 +71,13 @@ export default {
isNodeAll: false, isNodeAll: false,
checkStrictly: true, checkStrictly: true,
defaultProps: { defaultProps: {
label: "label", label: 'label',
children: "children", children: 'children'
}, },
form: { form: {
menuIdList: [], menuIdList: [],
roleId: "", roleId: ''
}, }
}; };
}, },
computed: { computed: {
...@@ -92,9 +86,9 @@ export default { ...@@ -92,9 +86,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
// 获取角色菜单列表 // 获取角色菜单列表
...@@ -102,7 +96,7 @@ export default { ...@@ -102,7 +96,7 @@ export default {
let res = await getRoleMenuList({ let res = await getRoleMenuList({
roleId: this.form.roleId, roleId: this.form.roleId,
page: 1, page: 1,
size: -1, size: -1
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data; let { data } = res.data;
...@@ -119,12 +113,12 @@ export default { ...@@ -119,12 +113,12 @@ export default {
this.loading = true; this.loading = true;
let res = await addRoleMenu({ let res = await addRoleMenu({
roleId: this.form.roleId, roleId: this.form.roleId,
menuIdList: this.getMenuAllCheckedKeys(), menuIdList: this.getMenuAllCheckedKeys()
}); });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg || "添加成功"); this.$message.success(msg || '添加成功');
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -178,8 +172,8 @@ export default { ...@@ -178,8 +172,8 @@ export default {
}; };
getData(data); getData(data);
return result; return result;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/role/components/ApportionRes.vue
View file @ 15017fd2
...@@ -19,10 +19,7 @@ ...@@ -19,10 +19,7 @@
>全选</el-checkbox >全选</el-checkbox
> >
</div> </div>
<el-checkbox-group <el-checkbox-group v-model="form.resourceIdList" @change="onChange($event, v)">
v-model="form.resourceIdList"
@change="onChange($event, v)"
>
<el-row> <el-row>
<el-col :span="6" v-for="item in v.list" :key="item.id"> <el-col :span="6" v-for="item in v.list" :key="item.id">
<el-checkbox :label="item.id">{{ item.name }}</el-checkbox> <el-checkbox :label="item.id">{{ item.name }}</el-checkbox>
...@@ -32,11 +29,7 @@ ...@@ -32,11 +29,7 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" :loading="loading" @click="handleOk"
size="medium"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -45,19 +38,15 @@ ...@@ -45,19 +38,15 @@
</template> </template>
<script> <script>
import { import { getRoleResourceList, addRoleResource, getResourceGroup } from '@/api/system';
getRoleResourceList,
addRoleResource,
getResourceGroup,
} from "@/api/system";
export default { export default {
components: {}, components: {},
props: { props: {
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
...@@ -66,8 +55,8 @@ export default { ...@@ -66,8 +55,8 @@ export default {
userResourceList: [], // 用户资源列表 userResourceList: [], // 用户资源列表
form: { form: {
resourceIdList: [], resourceIdList: [],
roleId: "", roleId: ''
}, }
}; };
}, },
computed: { computed: {
...@@ -76,16 +65,16 @@ export default { ...@@ -76,16 +65,16 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
methods: { methods: {
// 获取资源分组 // 获取资源分组
async getResourceGroup() { async getResourceGroup() {
let res = await getResourceGroup({ let res = await getResourceGroup({
page: 1, page: 1,
size: -1, size: -1
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -99,7 +88,7 @@ export default { ...@@ -99,7 +88,7 @@ export default {
let res = await getRoleResourceList({ let res = await getRoleResourceList({
size: -1, size: -1,
page: 1, page: 1,
roleId, roleId
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -131,7 +120,7 @@ export default { ...@@ -131,7 +120,7 @@ export default {
group[key] = { group[key] = {
isIndeterminate: false, isIndeterminate: false,
checkAll: false, checkAll: false,
list: [], list: []
}; };
group[key].list.push(...data[key]); group[key].list.push(...data[key]);
}); });
...@@ -144,8 +133,8 @@ export default { ...@@ -144,8 +133,8 @@ export default {
let res = await addRoleResource(this.form); let res = await addRoleResource(this.form);
let { code } = res.data; let { code } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success("添加成功"); this.$message.success('添加成功');
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -175,9 +164,7 @@ export default { ...@@ -175,9 +164,7 @@ export default {
let rowIds = row.list.map((v) => v.id); let rowIds = row.list.map((v) => v.id);
row.isIndeterminate = false; row.isIndeterminate = false;
if (checked) { if (checked) {
this.form.resourceIdList = [ this.form.resourceIdList = [...new Set([...this.form.resourceIdList, ...rowIds])];
...new Set([...this.form.resourceIdList, ...rowIds]),
];
} else { } else {
this.form.resourceIdList = this.form.resourceIdList.filter((v) => { this.form.resourceIdList = this.form.resourceIdList.filter((v) => {
return !rowIds.includes(v); return !rowIds.includes(v);
...@@ -191,8 +178,8 @@ export default { ...@@ -191,8 +178,8 @@ export default {
}); });
row.isIndeterminate = !!list.length && list.length < rowIds.length; row.isIndeterminate = !!list.length && list.length < rowIds.length;
row.checkAll = list.length === rowIds.length; row.checkAll = list.length === rowIds.length;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/systemlogs/SystemLogs.vue
View file @ 15017fd2
...@@ -10,9 +10,7 @@ ...@@ -10,9 +10,7 @@
placeholder="请输入请求地址搜索" placeholder="请输入请求地址搜索"
@keyup.native.enter="handleSearch" @keyup.native.enter="handleSearch"
></el-input> ></el-input>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
</div> </div>
</TableHeader> </TableHeader>
...@@ -39,67 +37,67 @@ ...@@ -39,67 +37,67 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import { getlogsList } from "@/api/system"; import { getlogsList } from '@/api/system';
export default { export default {
components: { components: {
TableHeader, TableHeader
}, },
data() { data() {
return { return {
column: [ column: [
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "用户名称", label: '用户名称',
prop: "userName", prop: 'userName',
align: "center", align: 'center'
}, },
{ {
label: "登录名称", label: '登录名称',
prop: "loginName", prop: 'loginName',
align: "center", align: 'center'
}, },
{ {
label: "请求地址", label: '请求地址',
prop: "requestUrl", prop: 'requestUrl',
align: "center", align: 'center'
}, },
{ {
label: "操作内容", label: '操作内容',
prop: "content", prop: 'content',
align: "center", align: 'center'
}, },
{ {
label: "操作IP地址", label: '操作IP地址',
prop: "ip", prop: 'ip',
align: "center", align: 'center'
}, },
{ {
label: "操作时间", label: '操作时间',
prop: "logDate", prop: 'logDate',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return this.$moment(row.logDate).format("YYYY-MM-DD HH:mm:ss"); return this.$moment(row.logDate).format('YYYY-MM-DD HH:mm:ss');
}, }
}, }
], ],
searchVal: "", searchVal: '',
tableData: [], tableData: [],
page: 1, page: 1,
size: 10, size: 10,
total: 10, total: 10,
loading: false, loading: false,
selectKeys: [], selectKeys: [],
dict: {}, // 字典 dict: {} // 字典
}; };
}, },
created() { created() {
...@@ -113,7 +111,7 @@ export default { ...@@ -113,7 +111,7 @@ export default {
let res = await getlogsList({ let res = await getlogsList({
page: this.page, page: this.page,
size: this.size, size: this.size,
requestUrl: `%${this.searchVal}%`, requestUrl: `%${this.searchVal}%`
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
...@@ -131,17 +129,17 @@ export default { ...@@ -131,17 +129,17 @@ export default {
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getlogsList(); this.getlogsList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.searchVal = ""; this.searchVal = '';
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getlogsList(); this.getlogsList();
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/task/TaskSet.vue
View file @ 15017fd2
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<div class="task-set h-ull w-full"> <div class="task-set h-ull w-full">
<TableHeader> <TableHeader>
<div slot="left"> <div slot="left">
<el-button <el-button size="small" type="primary" v-hasPermi="['system:task:add']" @click="handleAdd"
size="small"
type="primary"
v-hasPermi="['system:task:add']"
@click="handleAdd"
>新增任务</el-button >新增任务</el-button
> >
<el-button <el-button
...@@ -26,9 +22,7 @@ ...@@ -26,9 +22,7 @@
placeholder="请输入任务名称搜索" placeholder="请输入任务名称搜索"
@keyup.native.enter="handleSearch" @keyup.native.enter="handleSearch"
></el-input> ></el-input>
<el-button size="small" type="primary" @click="handleSearch" <el-button size="small" type="primary" @click="handleSearch">搜 索</el-button>
>搜 索</el-button
>
<el-button size="small" @click="handleReset">重 置</el-button> <el-button size="small" @click="handleReset">重 置</el-button>
</div> </div>
</TableHeader> </TableHeader>
...@@ -64,100 +58,100 @@ ...@@ -64,100 +58,100 @@
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import AddTask from "./components/AddTask.vue"; import AddTask from './components/AddTask.vue';
import { getTaskList, delTask } from "@/api/system"; import { getTaskList, delTask } from '@/api/system';
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddTask, AddTask
}, },
data() { data() {
return { return {
column: [ column: [
{ {
label: "全选", label: '全选',
type: "selection", type: 'selection',
width: "55", width: '55',
align: "center", align: 'center',
reserveSelection: true, reserveSelection: true
}, },
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "任务名称", label: '任务名称',
prop: "name", prop: 'name',
align: "center", align: 'center'
}, },
{ {
label: "执行主机", label: '执行主机',
prop: "excuteHost", prop: 'excuteHost',
align: "center", align: 'center'
}, },
{ {
label: "执行关键字", label: '执行关键字',
prop: "taskKey", prop: 'taskKey',
align: "center", align: 'center'
}, },
{ {
label: "执行策略", label: '执行策略',
prop: "excuteStrategy", prop: 'excuteStrategy',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return ( return (
<el-tag size="small" type="info"> <el-tag size="small" type="info">
{this.dict.excuteStrategy[row.excuteStrategy]} {this.dict.excuteStrategy[row.excuteStrategy]}
</el-tag> </el-tag>
); );
}, }
}, },
{ {
label: "最后执行主机", label: '最后执行主机',
prop: "lastExcuteHost", prop: 'lastExcuteHost',
align: "center", align: 'center'
}, },
{ {
label: "最后执行时间", label: '最后执行时间',
prop: "lastExcuteTime", prop: 'lastExcuteTime',
align: "center", align: 'center'
}, },
{ {
label: "任务状态", label: '任务状态',
prop: "status", prop: 'status',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return ( return (
<el-tag size="small" type="info"> <el-tag size="small" type="info">
{this.dict.status[row.status]} {this.dict.status[row.status]}
</el-tag> </el-tag>
); );
}, }
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "120", width: '120',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span
v-hasPermi={["system:task:edit"]} v-hasPermi={['system:task:edit']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.handleEdit(row)} onClick={() => this.handleEdit(row)}
> >
编辑 编辑
</span> </span>
<span <span
v-hasPermi={["system:task:remove"]} v-hasPermi={['system:task:remove']}
class="delete cursor-pointer" class="delete cursor-pointer"
onClick={() => this.handleDel(row.id)} onClick={() => this.handleDel(row.id)}
> >
...@@ -165,10 +159,10 @@ export default { ...@@ -165,10 +159,10 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchVal: "", searchVal: '',
tableData: [], tableData: [],
page: 1, page: 1,
size: 10, size: 10,
...@@ -176,8 +170,8 @@ export default { ...@@ -176,8 +170,8 @@ export default {
loading: false, loading: false,
selectKeys: [], selectKeys: [],
addVisible: false, addVisible: false,
title: "新增参数", title: '新增参数',
dict: {}, // 字典 dict: {} // 字典
}; };
}, },
created() { created() {
...@@ -191,7 +185,7 @@ export default { ...@@ -191,7 +185,7 @@ export default {
let res = await getTaskList({ let res = await getTaskList({
page: this.page, page: this.page,
size: this.size, size: this.size,
name: `%${this.searchVal}%`, name: `%${this.searchVal}%`
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data, total, dict } = res.data.data; let { data, total, dict } = res.data.data;
...@@ -209,23 +203,23 @@ export default { ...@@ -209,23 +203,23 @@ export default {
// 批量移除 // 批量移除
handleDelAll() { handleDelAll() {
if (!this.selectKeys.length) { if (!this.selectKeys.length) {
this.$message.warning("请先勾选数据"); this.$message.warning('请先勾选数据');
return; return;
} }
let ids = this.selectKeys.map((v) => v.id).join(","); let ids = this.selectKeys.map((v) => v.id).join(',');
this.handleDel(ids); this.handleDel(ids);
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getTaskList(); this.getTaskList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.searchVal = ""; this.searchVal = '';
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getTaskList(); this.getTaskList();
}, },
// 选中 // 选中
...@@ -234,23 +228,23 @@ export default { ...@@ -234,23 +228,23 @@ export default {
}, },
// 新增 // 新增
handleAdd() { handleAdd() {
this.title = "新增任务"; this.title = '新增任务';
this.$refs.AddTask.onAdd(); this.$refs.AddTask.onAdd();
this.addVisible = true; this.addVisible = true;
}, },
// 编辑 // 编辑
handleEdit(row) { handleEdit(row) {
this.title = "编辑任务"; this.title = '编辑任务';
this.$refs.AddTask.onEdit(row); this.$refs.AddTask.onEdit(row);
this.addVisible = true; this.addVisible = true;
}, },
// 移除 // 移除
handleDel(id) { handleDel(id) {
this.$confirm("此操作将删除所选数据，是否继续？", "系统提示", { this.$confirm('此操作将删除所选数据，是否继续？', '系统提示', {
confirmButtonText: "确定", confirmButtonText: '确定',
cancelButtonText: "取消", cancelButtonText: '取消',
cancelButtonClass: "btn-custom-cancel", cancelButtonClass: 'btn-custom-cancel',
type: "warning", type: 'warning'
}) })
.then(async () => { .then(async () => {
let res = await delTask({ id }); let res = await delTask({ id });
...@@ -258,14 +252,14 @@ export default { ...@@ -258,14 +252,14 @@ export default {
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.getTaskList(); this.getTaskList();
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
} }
}) })
.catch(() => { .catch(() => {
console.log("取消成功！"); console.log('取消成功！');
}); });
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/task/components/AddTask.vue
View file @ 15017fd2
...@@ -9,27 +9,15 @@ ...@@ -9,27 +9,15 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" size="medium" :rules="rules" label-width="100px">
ref="form"
:model="form"
size="medium"
:rules="rules"
label-width="100px"
>
<el-form-item label="任务名称" prop="name"> <el-form-item label="任务名称" prop="name">
<el-input v-model="form.name" placeholder="请输入任务名称"></el-input> <el-input v-model="form.name" placeholder="请输入任务名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关键字" prop="taskKey"> <el-form-item label="关键字" prop="taskKey">
<el-input <el-input v-model="form.taskKey" placeholder="请输入关键字"></el-input>
v-model="form.taskKey"
placeholder="请输入关键字"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="执行服务" prop="excuteService"> <el-form-item label="执行服务" prop="excuteService">
<el-input <el-input v-model="form.excuteService" placeholder="请输入执行服务"></el-input>
v-model="form.excuteService"
placeholder="请输入执行服务"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="执行策略" prop="excuteStrategy"> <el-form-item label="执行策略" prop="excuteStrategy">
<el-select <el-select
...@@ -46,11 +34,7 @@ ...@@ -46,11 +34,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="执行日期" v-if="form.excuteStrategy != 4" prop="excuteDate">
label="执行日期"
v-if="form.excuteStrategy != 4"
prop="excuteDate"
>
<el-input <el-input
disabled disabled
v-if="form.excuteStrategy == 1" v-if="form.excuteStrategy == 1"
...@@ -62,12 +46,7 @@ ...@@ -62,12 +46,7 @@
v-model.number="form.excuteDate" v-model.number="form.excuteDate"
v-else-if="form.excuteStrategy == 2" v-else-if="form.excuteStrategy == 2"
> >
<el-option <el-option v-for="(v, key) in weeks" :key="key" :value="Number(key)" :label="v">
v-for="(v, key) in weeks"
:key="key"
:value="Number(key)"
:label="v"
>
</el-option> </el-option>
</el-select> </el-select>
<el-select <el-select
...@@ -75,12 +54,7 @@ ...@@ -75,12 +54,7 @@
v-else-if="form.excuteStrategy == 3" v-else-if="form.excuteStrategy == 3"
v-model="form.excuteDate" v-model="form.excuteDate"
> >
<el-option <el-option v-for="(v, key) in days" :key="key" :value="Number(key)" :label="v">
v-for="(v, key) in days"
:key="key"
:value="Number(key)"
:label="v"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -99,16 +73,10 @@ ...@@ -99,16 +73,10 @@
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="执行主机" prop="excuteHost"> <el-form-item label="执行主机" prop="excuteHost">
<el-input <el-input v-model="form.excuteHost" placeholder="请输入执行主机"></el-input>
v-model="form.excuteHost"
placeholder="请输入执行主机"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="执行参数" prop="excuteParam"> <el-form-item label="执行参数" prop="excuteParam">
<el-input <el-input v-model="form.excuteParam" placeholder="请输入执行参数"></el-input>
v-model="form.excuteParam"
placeholder="请输入执行参数"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input
...@@ -122,11 +90,7 @@ ...@@ -122,11 +90,7 @@
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button <el-button size="medium" type="primary" :loading="loading" @click="handleOk"
size="medium"
type="primary"
:loading="loading"
@click="handleOk"
>确 定</el-button >确 定</el-button
> >
</span> </span>
...@@ -135,26 +99,26 @@ ...@@ -135,26 +99,26 @@
</template> </template>
<script> <script>
import { saveTask } from "@/api/system"; import { saveTask } from '@/api/system';
export default { export default {
props: { props: {
title: { title: {
type: String, type: String,
required: true, required: true,
default: "", default: ''
}, },
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, },
dict: { dict: {
type: Object, type: Object,
required: true, required: true,
default: () => { default: () => {
return {}; return {};
}, }
}, }
}, },
data() { data() {
return { return {
...@@ -162,25 +126,21 @@ export default { ...@@ -162,25 +126,21 @@ export default {
days: {}, // 号数 days: {}, // 号数
weeks: {}, // 周 weeks: {}, // 周
form: { form: {
name: "", // 任务名称 name: '', // 任务名称
taskKey: "", // 关键字 taskKey: '', // 关键字
excuteService: "", // 执行服务 excuteService: '', // 执行服务
excuteStrategy: 1, // 执行策略 excuteStrategy: 1, // 执行策略
excuteDate: 0, // 执行日期 excuteDate: 0, // 执行日期
excuteTime: "", // 执行时间 excuteTime: '', // 执行时间
excuteHost: "", // 执行主机 excuteHost: '', // 执行主机
excuteParam: "", // 执行参数 excuteParam: '', // 执行参数
remark: "", // 备注 remark: '' // 备注
}, },
rules: { rules: {
name: [{ required: true, message: "请输入参数名称", trigger: "blur" }], name: [{ required: true, message: '请输入参数名称', trigger: 'blur' }],
paramKey: [ paramKey: [{ required: true, message: '请输入参数键', trigger: 'blur' }],
{ required: true, message: "请输入参数键", trigger: "blur" }, paramValue: [{ required: true, message: '请输入参数值', trigger: 'blur' }]
], }
paramValue: [
{ required: true, message: "请输入参数值", trigger: "blur" },
],
},
}; };
}, },
computed: { computed: {
...@@ -189,17 +149,17 @@ export default { ...@@ -189,17 +149,17 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
created() { created() {
for (let i = 1; i <= 31; i++) { for (let i = 1; i <= 31; i++) {
this.days[i] = i + "号"; this.days[i] = i + '号';
} }
let numArr = ["一", "二", "三", "四", "五", "六", "日"]; let numArr = ['一', '二', '三', '四', '五', '六', '日'];
for (let i = 1; i <= 7; i++) { for (let i = 1; i <= 7; i++) {
this.weeks[i] = "星期" + numArr[i - 1]; this.weeks[i] = '星期' + numArr[i - 1];
} }
}, },
methods: { methods: {
...@@ -212,7 +172,7 @@ export default { ...@@ -212,7 +172,7 @@ export default {
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -222,7 +182,7 @@ export default { ...@@ -222,7 +182,7 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
...@@ -232,11 +192,11 @@ export default { ...@@ -232,11 +192,11 @@ export default {
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, },
// 切换策略 // 切换策略
...@@ -244,13 +204,13 @@ export default { ...@@ -244,13 +204,13 @@ export default {
if (val == 1) { if (val == 1) {
this.form.excuteDate = 0; this.form.excuteDate = 0;
} else { } else {
this.form.excuteDate = ""; this.form.excuteDate = '';
} }
if (val == 4) { if (val == 4) {
this.form.excuteTime = ""; this.form.excuteTime = '';
} }
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/user/User.vue
View file @ 15017fd2
...@@ -4,17 +4,8 @@ ...@@ -4,17 +4,8 @@
<div slot="right" v-hasPermi="['system:user:query']"> <div slot="right" v-hasPermi="['system:user:query']">
<el-form ref="searchForm" :model="searchForm" inline size="small"> <el-form ref="searchForm" :model="searchForm" inline size="small">
<el-form-item prop="type"> <el-form-item prop="type">
<el-select <el-select style="width: 120px" v-model="searchForm.type" placeholder="请选择">
style="width: 120px" <el-option v-for="(v, key) in typeList" :key="key" :label="v" :value="key">
v-model="searchForm.type"
placeholder="请选择"
>
<el-option
v-for="(v, key) in typeList"
:key="key"
:label="v"
:value="key"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -57,65 +48,61 @@ ...@@ -57,65 +48,61 @@
></Pagination> ></Pagination>
<!-- 分配角色 --> <!-- 分配角色 -->
<AddUserRole <AddUserRole ref="AddUserRole" :show.sync="show" @success="getUserList"></AddUserRole>
ref="AddUserRole"
:show.sync="show"
@success="getUserList"
></AddUserRole>
</div> </div>
</template> </template>
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from '@/components/TableHeader.vue';
import AddUserRole from "./components/AddUserRole.vue"; import AddUserRole from './components/AddUserRole.vue';
import { getUserList } from "@/api/system"; import { getUserList } from '@/api/system';
let typeList = { let typeList = {
loginName: "按登录名", loginName: '按登录名',
realName: "按用户姓名", realName: '按用户姓名',
mobile: "按手机号码", mobile: '按手机号码'
}; };
export default { export default {
components: { components: {
TableHeader, TableHeader,
AddUserRole, AddUserRole
}, },
data() { data() {
return { return {
typeList, typeList,
column: [ column: [
{ {
label: "序号", label: '序号',
type: "index", type: 'index',
width: "55", width: '55',
align: "center", align: 'center',
index: (index) => { index: (index) => {
return (this.page - 1) * this.size + index + 1; return (this.page - 1) * this.size + index + 1;
}, }
}, },
{ {
label: "登录名", label: '登录名',
prop: "loginName", prop: 'loginName',
align: "center", align: 'center'
}, },
{ {
label: "用户姓名", label: '用户姓名',
prop: "realName", prop: 'realName',
align: "center", align: 'center'
}, },
{ {
label: "手机号码", label: '手机号码',
prop: "mobile", prop: 'mobile',
align: "center", align: 'center'
}, },
{ {
label: "所属角色", label: '所属角色',
prop: "roleIds", prop: 'roleIds',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (row.roleIds) { if (row.roleIds) {
return ( return (
<div class="flex justify-center gap-2"> <div class="flex justify-center gap-2">
{row.roleIds.split(",").map((v) => { {row.roleIds.split(',').map((v) => {
return ( return (
<el-tag size="small" type="info"> <el-tag size="small" type="info">
{this.dict.roleIds[v]} {this.dict.roleIds[v]}
...@@ -125,35 +112,35 @@ export default { ...@@ -125,35 +112,35 @@ export default {
</div> </div>
); );
} }
}, }
}, },
{ {
label: "状态", label: '状态',
prop: "status", prop: 'status',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
if (this.dict.status) { if (this.dict.status) {
return this.dict.status[row.status]; return this.dict.status[row.status];
} }
}, }
}, },
{ {
label: "创建时间", label: '创建时间',
prop: "createTime", prop: 'createTime',
align: "center", align: 'center',
formatter: (row) => { formatter: (row) => {
return this.$moment(row.createTime).format("YYYY-MM-DD HH:mm:ss"); return this.$moment(row.createTime).format('YYYY-MM-DD HH:mm:ss');
}, }
}, },
{ {
label: "操作", label: '操作',
align: "center", align: 'center',
width: "120", width: '120',
formatter: (row) => { formatter: (row) => {
return ( return (
<div class="flex justify-center gap-4"> <div class="flex justify-center gap-4">
<span <span
v-hasPermi={["system:user:userRole"]} v-hasPermi={['system:user:userRole']}
class="primary cursor-pointer" class="primary cursor-pointer"
onClick={() => this.apportion(row)} onClick={() => this.apportion(row)}
> >
...@@ -161,12 +148,12 @@ export default { ...@@ -161,12 +148,12 @@ export default {
</span> </span>
</div> </div>
); );
}, }
}, }
], ],
searchForm: { searchForm: {
type: "loginName", type: 'loginName',
keyword: "", keyword: ''
}, },
tableData: [], tableData: [],
page: 1, page: 1,
...@@ -175,9 +162,9 @@ export default { ...@@ -175,9 +162,9 @@ export default {
loading: false, loading: false,
selectRows: [], selectRows: [],
show: false, show: false,
title: "新增", title: '新增',
dict: {}, // 字典 dict: {}, // 字典
resShow: false, resShow: false
}; };
}, },
created() { created() {
...@@ -194,7 +181,7 @@ export default { ...@@ -194,7 +181,7 @@ export default {
let res = await getUserList({ let res = await getUserList({
page: this.page, page: this.page,
size: this.size, size: this.size,
...obj, ...obj
}); });
this.loading = false; this.loading = false;
if (res.data.code == 1) { if (res.data.code == 1) {
...@@ -212,22 +199,22 @@ export default { ...@@ -212,22 +199,22 @@ export default {
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.getUserList(); this.getUserList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.page = 1; this.page = 1;
this.$clearSelection("MyTable"); this.$clearSelection('MyTable');
this.$resetForm("searchForm"); this.$resetForm('searchForm');
this.getUserList(); this.getUserList();
}, },
apportion(row) { apportion(row) {
let data = this.$cloneDeep(row); let data = this.$cloneDeep(row);
this.$refs.AddUserRole.onEdit(data); this.$refs.AddUserRole.onEdit(data);
this.show = true; this.show = true;
}, }
}, }
}; };
</script> </script>
......
admin_2/src/pages/system/user/components/AddUserRole.vue
View file @ 15017fd2
...@@ -9,13 +9,7 @@ ...@@ -9,13 +9,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
top="10vh" top="10vh"
> >
<el-form <el-form ref="form" :model="form" :rules="rules" size="medium" label-width="100px">
ref="form"
:model="form"
:rules="rules"
size="medium"
label-width="100px"
>
<el-form-item label="角色名称" prop="roleIds"> <el-form-item label="角色名称" prop="roleIds">
<el-select <el-select
multiple multiple
...@@ -24,46 +18,38 @@ ...@@ -24,46 +18,38 @@
v-model="form.roleIds" v-model="form.roleIds"
placeholder="请选择角色" placeholder="请选择角色"
> >
<el-option <el-option v-for="v in roleList" :key="v.id" :label="v.name" :value="v.id"> </el-option>
v-for="v in roleList"
:key="v.id"
:label="v.name"
:value="v.id"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="medium" @click="handleRest">重 置</el-button> <el-button size="medium" @click="handleRest">重 置</el-button>
<el-button size="medium" type="primary" @click="handleOk" <el-button size="medium" type="primary" @click="handleOk">确 定</el-button>
>确 定</el-button
>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getRoleList, saveUser } from "@/api/system"; import { getRoleList, saveUser } from '@/api/system';
export default { export default {
components: {}, components: {},
props: { props: {
show: { show: {
type: Boolean, type: Boolean,
required: true, required: true,
default: false, default: false
}, }
}, },
data() { data() {
return { return {
roleList: [], roleList: [],
form: { form: {
roleIds: [], roleIds: []
}, },
rules: { rules: {
roleIds: [{ required: true, message: "请选择角色", trigger: "change" }], roleIds: [{ required: true, message: '请选择角色', trigger: 'change' }]
}, }
}; };
}, },
computed: { computed: {
...@@ -72,9 +58,9 @@ export default { ...@@ -72,9 +58,9 @@ export default {
return this.show; return this.show;
}, },
set(val) { set(val) {
this.$emit("update:show", val); this.$emit('update:show', val);
}, }
}, }
}, },
created() { created() {
this.getRoleList(); this.getRoleList();
...@@ -84,7 +70,7 @@ export default { ...@@ -84,7 +70,7 @@ export default {
async getRoleList() { async getRoleList() {
let res = await getRoleList({ let res = await getRoleList({
page: 1, page: 1,
size: -1, size: -1
}); });
if (res.data.code == 1) { if (res.data.code == 1) {
let { data } = res.data.data; let { data } = res.data.data;
...@@ -101,12 +87,12 @@ export default { ...@@ -101,12 +87,12 @@ export default {
id, id,
lastLoginAddress, lastLoginAddress,
mobile, mobile,
roleIds: roleIds.join(","), roleIds: roleIds.join(',')
}); });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code == 1) { if (code == 1) {
this.$message.success(msg); this.$message.success(msg);
this.$emit("success"); this.$emit('success');
this.handleClose(); this.handleClose();
} }
this.loading = false; this.loading = false;
...@@ -116,14 +102,14 @@ export default { ...@@ -116,14 +102,14 @@ export default {
// 新增 // 新增
onAdd() { onAdd() {
Object.assign(this.form, this.$options.data().form); Object.assign(this.form, this.$options.data().form);
this.form.id && this.$delete(this.form, "id"); this.form.id && this.$delete(this.form, 'id');
}, },
// 编辑 // 编辑
onEdit(row) { onEdit(row) {
setTimeout(() => { setTimeout(() => {
this.form = { ...row }; this.form = { ...row };
if (this.form.roleIds) { if (this.form.roleIds) {
this.form.roleIds = this.form.roleIds.split(",").map(Number); this.form.roleIds = this.form.roleIds.split(',').map(Number);
} else { } else {
this.form.roleIds = []; this.form.roleIds = [];
} }
...@@ -131,14 +117,14 @@ export default { ...@@ -131,14 +117,14 @@ export default {
}, },
// 重置 // 重置
handleRest() { handleRest() {
this.$resetForm("form"); this.$resetForm('form');
}, },
// 关闭 // 关闭
handleClose() { handleClose() {
this.$resetForm("form"); this.$resetForm('form');
this.Visible = false; this.Visible = false;
}, }
}, }
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment