Commit 68b319c6 authored by 赵啸非's avatar 赵啸非

Merge remote-tracking branch 'origin/master'

parents ebd4add9 13fd76ea
......@@ -14,12 +14,11 @@
<!-- 富文本 -->
<quill-editor
class="editor ql-editor"
v-model="value"
v-model="contnet"
ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)"
@focus="onEditorFocus($event)"
@change="onEditorChange($event)"
>
</quill-editor>
</div>
......@@ -106,9 +105,7 @@ export default {
data() {
return {
quillUpdateImg: false, // 根据图片上传状态来确定是否显示loading动画,刚开始是false,不显示
api: process.env.VUE_APP_API_BASE_URL.includes("base")
? process.env.VUE_APP_API_BASE_URL.replace("base", "")
: process.env.VUE_APP_API_BASE_URL + "/",
api: process.env.VUE_APP_API_BASE_URL + "/",
editorOption: {
theme: "snow", // or 'bubble'
placeholder: "请输入文本......",
......@@ -151,7 +148,16 @@ export default {
},
};
},
computed: {
contnet: {
get() {
return this.value;
},
set(val) {
this.$emit("input", val);
},
},
},
methods: {
onEditorBlur() {
//失去焦点事件
......@@ -159,10 +165,6 @@ export default {
onEditorFocus() {
//获得焦点事件
},
onEditorChange() {
//内容改变事件
this.$emit("input", this.value);
},
// 富文本图片上传前
beforeUpload() {
......
......@@ -34,6 +34,22 @@
</a-form-model-item>
<a-form-model-item label="应用图标" prop="appIconPath">
<a-upload
name="file"
list-type="picture-card"
:action="api + 'base/file/commonupload'"
:file-list="iconFileList"
@change="handleChangeIcon"
:accept="accept"
:before-upload="iconBeforeUpload"
@preview="handlePreview"
>
<div v-if="iconFileList.length < 1">
<a-icon type="plus" />
<div class="ant-upload-text">选择图标</div>
</div>
</a-upload>
<!-- <a-upload
name="file"
list-type="picture-card"
class="avatar-uploader"
......@@ -51,7 +67,7 @@
<a-icon :type="loading ? 'loading' : 'plus'" />
<div class="ant-upload-text">选择图标</div>
</div>
</a-upload>
</a-upload> -->
</a-form-model-item>
<a-form-model-item label="应用简介" prop="summary">
<a-textarea
......@@ -150,6 +166,11 @@
<a-button type="primary" @click="onSubmit"> 保存 </a-button>
</a-space>
</div>
<!-- 预览 -->
<PrevieModal
:previewData="previewData"
:previewVisible.sync="previewVisible"
></PrevieModal>
</a-drawer>
</div>
</template>
......@@ -159,9 +180,11 @@ import YSwitch from "../../../../components/yswitch/YSwitch.vue";
import { saveApp } from "@/services/market";
import { mapGetters } from "vuex";
import { changeCodeNumber } from "@/utils/validate";
import PrevieModal from "@/components/PrevieModal.vue";
export default {
components: {
YSwitch,
PrevieModal,
},
props: {
title: {
......@@ -184,8 +207,12 @@ export default {
},
data() {
return {
accept: "image/jpeg,image/png,image/svg+xml",
api: process.env.VUE_APP_API_BASE_URL + "/",
api2: process.env.VUE_APP_API_IMG_URL,
previewData: {}, // 预览
previewVisible: false,
iconFileList: [],
labelCol: {
span: 3,
},
......@@ -290,27 +317,51 @@ export default {
// 图标上传之前
iconBeforeUpload(file) {
const isJpgOrPng =
file.type === "image/jpeg" || file.type === "image/png";
file.type === "image/jpeg" ||
file.type === "image/png" ||
file.type === "image/svg+xml";
if (!isJpgOrPng) {
this.$message.error("请上传jpeg或者png格式图片!");
this.$message.error("请上传jpeg、png或者svg格式图片!");
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
this.$message.error("图片大小不能超过 2MB!");
const isLt5M = file.size / 1024 / 1024 < 5;
if (!isLt5M) {
this.$message.error("图片大小不能超过 5MB!");
}
return isJpgOrPng && isLt2M;
return isJpgOrPng && isLt5M;
},
// 上传图标
handleChangeIcon(info) {
if (info.file.status === "uploading") {
this.loading = true;
return;
}
if (info.file.status === "done") {
this.form.appIconPath = info.file.response.url;
this.loading = false;
handleChangeIcon({ fileList }) {
// if (info.file.status === "uploading") {
// this.loading = true;
// return;
// }
// if (info.file.status === "done") {
// this.form.appIconPath = info.file.response.url;
// this.loading = false;
// }
this.iconFileList = [...fileList].slice(-1);
this.iconFileList = this.iconFileList.map((v) => {
if (v.response) {
v.url2 = v.response.url;
v.url = this.api2 + v.response.url;
}
return v;
});
if (this.iconFileList[0]) {
this.form.appIconPath = this.iconFileList[0].url2;
} else {
this.form.appIconPath = "";
}
},
// 预览
handlePreview(info) {
this.previewData = {
type: "img",
url: info.url,
};
this.previewVisible = true;
},
// 上传应用
handleChangeFile(info) {
let fileList = [...info.fileList];
......@@ -338,7 +389,6 @@ export default {
},
// 编辑
onEdit(data) {
console.log(data);
this.form = { ...data };
this.fileList = [
{
......@@ -348,6 +398,15 @@ export default {
url: this.form.filePath,
},
];
this.iconFileList = [
{
uid: "-2",
name: this.form.appIconPath,
status: "done",
url: this.api2 + this.form.appIconPath,
url2: this.form.appIconPath,
},
];
},
// 选中站点
changeSite(value, label) {
......
......@@ -57,6 +57,7 @@
</template>
<!-- 展现类型 -->
<template slot="displayType" slot-scope="text">
<!-- {{ text.displayType || "--" }} -->
<a-tag>{{ filterItems(text.displayType, dict.displayType) }} </a-tag>
</template>
<!-- 操作 -->
......
......@@ -41,6 +41,7 @@
</a-select>
</a-form-model-item>
<a-form-model-item label="展现类型" prop="displayType">
<!-- <a-input v-model="form.displayType" placeholder="请输入排序" /> -->
<a-select v-model="form.displayType" placeholder="请选择展现类型">
<a-select-option
v-for="(v, key) in dict.displayType"
......
......@@ -11,6 +11,6 @@ VUE_APP_API_PHP_URL=http://8.136.255.30:8090
#正式
VUE_APP_API_PRP_RUL=http://112.19.80.237:11007
#test
VUE_APP_API_TEST_RUL=http://8.136.255.30:80
#易政秀报表
VUE_APP_API_TEST_RUL=http://8.136.255.30
......@@ -522,3 +522,8 @@
text-overflow: ellipsis;
white-space: nowrap;
}
.addclass {
background: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%) !important;
color: #fff !important;
}
\ No newline at end of file
......@@ -6,7 +6,7 @@
sub-title="Sorry, the page you visited does not exist."
>
<template #extra>
<a-button type="primary" @click="$router.push('/home')">
<a-button type="primary" class="addclass" @click="$router.push('/home')">
返回首页
</a-button>
</template>
......
......@@ -31,7 +31,7 @@
/>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" @click="getList"> 开始分析 </a-button>
<a-button type="primary" class="addclass" @click="getList"> 开始分析 </a-button>
</a-form-model-item>
</a-form-model>
<div class="mt20">
......
......@@ -35,7 +35,7 @@
</a-select>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" @click="getData">
<a-button type="primary" class="addclass" @click="getData">
开始分析
</a-button>
</a-form-model-item>
......
......@@ -97,7 +97,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -13,7 +13,7 @@
<a-range-picker valueFormat="yyyy-MM-DD" v-model="time" style="width: 300px" :allowClear="false"/>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" @click="getData">
<a-button type="primary" class="addclass" @click="getData">
开始分析
</a-button>
</a-form-model-item>
......
......@@ -13,7 +13,7 @@
<a-range-picker valueFormat="yyyy-MM-DD" v-model="time" style="width: 300px" :allowClear="false"/>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" @click="getData">
<a-button type="primary" class="addclass" @click="getData">
开始分析
</a-button>
</a-form-model-item>
......
......@@ -25,7 +25,7 @@
</a-select>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" @click="getList">
<a-button type="primary" class="addclass" @click="getList">
开始分析
</a-button>
</a-form-model-item>
......
......@@ -13,7 +13,7 @@
<a-range-picker valueFormat="yyyy-MM-DD" v-model="time" style="width: 300px" :allowClear="false"/>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" @click="getData">
<a-button type="primary" class="addclass" @click="getData">
开始分析
</a-button>
</a-form-model-item>
......
......@@ -592,10 +592,10 @@ import moment from "moment"
justify-content: flex-start;
align-items: center;
.head_title{
font-weight: 700;
font-weight: bold;
font-style: normal;
font-size: 1.125rem;
color: #0595FD;
font-size: 16px;
color: #333;
margin-right: 1.25rem;
}
.head_desc{
......
......@@ -15,8 +15,8 @@
@select="onSelect"
@search="onSearch"
/>
<a-button type="primary" @click="startAnalysis">开始分析</a-button>
<a-button type="primary" v-if="btnShow" @click="backBase">返回</a-button>
<a-button type="primary" class="addclass" @click="startAnalysis">开始分析</a-button>
<a-button type="primary" class="addclass" v-if="btnShow" @click="backBase">返回</a-button>
</div>
</div>
<div class="content_view">
......@@ -130,7 +130,7 @@
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -7,8 +7,8 @@
</div>
<div class="searchBox">
<a-input v-model="peopleName" placeholder="请输入群众名称搜索" style="width: 35.625rem"></a-input>
<a-button type="primary" @click="startAnalysis()">开始分析</a-button>
<a-button type="primary" v-if="btnShow" @click="backBase()">返回</a-button>
<a-button type="primary" class="addclass" @click="startAnalysis()">开始分析</a-button>
<a-button type="primary" class="addclass" v-if="btnShow" @click="backBase()">返回</a-button>
</div>
</div>
<div class="content_view">
......@@ -92,7 +92,7 @@
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -341,8 +341,8 @@ import moment from "moment"
.head_title{
font-weight: 700;
font-style: normal;
font-size: 1.125rem;
color: #0595FD;
font-size: 16px;
color: #333;
margin-right: 1.25rem;
}
.head_desc{
......
......@@ -18,7 +18,7 @@
<a-button @click="">返回</a-button>
</template>
<div style="display: flex;justify-content: space-between;align-items: center;">
<a-button type="primary">导出</a-button>
<a-button type="primary" class="addclass" >导出</a-button>
<diV>
<a-form layout="inline" :model="seacrhForm">
<a-form-item>
......@@ -31,7 +31,7 @@
<a-input placeholder="请输入昵称关键字查询" />
</a-form-item>
<a-form-item>
<a-button type="primary">搜索</a-button>
<a-button type="primary" class="addclass" >搜索</a-button>
</a-form-item>
</a-form>
</diV>
......@@ -226,7 +226,7 @@ import Breadcrumb from "../breadcrumb/index.vue";
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="reportForm-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="handleExportTable">
<a-button type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
</div>
......@@ -28,7 +28,7 @@
v-model="Query.time">
</a-range-picker>
<a-button type="primary" @click="onGetKqalert">搜索</a-button>
<a-button type="primary" class="addclass" @click="onGetKqalert">搜索</a-button>
</span>
</div>
<div class="main">
......@@ -137,15 +137,15 @@
dataIndex: "have_process_name",
customRender: (text, record) => text ? text : '--'
},
{
title: "操作",
align: "center",
width: "110px",
dataIndex: "operation",
scopedSlots: {
customRender: "operation",
},
},
// {
// title: "操作",
// align: "center",
// width: "110px",
// dataIndex: "operation",
// scopedSlots: {
// customRender: "operation",
// },
// },
],
searchName: undefined,
};
......
......@@ -2,7 +2,7 @@
<div class="PoliticsShow-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="exportTable">
<a-button type="primary" class="addclass" @click="exportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<span>告警次数:<i>256次</i></span>
......@@ -43,7 +43,7 @@
v-model="BegindAndEndTime">
</a-range-picker>
<a-button type="primary">搜索</a-button>
<a-button type="primary" class="addclass" >搜索</a-button>
</span>
</div>
<div class="main">
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="ff p15">
<div class="form-box">
<div class="num-dv">
<a-button :loading="btnLoading" type="primary" @click="handleExportTable">
<a-button :loading="btnLoading" type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<div class="ml20">提交总次数:<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.count : 0 }}</span></div>
......@@ -27,7 +27,7 @@
<a-input v-model:value="queryform.keyword" placeholder="请输入标题或者名字关键字搜索" style="width: 220px" />
</a-form-item>
<a-form-item>
<a-button type="primary" @click="getlist">搜索</a-button>
<a-button type="primary" class="addclass" @click="getlist">搜索</a-button>
</a-form-item>
</a-form>
</div>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -25,7 +25,7 @@
</a-select-option>
</a-select>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
</a-space>
</span>
</div>
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -26,7 +26,7 @@
{{ item }}
</a-select-option>
</a-select>
<a-button type="primary" @click="getList">搜索</a-button>
<a-button type="primary" class="addclass" @click="getList">搜索</a-button>
</span>
</div>
<div class="main">
......
......@@ -99,7 +99,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="callRecord-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="handleExportTable">
<a-button type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<a-button type="danger" @click="delTable">
......@@ -32,7 +32,7 @@
<a-input style="width: 280px" v-model="searchName" placeholder="请输入评价人姓名或部门名称搜索" @pressEnter="handleSearch">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="clearnAllChoose">重置</a-button>
</a-space>
</span>
......
......@@ -2,7 +2,7 @@
<div class="callRecord-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="handleExportTable">
<a-button type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<a-button type="danger" @click="delTable">
......@@ -32,7 +32,7 @@
<a-input style="width: 280px" v-model="searchName" placeholder="请输入评价人姓名或排号编号搜索" @pressEnter="handleSearch">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="clearnAllChoose">重置</a-button>
</a-space>
</span>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="callRecord-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="handleExportTable">
<a-button type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<a-button type="danger" @click="delTable">
......@@ -32,7 +32,7 @@
<a-input style="width: 280px" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索" @pressEnter="handleSearch">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="clearnAllChoose">重置</a-button>
</a-space>
</span>
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -50,7 +50,7 @@
>
</a-range-picker>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -38,7 +38,7 @@
{{ v }}
</a-select-option>
</a-select>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -99,7 +99,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
<template>
<div class="Container">
<div class="header">
<a-button type="primary" @click="$router.go(-1)">返回上一级</a-button>
<a-button type="primary" class="addclass" @click="$router.go(-1)">返回上一级</a-button>
</div>
<div class="main">
<div class="left_">
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -37,7 +37,7 @@
>
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="callRecord-Container">
<div class="header_box">
<div>
<a-button :loading="btnLoading" type="primary" @click="handleExportTable">
<a-button :loading="btnLoading" type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<b>拨打次数:<i>{{total}}</i></b>
......@@ -11,7 +11,7 @@
<a-input style="width:250px;" v-model="searchName" placeholder="请输入标题或姓名关键字搜索">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="getList">搜索</a-button>
<a-button type="primary" class="addclass" @click="getList">搜索</a-button>
</span>
</div>
<div class="main">
......
......@@ -91,7 +91,7 @@
position: 'absolute', right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9',
padding: '10px 16px', background: '#fff', textAlign: 'right', zIndex: 1,
}">
<!-- <a-button type="primary" @click="onClose">
<!-- <a-button type="primary" class="addclass" @click="onClose">
确定
</a-button> -->
<a-button :style="{ marginRight: '8px' }" @click="onClose">
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="callRecord-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="handleExportTable" :loading="btnLoading">
<a-button type="primary" class="addclass" @click="handleExportTable" :loading="btnLoading">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<b>建议次数:<i>{{JYCount}}</i></b>
......@@ -35,7 +35,7 @@
<a-input style="width:250px;" v-model="searchName" placeholder="请输入标题或姓名关键字搜索">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="togetWLLZCount">搜索</a-button>
<a-button type="primary" class="addclass" @click="togetWLLZCount">搜索</a-button>
<a-button @click="resetting">重置</a-button>
</a-space>
</span>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -2,7 +2,7 @@
<div class="reportForm-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="exportTable">
<a-button type="primary" class="addclass" @click="exportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
</div>
......@@ -46,7 +46,7 @@
>
</a-range-picker>
<a-button type="primary">搜索</a-button>
<a-button type="primary" class="addclass" >搜索</a-button>
</span>
</div>
<div class="main">
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -42,7 +42,7 @@
>
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -40,7 +40,7 @@
v-model="searchForm.time"
>
</a-range-picker>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -39,7 +39,7 @@
>
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -2,7 +2,7 @@
<div class="callRecord-Container">
<div class="header_box">
<div>
<a-button type="primary" @click="handleExportTable" :loading="btnLoading">
<a-button type="primary" class="addclass" @click="handleExportTable" :loading="btnLoading">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<b>叫号次数:<i>{{ tablePagination.total }}</i></b>
......@@ -27,7 +27,7 @@
<a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="resetBtn">重置</a-button>
</a-space>
</span>
......
......@@ -17,7 +17,7 @@
</h4>
</div>
<template slot="footer">
<a-button type="primary" ghost @click="lookDetails">查看业务分析</a-button>
<a-button type="primary" class="addclass" ghost @click="lookDetails">查看业务分析</a-button>
</template>
</a-modal>
</div>
......
......@@ -17,8 +17,8 @@
</h2>
</div>
<template slot="footer">
<a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button>
<a-button type="primary" ghost @click="openBlockchain">区块链信息</a-button>
<a-button type="primary" class="addclass" ghost @click="openBlockchain">查看TA的数据画像</a-button>
<a-button type="primary" class="addclass" ghost @click="openBlockchain">区块链信息</a-button>
</template>
</a-modal>
<Blockchain ref="Blockchain" />
......
......@@ -25,8 +25,8 @@
</h2>
</div>
<template slot="footer">
<a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button>
<a-button type="primary" ghost @click="openBlockchain">区块链信息</a-button>
<a-button type="primary" class="addclass" ghost @click="openBlockchain">查看TA的数据画像</a-button>
<a-button type="primary" class="addclass" ghost @click="openBlockchain">区块链信息</a-button>
</template>
</a-modal>
<Blockchain ref="Blockchain" />
......
......@@ -2,7 +2,7 @@
<div class="queueRecord-Container">
<div class="header_box">
<div>
<a-button :loading="btnLoading" type="primary" @click="handleExportTable">
<a-button :loading="btnLoading" type="primary" class="addclass" @click="handleExportTable">
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button>
<b>取号次数:<i>{{ tablePagination.total }}</i></b>
......@@ -27,7 +27,7 @@
<a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch">
<a-icon slot="prefix" type="search" />
</a-input>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="resetBtn">重置</a-button>
</a-space>
</span>
......
......@@ -95,7 +95,7 @@ export default {
}
}
/deep/.ant-tabs-tab {
font-size: 1rem !important;
font-size: 14px !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
......
......@@ -4,7 +4,7 @@
<div>
<a-button
:loading="btnLoading"
type="primary"
type="primary" class="addclass"
@click="handleExportTable"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
......@@ -40,7 +40,7 @@
>
</a-range-picker>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="handleReset">重置</a-button>
</a-space>
</span>
......
......@@ -20,7 +20,7 @@
<a-select-option value="5"> 自定义 </a-select-option>
</a-select>
<a-button type="primary" @click="getData">搜索</a-button>
<a-button type="primary" class="addclass" @click="getData">搜索</a-button>
</template>
</Head>
<div class="heat_box" v-if="data">
......
......@@ -20,7 +20,7 @@
<a-select-option value="5"> 自定义 </a-select-option>
</a-select>
<a-button type="primary" @click="getData">搜索</a-button>
<a-button type="primary" class="addclass" @click="getData">搜索</a-button>
</template>
</Head>
<div class="echarts">
......
......@@ -33,7 +33,7 @@
<div slot="footer">
<a-button style="margin-left: 10px" @click="resetForm">重置</a-button>
<a-button type="primary" @click="handleOk">确定</a-button>
<a-button type="primary" class="addclass" @click="handleOk">确定</a-button>
</div>
</a-modal>
</template>
......
......@@ -2,6 +2,7 @@
<a-layout class="Container">
<a-layout-header class="header_box">
<div class="logo">
<img style="width: 40px;margin-right: 20px;" src="@/assets/images/logo.jpg" alt="">
<i class="title">智慧大厅集成化综合管理平台</i>
<!-- <i class="title">智慧政务一体化综合管理平台4.0</i> -->
<div class="selectOnptions">
......
......@@ -36,7 +36,7 @@
/>
</a-form-model-item>
<a-form-model-item>
<a-button type="primary" class="backstage" @click="handleSubmit"
<a-button type="primary" class="addclass backstage" @click="handleSubmit"
>登录</a-button
>
</a-form-model-item>
......
......@@ -40,7 +40,7 @@
>
<div class="api-name">{{ v.apiName }}</div>
<span class="service-name">{{ v.systemServiceName }}</span>
<a-button icon="read" type="primary" @click="pushroeuter(v)">
<a-button icon="read" type="primary" class="addclass" @click="pushroeuter(v)">
查看文档
</a-button>
</div>
......
......@@ -49,7 +49,7 @@
失效时间:{{ $moment(itm.lapseTime).format("YYYY-MM-DD") }}
</div>
<a-button
type="primary"
type="primary" class="addclass"
@click="handleDowload(itm.packagePath, itm.systemServiceName)"
>
<a-icon type="download" />下载
......
......@@ -11,7 +11,7 @@
v-model="BegindAndEndTime"
>
</a-range-picker>
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button>
<a-button @click="resetSearch">重置</a-button>
</a-space>
</div>
......
......@@ -117,7 +117,7 @@
@change="handleChangeFile"
accept="image/jpeg,image/png"
>
<a-button type="primary">
<a-button type="primary" class="addclass" >
<a-icon type="upload" /> 选择文件
</a-button>
</a-upload>
......@@ -141,7 +141,7 @@
</a-form-model>
<template slot="footer">
<a-button @click="resetForm">重置</a-button>
<a-button type="primary" @click="Modal_Ok">确定</a-button>
<a-button type="primary" class="addclass" @click="Modal_Ok">确定</a-button>
</template>
</a-modal>
</div>
......
<template>
<div class="menuMgmt">
<div class="header_box">
<a-button type="primary" @click="showEditModal(1)">新增</a-button>
<a-button type="primary" class="addclass" @click="showEditModal(1)">新增</a-button>
<span>
<a-input v-model="searchForm.name" placeholder="请输入菜单名称搜索">
<a-icon slot="prefix" type="search" />
......@@ -13,7 +13,7 @@
</a-select-option>
</a-select>
<a-button type="primary" @click="searchData">搜索</a-button>
<a-button type="primary" class="addclass" @click="searchData">搜索</a-button>
<a-button @click="resetSearch">重置</a-button>
</span>
</div>
......
......@@ -4,7 +4,7 @@
<!-- <button class="addRoles_btn" @click="showRoleEditModal(false)">
<span>新增角色</span>
</button> -->
<a-button type="primary" @click="showRoleEditModal(false)"
<a-button type="primary" class="addclass" @click="showRoleEditModal(false)"
>新增角色</a-button
>
<span>
......@@ -19,7 +19,7 @@
<a-icon slot="prefix" type="search" />
</a-input> -->
<!-- <button class="search_btn" @click="getRoleList">搜索</button> -->
<!-- <a-button type="primary" @click="getRoleList">搜索</a-button> -->
<!-- <a-button type="primary" class="addclass" @click="getRoleList">搜索</a-button> -->
</span>
</div>
<div class="main">
......
......@@ -36,7 +36,7 @@
<div slot="footer">
<a-button style="margin-left: 10px" @click="handleClose">取消</a-button>
<a-button type="primary" @click="handleOk">确定</a-button>
<a-button type="primary" class="addclass" @click="handleOk">确定</a-button>
</div>
</a-modal>
</div>
......
......@@ -56,7 +56,7 @@
</a-form-model>
<div slot="footer">
<a-button style="margin-left: 10px" @click="resetForm">重置</a-button>
<a-button type="primary" @click="onSubmit">确定</a-button>
<a-button type="primary" class="addclass" @click="onSubmit">确定</a-button>
</div>
</a-modal>
</div>
......
......@@ -41,7 +41,7 @@
</a-form-model>
<template slot="footer">
<a-button @click="resetForm">重置</a-button>
<a-button type="primary" @click="roleEditModal_Ok">确定</a-button>
<a-button type="primary" class="addclass" @click="roleEditModal_Ok">确定</a-button>
</template>
</a-modal>
</div>
......
......@@ -80,7 +80,7 @@
</a-form-model>
<div slot="footer">
<a-button style="margin-left: 10px" @click="resetForm">重置</a-button>
<a-button type="primary" @click="onSubmit">确定</a-button>
<a-button type="primary" class="addclass" @click="onSubmit">确定</a-button>
</div>
</a-modal>
</div>
......
......@@ -164,7 +164,7 @@
</div>
</div>
<div class="bottom_">
<a-button type="primary" @click="save">保存</a-button>
<a-button type="primary" class="addclass" @click="save">保存</a-button>
<a-button @click="resetForm">重置</a-button>
</div>
</div>
......
......@@ -2,7 +2,7 @@
<div class="user">
<div class="user_btn">
<div class="add_btn">
<a-button type="primary" @click="addUserModal">新增用户</a-button>
<a-button type="primary" class="addclass" @click="addUserModal">新增用户</a-button>
</div>
<div class="search_btn">
<a-space>
......@@ -25,7 +25,7 @@
>{{ v.value }}</a-select-option
>
</a-select>
<a-button type="primary" @click="getUserList">搜索</a-button>
<a-button type="primary" class="addclass" @click="getUserList">搜索</a-button>
<a-button @click="resetList">重置</a-button>
</a-space>
</div>
......
......@@ -173,7 +173,7 @@
</template>
</a-table>
<div class="table_footer">
<a-button type="primary" @click="ceshidayin"> 添加参数 </a-button>
<a-button type="primary" class="addclass" @click="ceshidayin"> 添加参数 </a-button>
</div>
<h1 class="title_">响应数据</h1>
......@@ -221,11 +221,11 @@
</template>
</a-table>
<div class="table_footer">
<a-button type="primary" @click="ceshidayin"> 添加参数 </a-button>
<a-button type="primary" class="addclass" @click="ceshidayin"> 添加参数 </a-button>
</div>
<div class="drawer_footer">
<a-button type="primary" @click="modalClose"> 保存 </a-button>
<a-button type="primary" class="addclass" @click="modalClose"> 保存 </a-button>
<a-button @click="modalClose"> 取消 </a-button>
</div>
</a-form-model>
......
......@@ -28,7 +28,7 @@
</a-form-model-item>
</a-form-model>
<template slot="footer">
<a-button type="primary" @click="Modal_Ok">确定</a-button>
<a-button type="primary" class="addclass" @click="Modal_Ok">确定</a-button>
<a-button @click="resetForm">重置</a-button>
</template>
</a-modal>
......
......@@ -47,7 +47,7 @@
</a-form-model-item>
</a-form-model>
<template slot="footer">
<a-button type="primary" @click="Modal_Ok">确定</a-button>
<a-button type="primary" class="addclass" @click="Modal_Ok">确定</a-button>
<a-button @click="resetForm">取消</a-button>
</template>
</a-modal>
......
......@@ -40,7 +40,7 @@
</a-form-model-item>
</a-form-model>
<template slot="footer">
<a-button type="primary" @click="Modal_Ok">确定</a-button>
<a-button type="primary" class="addclass" @click="Modal_Ok">确定</a-button>
<a-button @click="resetForm">取消</a-button>
</template>
</a-modal>
......
......@@ -10,7 +10,7 @@
</h4>
</div>
<div class="main">
<a-button type="primary" ghost class="add_btn" @click="showModal(2)">
<a-button type="primary" class="addclass add_btn" ghost @click="showModal(2)">
新增产品
</a-button>
<ul class="content">
......@@ -19,12 +19,7 @@
<template slot="content">
<div class="popoverContent">
<p>
<a-button
type="link"
size="small"
style="color: #0595fd"
@click="showModal(1)"
>
<a-button type="link" size="small" style="color: #0595fd" @click="showModal(1)">
编辑
</a-button>
</p>
......@@ -64,7 +59,7 @@ export default {
components: {
AddEditAppName,
},
mounted() {},
mounted() { },
methods: {
pushroeuter() {
this.$router.push({
......@@ -107,9 +102,11 @@ export default {
<style lang="less" scoped>
@headerH: 4.5rem;
.Container {
height: 100%;
background: #f5f5f5;
.search_box {
height: 20rem;
background: url("~@/assets/images/u210.png") top no-repeat;
......@@ -118,21 +115,25 @@ export default {
align-items: center;
display: flex;
flex-flow: column;
h3 {
font-size: 2rem;
color: #fff;
font-weight: bold;
padding: 4rem 0 2rem;
}
h4 {
display: flex;
align-items: center;
}
/deep/.ant-input {
width: 30rem !important;
margin-right: 2rem;
height: 3rem !important;
}
.search_btn {
width: 7rem;
height: 3rem;
......@@ -152,7 +153,8 @@ export default {
line-height: 3rem;
padding: 0;
border: none;
& > span {
&>span {
position: relative;
display: block;
width: 100%;
......@@ -196,8 +198,8 @@ export default {
width: 100%;
}
& > span:before,
& > span:after {
&>span:before,
&>span:after {
position: absolute;
content: "";
left: 0;
......@@ -210,25 +212,26 @@ export default {
transition: all 0.3s ease;
}
& > span:before {
&>span:before {
width: 2px;
height: 0%;
}
& > span:after {
&>span:after {
height: 2px;
width: 0%;
}
& > span:hover:before {
&>span:hover:before {
height: 100%;
}
& > span:hover:after {
&>span:hover:after {
width: 100%;
}
}
}
.main {
width: 75rem;
margin: -40px auto 0;
......@@ -237,16 +240,18 @@ export default {
box-shadow: 0 2px 5px 1px #ddd;
border: 1px solid #d7dae2;
overflow: hidden;
& > .add_btn {
&>.add_btn {
margin: 15px;
}
& > .content {
&>.content {
display: flex;
flex-wrap: wrap;
border-top: 1px solid #d7dae2;
border-bottom: 1px solid #d7dae2;
& > .list {
&>.list {
width: 25%;
padding: 15px;
display: flex;
......@@ -255,7 +260,7 @@ export default {
border-right: 1px solid #d7dae2;
border-bottom: 1px solid #d7dae2;
& > .app-operation {
&>.app-operation {
margin: 8px 0;
height: 25px;
width: 25px;
......@@ -265,27 +270,31 @@ export default {
left: 90%;
cursor: pointer;
}
& > .app-img {
&>.app-img {
width: 108px;
height: 108px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
margin: 8px auto;
border-radius: 6px;
}
& > .app-name {
&>.app-name {
font-weight: bold;
font-size: 18px;
text-align: center;
margin: 8px 0;
}
& > .app-option {
&>.app-option {
margin: 8px 0;
color: #0595fd;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 14px;
& > li {
&>li {
cursor: pointer;
}
}
......@@ -299,22 +308,15 @@ export default {
width: 100%;
height: @headerH;
background: rgb(59, 135, 255);
background: -moz-linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%
);
background: -webkit-linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%
);
background: linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%
);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff",endColorstr="#6c35f7",GradientType=1);
background: -moz-linear-gradient(174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%);
background: -webkit-linear-gradient(174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%);
background: linear-gradient(174deg,
rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1);
}
}
</style>
}</style>
......@@ -106,6 +106,15 @@ spring:
metadata:
response-timeout: 200000
connect-timeout: 200000
# 证照打印
- id: certificate-manager
#uri: http://192.168.0.98:21080
uri: lb://certificate-manager
predicates:
- Path=/cpm/**
metadata:
response-timeout: 200000
connect-timeout: 200000
nacos:
# Nacos 作为注册中心的配置项,对应 NacosDiscoveryProperties 配置类
discovery:
......
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