Commit c277a591 authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents 26cbc8e9 a0220f4d
......@@ -21,6 +21,7 @@
"element-china-area-data": "^5.0.2",
"element-ui": "^2.15.10",
"file-saver": "^2.0.2",
"hammerjs": "^2.0.8",
"moment": "^2.29.4",
"npm": "^6.13.7",
"secure-ls": "^1.2.6",
......@@ -46,7 +47,6 @@
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"filemanager-webpack-plugin": "^8.0.0",
"less": "^4.0.0",
"less-loader": "^8.0.0",
"svg-sprite-loader": "^4.1.6",
......
......@@ -64,8 +64,8 @@ export default {
devicenum: "18-93-7F-C0-AD-B5",
// devicenum: "B8-13-32-86-9F-04",
};
local.setLocal(obj.devicenum);
this.SET_deviceCodet(obj.devicenum);
local.setLocal("devicenum", obj.devicenum);
this.SET_deviceCode(obj.devicenum);
this.WebSocketMq(obj);
}
},
......@@ -85,7 +85,7 @@ export default {
"SET_homeInfo",
"SET_datumList",
"SET_matterList",
"SET_deviceCodet",
"SET_deviceCode",
]),
// 简析url
urlGet() {
......@@ -110,7 +110,7 @@ export default {
let { devicenum } = routeQuery;
this.devicenum = devicenum;
local.setLocal("devicenum", devicenum);
this.SET_deviceCodet(devicenum);
this.SET_deviceCode(devicenum);
}
},
// 获取首页信息
......@@ -143,7 +143,6 @@ export default {
this.linkDom = link;
link.rel = "stylesheet";
link.href = data[0].cssFilePath;
console.log(data[0]);
// document.getElementsByTagName("head")[0].appendChild(link);
document.head.appendChild(link);
}
......
......@@ -487,6 +487,7 @@ export default {
}
.ranking-list {
padding: 0px 14px;
overflow: hidden;
.ranking-item {
height: 50px;
margin-bottom: 10px;
......@@ -577,6 +578,7 @@ export default {
.hot-matter-list {
height: 130px;
padding: 0px 14px;
overflow: hidden;
.seamless-warp {
height: 100%;
overflow: hidden;
......
......@@ -107,13 +107,14 @@
import Header from "@/components/Header.vue";
import { getMaterialsList, checkMaterials } from "@/api";
import local from "@/utils/local";
// import Hammer from "hammerjs";
export default {
components: {
Header,
},
data() {
return {
api: local.getLocal("serverUrl") + "/",
api: local.getLocal("serverUrl"),
matterInfo: {},
matterName: "", // 事项名称
matterId: this.$route.query.matterId, // 事项id
......@@ -127,9 +128,11 @@ export default {
},
created() {
this.getMaterialsList();
// this.materailsList=this.matterInfo.matterDatumList;
},
mounted() {
// this.handleScale();
},
methods: {
handleBackHome() {
......@@ -212,6 +215,25 @@ export default {
row.materialFullName
);
},
// 手势放大缩小
// handleScale() {
// setTimeout(() => {
// let _this = this;
// const img = this.$refs.PreviewImg;
// const PreviewImg = new Hammer(img);
// PreviewImg.get("pinch").set({ enable: true });
// PreviewImg.on("pinchmove", function (e) {
// if (e.scale > 1) {
// _this.scale += 5;
// if (_this.scale > 200) {
// _this.scale = 200;
// }
// } else if (e.scale <= 1) {
// _this.scale = 100;
// }
// });
// }, 100);
// },
},
};
</script>
......@@ -270,12 +292,12 @@ export default {
.icon1 {
width: 26px;
height: 26px;
background: var(--main-assist-color);
// background: var(--main-assist-color);
background: #fff;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
color: #fff;
i {
font-size: 16px;
color: var(--main-theme-color);
......@@ -290,7 +312,7 @@ export default {
display: flex;
align-items: center;
justify-content: center;
color: var(--main-theme-color);
color: #fff;
position: absolute;
right: 28px;
cursor: pointer;
......
......@@ -31,7 +31,7 @@ export default new Vuex.Store({
SET_matterList(state, matterList) {
state.matterList = matterList;
},
SET_deviceCodet(state, deviceCode) {
SET_deviceCode(state, deviceCode) {
state.deviceCode = deviceCode;
},
},
......
const { defineConfig } = require("@vue/cli-service");
const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
const isDev = process.env.NODE_ENV === "development";
let plugins = [];
// 避免本地启项目时自动打zip包
if (!isDev) {
plugins.push(
new FileManagerPlugin({
events: {
onEnd: {
// mkdir: ["./dist"],
delete: ["./样表终端系统.zip"],
archive: [{ source: "./dist", destination: "./样表终端系统.zip" }],
},
},
})
);
}
module.exports = defineConfig({
transpileDependencies: true,
productionSourceMap: false,
......@@ -24,20 +7,6 @@ module.exports = defineConfig({
outputDir: "dist",
publicPath: "./",
// webpack 插件
configureWebpack: {
plugins: [...plugins],
},
configureWebpack: {},
transpileDependencies: true,
devServer: {
port: 9086,
hot: "only", //自动保存
proxy: {
"/sampleform": {
target: "http://localhost:17002",
changeOrigin: true,
secure: false,
cookieDomainRewrite: "localhost",
},
},
},
});
This diff is collapsed.
......@@ -44,7 +44,6 @@
"@vue/cli-service": "~5.0.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"filemanager-webpack-plugin": "^8.0.0",
"less": "^4.0.0",
"less-loader": "^8.0.0",
"svg-sprite-loader": "^4.1.6",
......
......@@ -393,3 +393,23 @@
.el-drawer__body{
border-top:1px solid #ececec;
}
.el-button--primary{
background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important;
border: none !important;
border-color: transparent !important;
}
.el-dialog__header{
.el-dialog__title{
color: #1890FF !important;
font-size: 18px;
font-weight: bold;
}
.el-dialog__close{
color: #188fff !important;
font-size: 26px;
font-weight: bold;
}
}
.el-pagination__jump{
margin-left: 0px !important;
}
\ No newline at end of file
<template>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,prev,pager,next,sizes,jumper"
:pager-count="5"
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
</template>
<script>
export default {
props: {
total: {
required: true,
type: Number,
default: 0,
},
size: {
required: true,
type: Number,
default: 10,
},
current: {
required: true,
type: Number,
default: 1,
},
},
data() {
return {
pageSizes: [10, 20, 30, 40, 50, 100, 200],
};
},
computed: {},
methods: {
changePagination(cur) {
this.$emit("currentChange", cur);
},
changeSize(size) {
this.$emit("sizeChange", size);
},
},
};
</script>
<style lang="less" scoped>
</style>
\ No newline at end of file
import Vue from 'vue'
import App from './App.vue'
import router from './router'
import store from './store'
import Vue from "vue";
import App from "./App.vue";
import router from "./router";
import store from "./store";
// 引入清除样式,重置样式,公共样式
import "@/assets/css/normalize.css"
import "@/assets/css/reset.css"
import "@/assets/css/common.css"
import "@/assets/css/normalize.css";
import "@/assets/css/reset.css";
import "@/assets/css/common.less";
// moment 时间处理
import moment from 'moment';
import moment from "moment";
Vue.prototype.$moment = moment;
// 引入element-ui
import ElementUI from 'element-ui';
import 'element-ui/lib/theme-chalk/index.css';
import ElementUI from "element-ui";
import "element-ui/lib/theme-chalk/index.css";
Vue.use(ElementUI);
import { message } from '@/utils/resetMessage'
Vue.prototype.$message = message
import { message } from "@/utils/resetMessage";
Vue.prototype.$message = message;
// 表格生成
import plugins from './components/formDes/index';
import plugins from "./components/formDes/index";
Vue.use(plugins);
// 中央事件
Vue.prototype.$bus = new Vue
Vue.config.productionTip = false
Vue.prototype.$bus = new Vue();
Vue.config.productionTip = false;
Vue.config.productionTip = false
Vue.config.productionTip = false;
new Vue({
router,
store,
render: h => h(App)
}).$mount('#app')
render: (h) => h(App),
}).$mount("#app");
......@@ -41,7 +41,6 @@
v-loading="loading"
border
:data="tableData"
size="small"
tooltip-effect="dark"
style="width: 100%"
max-height="676px"
......@@ -153,20 +152,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
</el-card>
<!-- 新增设备 -->
<AddDevice
......@@ -181,6 +173,7 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import AddMatter from "./modal/AddMatter.vue";
import AddDevice from "./modal/AddDevice.vue";
import { getDeviceList } from "@/api/device";
......@@ -190,6 +183,7 @@ export default {
TableHeader,
AddDevice,
AddMatter,
Pagination,
},
data() {
return {
......@@ -198,7 +192,6 @@ export default {
? local.getLocal("sampleSiteId")
: "",
tableData: [],
pageSizes: [10, 20, 30, 40, 50, 100, 200],
total: 0,
current: 1,
size: 10,
......
......@@ -19,9 +19,11 @@
:key="v.id"
>
<div class="flex aic jcb">
<el-tooltip :content="v.matterName" placement="top">
<p class="matter-item-title">
{{ v.matterName }}
</p>
</el-tooltip>
<i class="el-icon-delete delete" @click="handleDel(v.id)"></i>
</div>
<div class="matter-item-count">
......@@ -73,9 +75,9 @@
@keyup.native.enter="handleSearch"
></el-input>
<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>
</TableHeader>
<!-- 表格 -->
......@@ -144,20 +146,13 @@
</el-table>
</div>
</div>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
</div>
</div>
<div class="footer">
......@@ -173,6 +168,7 @@
<script>
import { mapGetters } from "vuex";
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import { getWriteMatterList } from "@/api/matter";
import {
getDeviceMatterList,
......@@ -183,6 +179,7 @@ import local from "@/utils/local";
export default {
components: {
TableHeader,
Pagination,
},
props: {
matterDrawer: {
......@@ -194,8 +191,8 @@ export default {
data() {
return {
loading: false,
siteId: local.getLocal("writeSiteId")
? local.getLocal("writeSiteId")
siteId: local.getLocal("sampleSiteId")
? local.getLocal("sampleSiteId")
: "",
department: "",
searchVal: "",
......@@ -204,7 +201,6 @@ export default {
total: 0,
tableData: [],
devMatterList: [], // 设备事项列表
pageSizes: [10, 20, 30, 40, 50, 100, 200],
selectionKeys: [],
devInfo: {},
};
......@@ -261,6 +257,7 @@ export default {
// 搜索
handleSearch() {
this.current = 1;
this.$refs.curTable.clearSelection();
this.getWriteMatterList();
},
// 重置
......@@ -268,6 +265,7 @@ export default {
this.department = "";
this.searchVal = "";
this.current = 1;
this.$refs.curTable.clearSelection();
this.getWriteMatterList();
},
// 翻页
......@@ -317,6 +315,7 @@ export default {
let { code, msg } = res.data;
if (code == 1) {
this.$message.success(msg);
this.$refs.curTable.clearSelection();
this.getDeviceMatterList(this.devInfo.id);
}
},
......@@ -385,6 +384,7 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
}
.matter-item-count {
margin-top: 4px;
......
......@@ -92,25 +92,25 @@ export default {
}
/deep/.el-menu-item {
height: 100% !important;
// border: none !important;
border: none !important;
display: flex;
align-items: center;
i {
color: rgba(254, 254, 254, 0.65);
}
&:hover {
background-color: transparent !important;
// background-color: #2681e8 !important;
// background-color: transparent !important;
background-color: #1890ff !important;
color: #fff !important;
border-bottom: 2px solid #fff !important;
// border-bottom: 2px solid #fff !important;
}
}
/deep/.is-active {
border: none !important;
border-bottom: 2px solid #fff !important;
// border-bottom: 2px solid #fff !important;
color: #fff !important;
background-color: transparent !important;
// background-color: #2681e8 !important;
// background-color: transparent !important;
background-color: #1890ff !important;
}
</style>
\ No newline at end of file
......@@ -57,9 +57,9 @@
</el-button>
</div>
<div class="mt50">
<el-button size="small" @click="handleReset">重置</el-button>
<el-button size="small" @click="handleReset"> </el-button>
<el-button size="small" type="primary" @click="handleOk"
>确定
>
</el-button>
</div>
</el-card>
......@@ -116,6 +116,7 @@ export default {
showInput() {
if (this.baseSetInfo.hotwords.length >= 10) {
this.$message.warning("最多添加10个热门词汇!");
return;
}
this.inputVisible = true;
......
......@@ -43,16 +43,15 @@
@keyup.native.enter="handleSearch"
></el-input>
<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>
</TableHeader>
<!-- 表格 -->
<div class="table-content">
<el-table
ref="multipleTable"
size="small"
v-loading="loading"
:data="tableData"
border
......@@ -107,20 +106,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
</el-card>
<!-- 添加材料 -->
<!-- <AddMaterals
......@@ -139,12 +131,14 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import PreviewMaterals from "./modal/PreviewMaterals.vue";
import Pagination from "@/components/Pagination.vue";
import { getPubdatumList, delPubdatum } from "@/api/libray";
import { mapGetters } from "vuex";
export default {
components: {
TableHeader,
PreviewMaterals,
Pagination,
},
data() {
return {
......@@ -154,7 +148,6 @@ export default {
current: 1,
size: 10,
total: 10,
pageSizes: [10, 20, 30, 40, 50, 100, 200],
loading: false,
selectKeys: [],
depList: [],
......@@ -170,7 +163,7 @@ export default {
...mapGetters(["deptList"]),
},
methods: {
// 系统事项列表
// 获取公共库材料
async getPbuList() {
this.loading = true;
let res = await getPubdatumList({
......@@ -182,6 +175,10 @@ export default {
this.loading = false;
if (res.data.code === 1) {
let { data, total } = res.data.data;
if (!data.length && this.current > 1) {
this.current -= 1;
this.getPbuList();
}
this.tableData = data;
this.total = total;
this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
......@@ -205,12 +202,14 @@ export default {
// 搜索
handleSearch() {
this.current = 1;
this.$refs.multipleTable.clearSelection();
this.getPbuList();
},
// 重置
handleReset() {
this.department = "";
this.searchVal = "";
this.$refs.multipleTable.clearSelection();
this.getPbuList();
},
// 选中
......@@ -246,7 +245,6 @@ export default {
}
)
.then(async () => {
console.log(id);
let res = await delPubdatum({ id });
let { code, msg } = res.data;
if (code === 1) {
......
......@@ -76,20 +76,13 @@
>
</el-table-column>
</el-table>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="handleOk"
> </el-button
......@@ -102,10 +95,12 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import { mapGetters } from "vuex";
export default {
components: {
TableHeader,
Pagination,
},
props: {
libVisible: {
......@@ -125,27 +120,7 @@ export default {
return {
department: "",
searchVal: "",
tableData: [
{
id: 1,
department: "县公安局",
name: "机动车登记证、行使证核发",
name2: "机动车登记证、行驶证审查、办理、核发",
count: 50,
top: 1,
time: "2022-12-12 12:00:00",
},
{
id: 2,
department: "县公安局",
name: "机动车登记证、行使证核发",
name2: "机动车登记证、行驶证审查、办理、核发",
count: 50,
top: 0,
time: "2022-12-12 12:00:00",
},
],
pageSizes: [10, 20, 30, 40, 50, 100, 200],
tableData: [],
current: 1,
total: 10,
size: 10,
......
......@@ -7,7 +7,7 @@
</div>
<TableHeader>
<div slot="left">
<el-button size="small" @click="setCurrent">{{
<el-button size="small" type="primary" @click="setCurrent">{{
activeDep.id ? "取消选择" : "全部材料"
}}</el-button>
</div>
......@@ -42,9 +42,9 @@
@keyup.native.enter="handleSearchLeft"
></el-input>
<el-button size="small" type="primary" @click="handleSearchLeft"
>搜索</el-button
> </el-button
>
<el-button size="small" @click="leftReset">重置</el-button>
<el-button size="small" @click="leftReset"> </el-button>
</div>
</TableHeader>
<!-- 表格 -->
......@@ -55,6 +55,7 @@
v-loading="loadingLeft"
:data="LeftTableData"
size="small"
border
tooltip-effect="dark"
style="width: 100%"
max-height="676px"
......@@ -100,20 +101,13 @@
</el-table>
</div>
</div>
<div class="pagination" v-if="leftTotal">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:current="leftCurrent"
:size="leftSize"
:total="leftTotal"
:current-page="leftCurrent"
:page-size="leftSize"
:page-sizes="pageSizes"
@current-change="leftChangePagination"
@size-change="leftChangeSize"
>
</el-pagination>
</div>
@currentChange="leftChangePagination"
@sizeChange="leftChangeSize"
></Pagination>
</el-card>
</div>
<div class="right">
......@@ -165,9 +159,9 @@
@keyup.native.enter="handleSearchRight"
></el-input>
<el-button size="small" type="primary" @click="handleSearchRight"
>搜索</el-button
> </el-button
>
<el-button size="small" @click="rightReset">重置</el-button>
<el-button size="small" @click="rightReset"> </el-button>
</div>
</TableHeader>
<!-- 表格 -->
......@@ -212,7 +206,7 @@
</el-table-column>
<el-table-column
prop="total"
label="填写次数"
label="查看次数"
align="center"
width="80"
>
......@@ -252,20 +246,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="rightTotal">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:current="rightCurrent"
:size="rightSize"
:total="rightTotal"
:current-page="rightCurrent"
:page-size="rightSize"
:page-sizes="pageSizes"
@current-change="rightChangePagination"
@size-change="rightChangeSize"
>
</el-pagination>
</div>
@currentChange="rightChangePagination"
@sizeChange="rightChangeSize"
></Pagination>
</el-card>
</div>
<!-- 新增材料 -->
......@@ -296,6 +283,7 @@ import TableHeader from "@/components/TableHeader.vue";
import AddMaterials from "./modal/AddMaterials.vue";
import PreviewMaterials from "./modal/PreviewMaterials.vue";
import CommonLib from "./modal/CommonLib.vue";
import Pagination from "@/components/Pagination.vue";
import { getWriteMatterList } from "@/api/matter";
import {
getMaterialsList,
......@@ -310,6 +298,7 @@ export default {
AddMaterials,
PreviewMaterials,
CommonLib,
Pagination,
},
data() {
return {
......@@ -322,7 +311,6 @@ export default {
rightSearch: "",
loadingLeft: false,
loadingRight: false,
pageSizes: [10, 20, 30, 40, 50, 100, 200],
LeftTableData: [],
leftCurrent: 1,
leftSize: 10,
......@@ -466,6 +454,7 @@ export default {
// 右边搜索
handleSearchRight() {
this.rightCurrent = 1;
this.$refs.rightTable.clearSelection();
this.getMaterialsList();
},
// 右边重置
......@@ -473,6 +462,7 @@ export default {
this.departmentRight = "";
this.rightSearch = "";
this.rightCurrent = 1;
this.$refs.rightTable.clearSelection();
this.getMaterialsList();
},
// 推荐
......
......@@ -17,9 +17,9 @@
@keyup.native.enter="handleSarch"
></el-input>
<el-button size="small" type="primary" @click="handleSarch"
>搜索
>
</el-button>
<el-button size="small" @click="resetSearch">重置</el-button>
<el-button size="small" @click="resetSearch"> </el-button>
</div>
</TableHeader>
<el-table
......@@ -67,20 +67,14 @@
>
</el-table-column>
</el-table>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="Visible = false">取 消</el-button>
<el-button
......@@ -97,6 +91,7 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import { getPubdatumList } from "@/api/libray";
import { addPubdatum } from "@/api/materials";
import local from "@/utils/local";
......@@ -105,6 +100,7 @@ import { mapGetters } from "vuex";
export default {
components: {
TableHeader,
Pagination,
},
props: {
libVisible: {
......@@ -126,7 +122,6 @@ export default {
department: "",
searchVal: "",
tableData: [],
pageSizes: [10, 20, 30, 40, 50, 100, 200],
current: 1,
total: 10,
size: 10,
......@@ -181,11 +176,13 @@ export default {
},
handleSarch() {
this.current = 1;
this.$refs.multipleTable.clearSelection();
this.getPbuList();
},
resetSearch() {
this.current = 1;
this.searchVal = "";
this.$refs.multipleTable.clearSelection();
this.getPbuList();
},
changePagination(cur) {
......
......@@ -112,20 +112,20 @@ export default {
height: 100%;
background-color: #e8e8e8;
overflow-y: auto;
&::-webkit-scrollbar {
width: 10px;
overflow-y: auto;
}
// &::-webkit-scrollbar {
// width: 10px;
// overflow-y: auto;
// }
&::-webkit-scrollbar-thumb {
border-radius: 6px;
background-color: rgba(144, 147, 153, 0.5);
}
// &::-webkit-scrollbar-thumb {
// border-radius: 6px;
// background-color: rgba(144, 147, 153, 0.5);
// }
&::-webkit-scrollbar-track {
border-radius: 6px;
background: #fff;
}
// &::-webkit-scrollbar-track {
// border-radius: 6px;
// background: #fff;
// }
.left-header {
height: 80px;
......
......@@ -46,9 +46,9 @@
placeholder="请输入事项全称搜索"
></el-input>
<el-button size="small" type="primary" @click="searchLeft"
>搜索</el-button
> </el-button
>
<el-button size="small" @click="leftReset">重置</el-button>
<el-button size="small" @click="leftReset"> </el-button>
</div>
</TableHeader>
<!-- 表格 -->
......@@ -140,20 +140,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="leftTotal">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:current="leftCurrent"
:size="leftSize"
:total="leftTotal"
:current-page="leftCurrent"
:page-size="leftSize"
:page-sizes="pageSizes"
@current-change="leftChangePagination"
@size-change="leftChangeSize"
>
</el-pagination>
</div>
@currentChange="leftChangePagination"
@sizeChange="leftChangeSize"
></Pagination>
</el-card>
</div>
<!-- -->
......@@ -165,7 +158,7 @@
<!-- 内容 -->
<TableHeader>
<div slot="left">
<el-button size="small" type="success" @click="handleAllJoin"
<el-button size="small" type="primary" @click="handleAllJoin"
>批量加入</el-button
>
</div>
......@@ -200,9 +193,9 @@
@keyup.native.enter="handleSearchRight"
></el-input>
<el-button size="small" type="primary" @click="handleSearchRight"
>搜索</el-button
> </el-button
>
<el-button size="small" @click="rightReset">重置</el-button>
<el-button size="small" @click="rightReset"> </el-button>
</div>
</TableHeader>
<!-- 表格 -->
......@@ -256,20 +249,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="rightTotal">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:current="rightCurrent"
:size="rightSize"
:total="rightTotal"
:current-page="rightCurrent"
:page-size="rightSize"
:page-sizes="pageSizes"
@current-change="rightChangePagination"
@size-change="rightChangeSize"
>
</el-pagination>
</div>
@currentChange="rightChangePagination"
@sizeChange="rightChangeSize"
></Pagination>
</el-card>
</div>
<!-- 新增事项 -->
......@@ -286,6 +272,7 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import AddMatter from "./modal/AddMatter.vue";
import Pagination from "@/components/Pagination.vue";
import { mapGetters } from "vuex";
import {
// getMatterList,
......@@ -300,6 +287,7 @@ export default {
components: {
TableHeader,
AddMatter,
Pagination,
},
data() {
return {
......@@ -311,7 +299,6 @@ export default {
loadingLeft: false,
leftSearch: "",
rightSearch: "",
pageSizes: [10, 20, 30, 40, 50, 100, 200],
LeftTableData: [],
leftSelectedRowKeys: [],
leftCurrent: 1,
......@@ -354,24 +341,6 @@ export default {
this.$refs.rightTable.bodyWrapper.scrollTop = 0;
}
},
// 获取一体化事项列表
// async getMatterList() {
// this.loadingRight = true;
// let res = await getMatterList({
// page: this.rightCurrent,
// size: this.rightSize,
// matterName: this.rightSearch,
// deptCode: this.departmentRight,
// siteId: this.siteId,
// });
// this.loadingRight = false;
// if (res.data.code === 1) {
// let { total, data } = res.data.data;
// this.rightTableData = data;
// this.rightTotal = total;
// this.$refs.rightTable.bodyWrapper.scrollTop = 0;
// }
// },
// 获取样表系统事项列表
async getWriteMatterList() {
......@@ -433,6 +402,7 @@ export default {
// 左边搜索
searchLeft() {
this.leftCurrent = 1;
this.$refs.leftTable.clearSelection();
this.getWriteMatterList();
},
// 左边重置
......@@ -440,6 +410,7 @@ export default {
this.departmentLeft = "";
this.leftSearch = "";
this.leftCurrent = 1;
this.$refs.leftTable.clearSelection();
this.getWriteMatterList();
},
// 左边勾选
......@@ -486,6 +457,7 @@ export default {
// 右边搜索
handleSearchRight() {
this.rightCurrent = 1;
this.$refs.rightTable.clearSelection();
this.getMatterSubList();
},
// 右边重置
......@@ -493,6 +465,7 @@ export default {
this.rightSearch = "";
this.departmentRight = "";
this.rightCurrent = 1;
this.$refs.rightTable.clearSelection();
this.getMatterSubList();
},
// 右边勾选
......
......@@ -19,16 +19,15 @@
@keyup.native.enter="handleSearch"
></el-input>
<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>
</TableHeader>
<!-- 表格 -->
<div class="table-content">
<el-table
ref="multipleTable"
size="small"
v-loading="loading"
:data="tableData"
border
......@@ -90,20 +89,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
<!-- 新增参数 -->
<AddParameter
ref="AddParameter"
......@@ -117,12 +109,14 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import AddParameter from "./modal/AddParameter.vue";
import { getParamList, delParam } from "@/api/system";
export default {
components: {
TableHeader,
AddParameter,
Pagination,
},
data() {
return {
......@@ -131,7 +125,6 @@ export default {
current: 1,
size: 10,
total: 10,
pageSizes: [10, 20, 30, 40, 50, 100, 200],
loading: false,
selectKeys: [],
addVisible: false,
......
......@@ -11,9 +11,9 @@
@keyup.native.enter="handleSearch"
></el-input>
<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>
</TableHeader>
<!-- 表格 -->
......@@ -58,29 +58,24 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
</div>
</template>
<script>
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import { getlogsList } from "@/api/system";
export default {
components: {
TableHeader,
Pagination,
},
data() {
return {
......@@ -89,7 +84,6 @@ export default {
current: 1,
size: 10,
total: 10,
pageSizes: [10, 20, 30, 40, 50, 100, 200],
loading: false,
selectKeys: [],
dict: {}, // 字典
......
......@@ -19,16 +19,15 @@
@keyup.native.enter="handleSearch"
></el-input>
<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>
</TableHeader>
<!-- 表格 -->
<div class="table-content">
<el-table
ref="multipleTable"
size="small"
v-loading="loading"
:data="tableData"
border
......@@ -100,20 +99,13 @@
</el-table-column>
</el-table>
</div>
<div class="pagination" v-if="total">
<el-pagination
background
layout="total,sizes,prev,pager,next,jumper"
:pager-count="5"
<Pagination
:total="total"
:current-page="current"
:page-size="size"
:page-sizes="pageSizes"
@current-change="changePagination"
@size-change="changeSize"
>
</el-pagination>
</div>
:current="current"
:size="size"
@currentChange="changePagination"
@sizeChange="changeSize"
></Pagination>
<!-- 新增参数 -->
<AddTask
ref="AddTask"
......@@ -127,12 +119,14 @@
<script>
import TableHeader from "@/components/TableHeader.vue";
import Pagination from "@/components/Pagination.vue";
import AddTask from "./modal/AddTask.vue";
import { getTaskList, delTask } from "@/api/system";
export default {
components: {
TableHeader,
AddTask,
Pagination,
},
data() {
return {
......@@ -141,7 +135,6 @@ export default {
current: 1,
size: 10,
total: 10,
pageSizes: [10, 20, 30, 40, 50, 100, 200],
loading: false,
selectKeys: [],
addVisible: false,
......@@ -172,7 +165,6 @@ export default {
this.tableData = data;
this.total = total;
this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
console.log(dict);
}
this.loading = false;
},
......
const { defineConfig } = require("@vue/cli-service");
const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
const isDev = process.env.NODE_ENV === "development";
let plugins = [];
// 避免打本地启项目时自动打zip包
if (!isDev) {
plugins.push(
new FileManagerPlugin({
events: {
onEnd: {
// mkdir: ["./dist"],
delete: ["./zip/"],
copy: [{ source: "./dist", destination: "./zip/dist" }],
archive: [{ source: "./zip", destination: "./zip/样表管理系统.zip" }],
},
},
})
);
}
module.exports = defineConfig({
transpileDependencies: true,
productionSourceMap: false,
// webpack 插件
configureWebpack: {
plugins: [...plugins],
},
configureWebpack: {},
transpileDependencies: true,
// 打包输出目录
outputDir: "dist",
......
This diff is collapsed.
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