Skip to content

S
smart_gov_platform
Commit 0945abb5 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 78ed4383 122afe1b
Show whitespace changes
Inline Side-by-side
Showing with 907 additions and 606 deletions
base-manager-ui/admin/.env
View file @ 0945abb5
...@@ -11,3 +11,5 @@ VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles ...@@ -11,3 +11,5 @@ VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
#门户 #门户
VUE_APP_API_portal_URL=http://192.168.0.98:11072 VUE_APP_API_portal_URL=http://192.168.0.98:11072
# VUE_APP_API_portal_URL=http://10.12.185.213:11072 # VUE_APP_API_portal_URL=http://10.12.185.213:11072
# 系统名称
VUE_APP_sysName = "基础设置"
\ No newline at end of file
base-manager-ui/admin/public/index.html
View file @ 0945abb5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<!-- <title><%= process.env.VUE_APP_NAME %></title> --> <!-- <title><%= process.env.VUE_APP_NAME %></title> -->
<title>基础设置系统</title> <title></title>
<!-- require cdn assets css --> <!-- require cdn assets css -->
<% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %> <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
<link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" /> <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
......
base-manager-ui/admin/src/layouts/Layouts.vue
View file @ 0945abb5
...@@ -4,8 +4,14 @@ ...@@ -4,8 +4,14 @@
<a-layout-header class="header"> <a-layout-header class="header">
<div class="flex aic"> <div class="flex aic">
<router-link to="/" class="flex aic"> <router-link to="/" class="flex aic">
<img class="mr10" width="32" src="@/assets/img/logo.png" /> <img
<h1 class="title">基础设置系统</h1> class="mr10"
width="32"
:src="sysLogo ? api + sysLogo : require('@/assets/img/logo.png')"
/>
<h1 class="title">
{{ sysName ? sysName : systemName }}
</h1>
</router-link> </router-link>
<HeaderSite class="ml20"></HeaderSite> <HeaderSite class="ml20"></HeaderSite>
</div> </div>
...@@ -57,14 +63,19 @@ export default { ...@@ -57,14 +63,19 @@ export default {
}, },
data() { data() {
return { return {
systemName: process.env.VUE_APP_sysName,
api: process.env.VUE_APP_API_IMG_URL,
portalUrl: process.env.VUE_APP_API_portal_URL, // 门户地址 portalUrl: process.env.VUE_APP_API_portal_URL, // 门户地址
visibleInit: false, visibleInit: false,
}; };
}, },
computed: { computed: {
...mapState("setting", ["systemName", "menuData"]), ...mapState("site", ["sysName", "sysLogo"]),
...mapState("setting", ["menuData"]),
},
created() {
document.title = this.sysName ? this.sysName : this.systemName; // 设置项目标题
}, },
created() {},
methods: {}, methods: {},
}; };
</script> </script>
...@@ -87,8 +98,10 @@ export default { ...@@ -87,8 +98,10 @@ export default {
color: #fff; color: #fff;
} }
.title { .title {
font-size: 20px;
font-weight: bold; font-weight: bold;
font-size: 18px;
max-width: 200px;
line-height: normal;
} }
} }
.main { .main {
......
base-manager-ui/admin/src/layouts/header/AdminHeader.vue
View file @ 0945abb5
...@@ -8,8 +8,13 @@ ...@@ -8,8 +8,13 @@
to="/" to="/"
:class="['logo', isMobile ? null : 'pc', headerTheme]" :class="['logo', isMobile ? null : 'pc', headerTheme]"
> >
<img width="32" src="@/assets/img/logo.png" /> <img
<h1 v-if="!isMobile" style="padding-left: 10px">{{ systemName }}</h1> width="32"
:src="sysLogo ? api + sysLogo : require('@/assets/img/logo.png')"
/>
<h1 class="title" v-if="!isMobile" style="padding-left: 10px">
{{ sysName ? sysName : systemName }}
</h1>
</router-link> </router-link>
<a-divider v-if="isMobile" type="vertical" /> <a-divider v-if="isMobile" type="vertical" />
<a-icon <a-icon
...@@ -84,6 +89,8 @@ export default { ...@@ -84,6 +89,8 @@ export default {
props: ["collapsed", "menuData"], props: ["collapsed", "menuData"],
data() { data() {
return { return {
api: process.env.VUE_APP_API_IMG_URL,
systemName: process.env.VUE_APP_sysName,
visibleInit: false, visibleInit: false,
langList: [ langList: [
{ key: "CN", name: "简体中文", alias: "简体" }, { key: "CN", name: "简体中文", alias: "简体" },
...@@ -95,6 +102,7 @@ export default { ...@@ -95,6 +102,7 @@ export default {
}; };
}, },
computed: { computed: {
...mapState("site", ["sysName", "sysLogo"]),
...mapState("setting", [ ...mapState("setting", [
"theme", "theme",
"isMobile", "isMobile",
...@@ -127,7 +135,9 @@ export default { ...@@ -127,7 +135,9 @@ export default {
return `calc(${headWidth} - ${extraWidth})`; return `calc(${headWidth} - ${extraWidth})`;
}, },
}, },
created() {}, created() {
document.title = this.sysName ? this.sysName : this.systemName; // 设置项目标题
},
methods: { methods: {
toggleCollapse() { toggleCollapse() {
this.$emit("toggleCollapse"); this.$emit("toggleCollapse");
...@@ -142,4 +152,10 @@ export default { ...@@ -142,4 +152,10 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import "index"; @import "index";
.title {
font-weight: bold;
font-size: 18px;
max-width: 200px;
line-height: normal;
}
</style> </style>
base-manager-ui/admin/src/pages/basicset/jump/jump.vue
View file @ 0945abb5
...@@ -20,22 +20,22 @@ export default { ...@@ -20,22 +20,22 @@ export default {
"SET_token", "SET_token",
"SET_SITE_ID", "SET_SITE_ID",
"SET_siteName", "SET_siteName",
"SET_sysName",
"SET_sysLogo",
]), ]),
// 获取token // 获取token
getToken() { getToken() {
let token = this.$route.query.token; let { token, userInfo, siteid, siteName, sysName, sysLogo } =
let userInfo = this.$route.query.userInfo; this.$route.query;
let siteId = this.$route.query.siteid;
let siteName = this.$route.query.siteName;
if (token && userInfo) { if (token && userInfo) {
userInfo = JSON.parse(userInfo); userInfo = JSON.parse(userInfo);
this.SET_userInfo(userInfo); this.SET_userInfo(userInfo);
this.SET_token(token); this.SET_token(token);
this.SET_SITE_ID(siteId); this.SET_SITE_ID(siteid);
this.SET_siteName(siteName); this.SET_siteName(siteName);
// local.setLocal("token", token); this.SET_sysName(sysName);
// local.setLocal("baseUserInfo", userInfo); this.SET_sysLogo(sysLogo);
local.setLocal("siteId", siteId); local.setLocal("siteId", siteid);
local.setLocal("siteName", siteName); local.setLocal("siteName", siteName);
this.$router.push("/website"); this.$router.push("/website");
} else { } else {
......
base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue
View file @ 0945abb5
...@@ -822,7 +822,7 @@ export default { ...@@ -822,7 +822,7 @@ export default {
} }
.ant-checkbox-group { .ant-checkbox-group {
display: grid; display: grid;
grid-template-columns: 160px 160px 160px 160px 160px 160px; grid-template-columns: 260px 260px 260px 260px;
} }
.ant-checkbox-wrapper { .ant-checkbox-wrapper {
margin-left: 0px; margin-left: 0px;
......
base-manager-ui/admin/src/pages/basicset/site/website.vue
View file @ 0945abb5
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<div class="deploy_module"> <div class="deploy_module">
<div class="color_title">部署模块</div> <div class="color_title">部署模块</div>
<a-row> <a-row>
<a-col :span="20"> <a-col :span="24">
<div class="item_box"> <div class="item_box">
<div <div
class="item" class="item"
...@@ -533,13 +533,16 @@ export default { ...@@ -533,13 +533,16 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.item { .item {
width: 120px; width: 140px;
height: 54px;
display: flex;
align-items: center;
justify-content: center;
background-color: rgba(30, 159, 255, 0.2); background-color: rgba(30, 159, 255, 0.2);
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
padding: 6px; padding: 6px;
border-radius: 5px; border-radius: 5px;
text-align: center;
} }
} }
} }
......
base-manager-ui/admin/src/store/modules/site.js
View file @ 0945abb5
export default { export default {
namespaced: true, namespaced: true,
state: { state: {
sysName: "", // 系统名称
sysLogo: "", // 系统logo
siteId: "", // 站点id siteId: "", // 站点id
siteName: "", // 站点名称 siteName: "", // 站点名称
imageResolution: [], // 皮肤设置分辨率 imageResolution: [], // 皮肤设置分辨率
...@@ -38,6 +40,12 @@ export default { ...@@ -38,6 +40,12 @@ export default {
}, },
}, },
mutations: { mutations: {
SET_sysName(state, sysName) {
state.sysName = sysName;
},
SET_sysLogo(state, sysLogo) {
state.sysLogo = sysLogo;
},
SET_siteName(state, siteName) { SET_siteName(state, siteName) {
state.siteName = siteName; state.siteName = siteName;
}, },
......
base-manager/pom.xml
View file @ 0945abb5
...@@ -63,6 +63,27 @@ ...@@ -63,6 +63,27 @@
</properties> </properties>
</profile> </profile>
<profile>
<id>product</id>
<properties>
<profiles.active>product</profiles.active>
<profiles.server.path>/base</profiles.server.path>
<profiles.publish.path>/home/publish</profiles.publish.path>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>info</profiles.log.level>
<package.environment>build</package.environment>
<skipUi>false</skipUi>
</properties>
</profile>
<profile> <profile>
<id>yibin</id> <id>yibin</id>
<properties> <properties>
......
portal-manager-ui/admin/.env.development
View file @ 0945abb5
# 开发环境配置 # 开发环境配置
NODE_ENV = development NODE_ENV = development
VUE_APP_API_BASE_URL=http://8.136.255.30:11078 #VUE_APP_API_BASE_URL=http://8.136.255.30:11078
VUE_APP_API_BASE_URL=http://192.168.0.98:11078
#图片显示拼接 #图片显示拼接
VUE_APP_API_IMG_URL=http://8.136.255.30:11078/ VUE_APP_API_IMG_URL=http://8.136.255.30:11078/
#余林 #余林
VUE_APP_API_PHP_URL=http://8.136.255.30:8090 #VUE_APP_API_PHP_URL=http://8.136.255.30:8090
VUE_APP_API_PHP_URL=http://192.168.0.98:8090
#宜宾 #宜宾
#VUE_APP_API_BASE_URL=http://10.12.185.213:11072 #VUE_APP_API_BASE_URL=http://10.12.185.213:11072
portal-manager-ui/admin/src/router/routes.js
View file @ 0945abb5
...@@ -156,7 +156,7 @@ const routes = [ ...@@ -156,7 +156,7 @@ const routes = [
import( import(
/* webpackChunkName: "easyPoliticsShow" */ "@/views/dataAdmin/components/easyPoliticsShow/module.vue" /* webpackChunkName: "easyPoliticsShow" */ "@/views/dataAdmin/components/easyPoliticsShow/module.vue"
), ),
meta: { title: "易政秀报表" }, meta: { title: "在线制作记录报表" },
children: [ children: [
{ {
path: "PoliticsShow", path: "PoliticsShow",
...@@ -165,7 +165,7 @@ const routes = [ ...@@ -165,7 +165,7 @@ const routes = [
import( import(
/* webpackChunkName: "PoliticsShow" */ "@/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue" /* webpackChunkName: "PoliticsShow" */ "@/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue"
), ),
meta: { title: "易政秀报表" }, meta: { title: "在线制作记录报表" },
}, },
], ],
}, },
...@@ -453,7 +453,7 @@ const routes = [ ...@@ -453,7 +453,7 @@ const routes = [
/* webpackChunkName: "dataActuary" */ "@/views/dataActuary/business/index.vue" /* webpackChunkName: "dataActuary" */ "@/views/dataActuary/business/index.vue"
), ),
meta: { title: "业务数据分析" }, meta: { title: "业务数据分析" },
redirect: 'dataActuary/business/basecontent', redirect: "dataActuary/business/basecontent",
children: [ children: [
{ {
path: "basecontent", path: "basecontent",
...@@ -473,7 +473,7 @@ const routes = [ ...@@ -473,7 +473,7 @@ const routes = [
), ),
meta: { title: "分析结果" }, meta: { title: "分析结果" },
}, },
] ],
}, },
{ {
path: "dataActuary/portrayal", path: "dataActuary/portrayal",
...@@ -483,7 +483,7 @@ const routes = [ ...@@ -483,7 +483,7 @@ const routes = [
/* webpackChunkName: "dataActuary" */ "@/views/dataActuary/portrayal/index.vue" /* webpackChunkName: "dataActuary" */ "@/views/dataActuary/portrayal/index.vue"
), ),
meta: { title: "群众画像图谱" }, meta: { title: "群众画像图谱" },
redirect: 'dataActuary/portrayal/portrayalbase', redirect: "dataActuary/portrayal/portrayalbase",
children: [ children: [
{ {
path: "portrayalbase", path: "portrayalbase",
...@@ -503,7 +503,7 @@ const routes = [ ...@@ -503,7 +503,7 @@ const routes = [
), ),
meta: { title: "分析结果" }, meta: { title: "分析结果" },
}, },
] ],
}, },
{ {
path: "dataActuary/portrayal/register", path: "dataActuary/portrayal/register",
......
portal-manager-ui/admin/src/views/NotFoundView/NotFoundView.vue
View file @ 0945abb5
<template> <template>
<div class="view"> <div class="view">
<a-result <a-result status="404" title="404" sub-title="暂无内容">
status="404"
title="404"
sub-title="Sorry, the page you visited does not exist."
>
<template #extra> <template #extra>
<a-button type="primary" class="addclass" @click="$router.push('/home')"> <a-button type="primary" class="addclass" @click="$router.push(url)">
返回首页 返回首页
</a-button> </a-button>
</template> </template>
...@@ -19,12 +15,18 @@ export default { ...@@ -19,12 +15,18 @@ export default {
name: "PortalAdminVueNotFoundView", name: "PortalAdminVueNotFoundView",
data() { data() {
return {}; return {
url: "/home",
};
},
created() {
this.$route.path.indexOf("/home/thePlatformIsSet") == 0
? (this.url = "/home/thePlatformIsSet")
: "";
}, },
mounted() {},
methods: {}, methods: {},
watch: {},
}; };
</script> </script>
......
portal-manager-ui/admin/src/views/dataActuary/business/analysiscontent/index.vue
View file @ 0945abb5
...@@ -118,8 +118,9 @@ import {getBusInfoById} from '@/api/dataActuary.js' ...@@ -118,8 +118,9 @@ import {getBusInfoById} from '@/api/dataActuary.js'
} }
}, },
methods: { methods: {
async getAnalysisData() { async getAnalysisData(selected) {
const res = await getBusInfoById({busid: this.checkId, siteid: localStorage.getItem('siteId') }) let pramse = (selected || selected===0 ||selected==='0')?{busid: this.checkId, siteid: localStorage.getItem('siteId'),selected:selected }:{busid: this.checkId, siteid: localStorage.getItem('siteId') }
const res = await getBusInfoById(pramse)
if(res.code == 1){ if(res.code == 1){
if (res.data.phone) this.testWay.push('手机号') if (res.data.phone) this.testWay.push('手机号')
if (res.data.idcardtake) this.testWay.push('身份证') if (res.data.idcardtake) this.testWay.push('身份证')
...@@ -136,8 +137,8 @@ import {getBusInfoById} from '@/api/dataActuary.js' ...@@ -136,8 +137,8 @@ import {getBusInfoById} from '@/api/dataActuary.js'
} }
} }
}, },
handleChange(){ handleChange(e){
this.getAnalysisData() this.getAnalysisData(e)
} }
}, },
} }
......
portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue
View file @ 0945abb5
...@@ -12,28 +12,20 @@ ...@@ -12,28 +12,20 @@
v-model="checkboxVALUE" v-model="checkboxVALUE"
@change="checkboxonChange" @change="checkboxonChange"
/> />
<a-input <a-input allowClear v-model="Query.workman_name" placeholder="请输入工作人员姓名查询 ">
allowClear
v-model="Query.workman_name"
placeholder="请输入工作人员姓名查询 "
>
<a-icon slot="prefix" type="search" /> <a-icon slot="prefix" type="search" />
</a-input> </a-input>
<a-select v-model="Query.window_id" placeholder="请选择窗口"> <a-select v-model="Query.window_id" placeholder="请选择窗口">
<a-select-option value=""> 全部 </a-select-option> <a-select-option value>全部</a-select-option>
<a-select-option <a-select-option
v-for="(item, index) of windowData" v-for="(item, index) of windowData"
:key="index" :key="index"
:value="item.id" :value="item.id"
> >{{ item.englishName }} - {{ item.fromnum }}</a-select-option>
{{ item.englishName }} - {{ item.fromnum }}
</a-select-option>
</a-select> </a-select>
<a-select v-model="Query.warn_alert" placeholder="请选择类型"> <a-select v-model="Query.warn_alert" placeholder="请选择类型">
<a-select-option value=""> 全部 </a-select-option> <a-select-option value>全部</a-select-option>
<a-select-option v-for="(item, i) in warn_alert" :key="i" :value="i"> <a-select-option v-for="(item, i) in warn_alert" :key="i" :value="i">{{ item }}</a-select-option>
{{ item }}
</a-select-option>
</a-select> </a-select>
<a-range-picker <a-range-picker
...@@ -41,12 +33,9 @@ ...@@ -41,12 +33,9 @@
valueFormat="yyyy-MM-DD" valueFormat="yyyy-MM-DD"
class="range_picker_style" class="range_picker_style"
v-model="Query.time" v-model="Query.time"
> ></a-range-picker>
</a-range-picker>
<a-button type="primary" class="addclass" @click="onGetKqalert" <a-button type="primary" class="addclass" @click="onGetKqalert">搜索</a-button>
>搜索</a-button
>
</span> </span>
</div> </div>
<div class="main"> <div class="main">
...@@ -66,9 +55,7 @@ ...@@ -66,9 +55,7 @@
:dataSource="tableSourceData" :dataSource="tableSourceData"
> >
<template slot="operation" slot-scope="text, record"> <template slot="operation" slot-scope="text, record">
<a-button type="link" @click="openDetails" <a-button type="link" @click="openDetails">查看详情{{ record.id }}</a-button>
>查看详情{{ record.id }}</a-button
>
</template> </template>
</a-table> </a-table>
</div> </div>
...@@ -86,7 +73,7 @@ const warn_alert = { ...@@ -86,7 +73,7 @@ const warn_alert = {
2: "离开", 2: "离开",
4: "玩手机", 4: "玩手机",
5: "扶头", 5: "扶头",
6: "趴桌", 6: "趴桌"
}; };
const tHeader = [ const tHeader = [
"序号", "序号",
...@@ -110,7 +97,7 @@ const filterVal = [ ...@@ -110,7 +97,7 @@ const filterVal = [
"out_time", "out_time",
"duration", "duration",
"isaccuracy", "isaccuracy",
"have_process_name", "have_process_name"
]; ];
export default { export default {
mixins: [table], mixins: [table],
...@@ -124,15 +111,15 @@ export default { ...@@ -124,15 +111,15 @@ export default {
warn_alert: "", //1离岗，2离开 4:玩手机 5:扶头 6:趴桌 warn_alert: "", //1离岗，2离开 4:玩手机 5:扶头 6:趴桌
window_id: "", //窗口ID window_id: "", //窗口ID
workman_name: "", //工作人员姓名 workman_name: "", //工作人员姓名
time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间 time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")] // 时间区间
}, //查询条件 }, //查询条件
checkboxVALUE: [], checkboxVALUE: [],
BegindAndEndTime: [], BegindAndEndTime: [],
checkboxOptions: [ checkboxOptions: [
{ {
label: "只看未处理", label: "只看未处理",
value: "0", value: "0"
}, }
], ],
tableHeaders: [ tableHeaders: [
{ {
...@@ -141,54 +128,54 @@ export default { ...@@ -141,54 +128,54 @@ export default {
width: "60px", width: "60px",
key: "index", key: "index",
align: "center", align: "center",
customRender: (text, record, index) => `${index + 1}`, customRender: (text, record, index) => `${index + 1}`
}, },
{ {
title: "报警类型", title: "报警类型",
dataIndex: "warn_alert", dataIndex: "warn_alert",
customRender: (text, record) => warn_alert[text], customRender: (text, record) => warn_alert[text]
}, },
{ {
title: "发生窗口", title: "发生窗口",
dataIndex: "window_name", dataIndex: "window_name",
customRender: (text, record) => (text ? text : "--"), customRender: (text, record) => (text ? text : "--")
}, },
{ {
title: "工作人员", title: "工作人员",
dataIndex: "workman_name", dataIndex: "workman_name",
customRender: (text, record) => (text ? text : "--"), customRender: (text, record) => (text ? text : "--")
}, },
{ {
title: "所属部门", title: "所属部门",
dataIndex: "section_name", dataIndex: "section_name",
customRender: (text, record) => (text ? text : "--"), customRender: (text, record) => (text ? text : "--")
}, },
{ {
title: "手机号", title: "手机号",
dataIndex: "workman_phone", dataIndex: "workman_phone",
customRender: (text, record) => (text ? text : "--"), customRender: (text, record) => (text ? text : "--")
}, },
{ {
title: "发生时间", title: "发生时间",
dataIndex: "out_time", dataIndex: "out_time",
customRender: (text, record) => customRender: (text, record) =>
text ? this.timestampToTime(text) : "--", text ? this.timestampToTime(text) : "--"
}, },
{ {
title: "时长", title: "时长",
dataIndex: "duration", dataIndex: "duration",
customRender: (text, record) => (text ? text : "--"), customRender: (text, record) => (text ? text : "--")
}, },
{ {
title: "是否准确", title: "是否准确",
dataIndex: "isaccuracy", dataIndex: "isaccuracy",
customRender: (text, record) => (text == 1 ? "准确" : "--"), customRender: (text, record) => (text == 1 ? "准确" : "--")
}, },
{ {
title: "是否处理", title: "是否处理",
dataIndex: "have_process_name", dataIndex: "have_process_name",
customRender: (text, record) => (text ? text : "--"), customRender: (text, record) => (text ? text : "--")
}, }
// { // {
// title: "操作", // title: "操作",
// align: "center", // align: "center",
...@@ -199,7 +186,7 @@ export default { ...@@ -199,7 +186,7 @@ export default {
// }, // },
// }, // },
], ],
searchName: undefined, searchName: undefined
}; };
}, },
components: {}, components: {},
...@@ -211,7 +198,7 @@ export default { ...@@ -211,7 +198,7 @@ export default {
methods: { methods: {
// 时间戳转换为日期 // 时间戳转换为日期
timestampToTime(timestamp) { timestampToTime(timestamp) {
var date = new Date(timestamp*1000); var date = new Date(timestamp * 1000);
var Y = date.getFullYear() + "-"; var Y = date.getFullYear() + "-";
var M = var M =
(date.getMonth() + 1 < 10 (date.getMonth() + 1 < 10
...@@ -235,10 +222,11 @@ export default { ...@@ -235,10 +222,11 @@ export default {
await getKqalert({ await getKqalert({
...this.Query, ...this.Query,
page: 1, page: 1,
size: -1, size: -1
}) })
); );
data = datas.data.data; data = datas.data.data;
}
data.forEach((text, i) => { data.forEach((text, i) => {
text.index = i + 1; text.index = i + 1;
text.isaccuracy = text.isaccuracy == 1 ? "准确" : "--"; text.isaccuracy = text.isaccuracy == 1 ? "准确" : "--";
...@@ -246,6 +234,10 @@ export default { ...@@ -246,6 +234,10 @@ export default {
? this.timestampToTime(text.out_time) ? this.timestampToTime(text.out_time)
: "--"; : "--";
}); });
// debugger
console.log(data,11111);
if (!data.length) return; if (!data.length) return;
export2Excel( export2Excel(
...@@ -254,15 +246,14 @@ export default { ...@@ -254,15 +246,14 @@ export default {
data, data,
"AI效能监察异常行为数据报表" + this.$moment().format("YYYYMMDDHHmmss") "AI效能监察异常行为数据报表" + this.$moment().format("YYYYMMDDHHmmss")
); );
}
}, },
// 报表接口 // 报表接口
onGetKqalert() { onGetKqalert() {
getKqalert({ getKqalert({
...this.Query, ...this.Query,
page: this.tablePagination.current, page: this.tablePagination.current,
size: this.tablePagination.pageSize, size: this.tablePagination.pageSize
}).then((res) => { }).then(res => {
const { code, data } = res; const { code, data } = res;
if (code == 1) { if (code == 1) {
this.tableSourceData = data.data; this.tableSourceData = data.data;
...@@ -275,8 +266,8 @@ export default { ...@@ -275,8 +266,8 @@ export default {
windowList({ windowList({
page: 1, page: 1,
size: -1, size: -1,
siteId: JSON.parse(localStorage.getItem("siteId")), siteId: JSON.parse(localStorage.getItem("siteId"))
}).then((res) => { }).then(res => {
const { code, data } = res; const { code, data } = res;
if (code == 1) { if (code == 1) {
this.windowData = data.data; this.windowData = data.data;
...@@ -308,8 +299,8 @@ export default { ...@@ -308,8 +299,8 @@ export default {
default: default:
return "type0"; return "type0";
} }
}, }
}, }
}; };
</script> </script>
......
portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue
View file @ 0945abb5
...@@ -4,42 +4,79 @@ ...@@ -4,42 +4,79 @@
<div> <div>
<a-button <a-button
:loading="btnLoading" :loading="btnLoading"
type="primary" class="addclass" type="primary"
class="addclass"
@click="handleExportTable" @click="handleExportTable"
> >
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button> </a-button>
<b>用户总数：<i>{{tableData.total}}人</i></b> <b
<b>试用客户：<i>{{tableData.trial}}人</i></b> >用户总数：<i>{{ tableData.total }}人</i></b
<b>VIP：<i>{{tableData.vip}}人</i></b> >
<b>设计师：<i>{{tableData.designer}}人</i></b> <b
<b>图片作品数：<i>{{tableData.picturesCount}}个</i></b> >试用客户：<i>{{ tableData.trial }}人</i></b
<b>视频作品数：<i>{{tableData.videosCount}}个</i></b> >
<!-- <b>VIP：<i>{{tableData.vip}}人</i></b> -->
<b
>设计师：<i>{{ tableData.designer }}人</i></b
>
<b
>图片作品数：<i>{{ tableData.picturesCount }}个</i></b
>
<b
>视频作品数：<i>{{ tableData.videosCount }}个</i></b
>
</div> </div>
<span class="topBoxFlex"> <span class="topBoxFlex">
<a-input allowClear v-model="searchForm.query" placeholder="请输入用户姓名/手机号搜索"> <a-space>
<a-input
allowClear
v-model="searchForm.query"
placeholder="请输入用户姓名/手机号搜索"
>
<a-icon slot="prefix" type="search" /> <a-icon slot="prefix" type="search" />
</a-input> </a-input>
<a-select v-model="searchForm.memberLevel"> <a-select v-model="searchForm.memberLevel">
<a-select-option value=""> 全部 </a-select-option> <a-select-option value=""> 全部 </a-select-option>
<a-select-option v-for="(item, index) of levelList" :key="index" :value="index"> <a-select-option
v-for="(item, index) of levelList"
:key="index"
:value="index"
>
{{ item }} {{ item }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-button type="primary" class="addclass" @click="getList">搜索</a-button> <a-button type="primary" class="addclass" @click="getList"
>搜索</a-button
>
</a-space>
</span> </span>
</div> </div>
<div class="main"> <div class="main">
<a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{ <a-table
size="small"
bordered
:row-key="(record) => record.id"
:row-selection="{
selectedRowKeys: tableSelectedKeys, selectedRowKeys: tableSelectedKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading" }"
:columns="tableHeaders" :dataSource="tableList"> :scroll="{ y: 590 }"
<template slot="zhenshixingming" slot-scope="text, record, index"> :pagination="tablePagination"
<a-button type="link" @click="openUserDetails(record)">{{ text?text:'--' }}</a-button> @change="pagTableChange"
:loading="tableLoading"
:columns="tableHeaders"
:dataSource="tableList"
>
<template slot="zhenshixingming" slot-scope="text, record">
<a-button type="link" @click="openUserDetails(record)">{{
text ? text : "--"
}}</a-button>
</template> </template>
<template slot="tupianzuopinshuliang" slot-scope="text, record, index"> <template slot="tupianzuopinshuliang" slot-scope="text, record">
<a-button type="link" @click="openPicWorks(record.id)">{{ (text || text==0)?text:'--' }}</a-button> <a-button type="link" @click="openPicWorks(record.id)">{{
text || text == 0 ? text : "--"
}}</a-button>
</template> </template>
</a-table> </a-table>
<PicWorks ref="PicWorks" /> <PicWorks ref="PicWorks" />
...@@ -53,15 +90,13 @@ import table from "@/mixins/table"; ...@@ -53,15 +90,13 @@ import table from "@/mixins/table";
import UserDetails from "./components/UserDetails.vue"; import UserDetails from "./components/UserDetails.vue";
import PicWorks from "./components/PicWorks.vue"; import PicWorks from "./components/PicWorks.vue";
import { export2Excel } from "@/utils/js/exportExcel"; import { export2Excel } from "@/utils/js/exportExcel";
import { import { getCustomer } from "@/api/customer";
getCustomer
} from "@/api/customer";
const levelList = { const levelList = {
0: '未开启', 0: "未开启",
1: '试用客户', 1: "试用客户",
2: 'VIP', // 2: "VIP",
3: '设计师' 3: "设计师",
} };
export default { export default {
mixins: [table], mixins: [table],
name: "PortalAdminVuePoliticsShow", name: "PortalAdminVuePoliticsShow",
...@@ -70,19 +105,23 @@ export default { ...@@ -70,19 +105,23 @@ export default {
btnLoading: false, btnLoading: false,
levelList: levelList, levelList: levelList,
tableList: [], tableList: [],
tableData:{}, tableData: {},
searchForm: { searchForm: {
query: "",//姓名手机号查询条件 query: "", //姓名手机号查询条件
memberLevel: "",//会员等级查询条件 memberLevel: "", //会员等级查询条件
customerSrc: "",//客户来源查询条件 customerSrc: "", //客户来源查询条件
}, },
tableHeaders: [{ tableHeaders: [
{
title: "序号", title: "序号",
dataIndex: "index", dataIndex: "index",
width: "60px", width: "60px",
key: "index", key: "index",
align: "center", align: "center",
customRender: (text, record, index) => `${index + 1}`, customRender: (text, record, index) =>
(this.tablePagination.current - 1) * this.tablePagination.pageSize +
index +
1,
}, },
{ {
title: "真实姓名", title: "真实姓名",
...@@ -96,13 +135,13 @@ export default { ...@@ -96,13 +135,13 @@ export default {
title: "联系电话", title: "联系电话",
align: "center", align: "center",
dataIndex: "contactTelphone", dataIndex: "contactTelphone",
customRender: (text) => `${text?text:'--'}`, customRender: (text) => `${text ? text : "--"}`,
}, },
{ {
title: "单位名称", title: "单位名称",
align: "center", align: "center",
dataIndex: "organization", dataIndex: "organization",
customRender: (text) => `${text?text:'--'}`, customRender: (text) => `${text ? text : "--"}`,
}, },
{ {
title: "图片作品数量", title: "图片作品数量",
...@@ -116,7 +155,7 @@ export default { ...@@ -116,7 +155,7 @@ export default {
title: "视频作品数量", title: "视频作品数量",
align: "center", align: "center",
dataIndex: "customerDesignVideos", dataIndex: "customerDesignVideos",
customRender: (text) => `${(text || text==0)?text:'--'}`, customRender: (text) => `${text || text == 0 ? text : "--"}`,
}, },
{ {
title: "会员等级", title: "会员等级",
...@@ -128,22 +167,22 @@ export default { ...@@ -128,22 +167,22 @@ export default {
title: "最近登录时间", title: "最近登录时间",
align: "center", align: "center",
dataIndex: "lastLoginTime", dataIndex: "lastLoginTime",
customRender: (text) => `${text?text:'--'}`, customRender: (text) => `${text ? text : "--"}`,
}, },
{ {
title: "使用状态", title: "使用状态",
align: "center", align: "center",
dataIndex: "status", dataIndex: "status",
customRender: (text, record, index) => text == 1 ? '正常' : '禁用', customRender: (text, record, index) => (text == 1 ? "正常" : "禁用"),
}, },
], ],
searchName: undefined, searchName: undefined,
tablePagination:{ tablePagination: {
current:1, current: 1,
pageSize:10 pageSize: 10,
}, },
tableSelectedKeys:[], tableSelectedKeys: [],
tableSelectedRows:[], tableSelectedRows: [],
tHeader: [ tHeader: [
// 导出的表头名信息 // 导出的表头名信息
"真实姓名", "真实姓名",
...@@ -164,7 +203,7 @@ export default { ...@@ -164,7 +203,7 @@ export default {
"customerDesignVideos", "customerDesignVideos",
"memberLevel", "memberLevel",
"lastLoginTime", "lastLoginTime",
"status" "status",
], ],
}; };
}, },
...@@ -188,22 +227,18 @@ export default { ...@@ -188,22 +227,18 @@ export default {
...search, ...search,
}); });
if (res.code == 1) { if (res.code == 1) {
let { let { data, total, pageInfo } = res.data;
data,
total,
pageInfo
} = res.data;
this.tableList = data; this.tableList = data;
this.tableData = res.data this.tableData = res.data;
this.tablePagination.total = total; this.tablePagination.total = total;
return data return data;
} }
}, },
//分页 //分页
pagTableChange(page) { pagTableChange(page) {
this.tablePagination.current = page.current this.tablePagination.current = page.current;
this.tablePagination.pageSize = page.pageSize this.tablePagination.pageSize = page.pageSize;
this.getList(); this.getList();
}, },
// 选中 // 选中
...@@ -225,7 +260,7 @@ export default { ...@@ -225,7 +260,7 @@ export default {
1: "正常", 1: "正常",
2: "禁用", 2: "禁用",
}; };
let data = [] let data = [];
if (this.tableSelectedKeys.length && this.tableSelectedRows.length) { if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
// 深度克隆避免影响页面表格展示 // 深度克隆避免影响页面表格展示
data = this.$_.cloneDeep(this.tableSelectedRows); data = this.$_.cloneDeep(this.tableSelectedRows);
...@@ -243,9 +278,7 @@ export default { ...@@ -243,9 +278,7 @@ export default {
"易政秀报表" + this.$moment().format("YYYYMMDDHHmmss") "易政秀报表" + this.$moment().format("YYYYMMDDHHmmss")
); );
} else { } else {
data = this.$_.cloneDeep( data = this.$_.cloneDeep(await this.getList({ page: 1, size: -1 }));
await this.getList({ page: 1, size: -1 })
);
if (!data.length) return; if (!data.length) return;
for (let item of data) { for (let item of data) {
Object.keys(obj).forEach((key) => { Object.keys(obj).forEach((key) => {
...@@ -278,7 +311,7 @@ export default { ...@@ -278,7 +311,7 @@ export default {
this.$refs.PicWorks.modalInfo.title = "作品数量"; this.$refs.PicWorks.modalInfo.title = "作品数量";
this.$refs.PicWorks.modalInfo.visible = true; this.$refs.PicWorks.modalInfo.visible = true;
this.$refs.PicWorks.modalInfo.width = "32%"; this.$refs.PicWorks.modalInfo.width = "32%";
this.$refs.PicWorks.modalInfo.id = id this.$refs.PicWorks.modalInfo.id = id;
}, },
openUserDetails(record) { openUserDetails(record) {
this.$refs.UserDetails.modalInfo.title = "客户详情"; this.$refs.UserDetails.modalInfo.title = "客户详情";
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue
View file @ 0945abb5
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span> <span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
<span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span> <span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
<span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span> <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
<span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':'现场注册':'现场注册'}}</span> <span><i class="lable">注册方式：</i>{{queEvaData.register_type?queEvaData.register_type=="Applets"?'小程序':queEvaData.register_type=="wechat"?'公众号':queEvaData.register_type=="app"?'自助终端':queEvaData.register_type:'现场注册'}}</span>
<span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span> <span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
</div> </div>
</div> </div>
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue
View file @ 0945abb5
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
{ {
title: "评价设备", title: "评价设备",
align: "center", align: "center",
dataIndex: "pj_name", dataIndex: "devicenum",
customRender: (text) => { customRender: (text) => {
return text ? text : "--"; return text ? text : "--";
}, },
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
option_id, option_id,
pjxt, pjxt,
time: this.BegindAndEndTime, time: this.BegindAndEndTime,
info: "%"+this.searchName+"%", info: this.searchName,
hallid:this.hallid, hallid:this.hallid,
sectionid:this.sectionid, sectionid:this.sectionid,
...search, ...search,
......
portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue
View file @ 0945abb5
...@@ -342,7 +342,7 @@ export default { ...@@ -342,7 +342,7 @@ export default {
option_id, option_id,
pjxt, pjxt,
time: this.BegindAndEndTime, time: this.BegindAndEndTime,
info: "%"+this.searchName+"%", info: this.searchName,
hallid: this.hallid, hallid: this.hallid,
sectionid: this.sectionid, sectionid: this.sectionid,
...search, ...search,
......
portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue
View file @ 0945abb5
...@@ -2,29 +2,48 @@ ...@@ -2,29 +2,48 @@
<div class="callRecord-Container"> <div class="callRecord-Container">
<div class="header_box"> <div class="header_box">
<div> <div>
<a-button type="primary" class="addclass" @click="handleExportTable" :loading="btnLoading"> <a-button
type="primary"
class="addclass"
@click="handleExportTable"
:loading="btnLoading"
>
<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span> <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
</a-button> </a-button>
<b>叫号次数：<i>{{ tablePagination.total }}</i> 次</b> <b
>叫号次数：<i>{{ tablePagination.total }}</i> 次</b
>
<sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub> <sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
</div> </div>
<span> <span>
<a-space> <a-space>
<a-select v-model="searchForm.hallid"> <a-select v-model="searchForm.hallid">
<a-select-option value=""> 全部大厅 </a-select-option> <a-select-option value=""> 全部大厅 </a-select-option>
<a-select-option v-for="item in datingList" :key="item.id" :value="item.id"> <a-select-option
v-for="item in datingList"
:key="item.id"
:value="item.id"
>
{{ item.hallName }} {{ item.hallName }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-select v-model="searchForm.sectionid"> <a-select v-model="searchForm.sectionid">
<a-select-option value=""> 全部部门 </a-select-option> <a-select-option value=""> 全部部门 </a-select-option>
<a-select-option v-for="item in bumenList" :key="item.id" :value="item.id"> <a-select-option
v-for="item in bumenList"
:key="item.id"
:value="item.id"
>
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-select v-model="searchForm.id"> <a-select v-model="searchForm.id">
<a-select-option value=""> 全部设备 </a-select-option> <a-select-option value=""> 全部设备 </a-select-option>
<a-select-option v-for="item in deviceData" :key="item.id" :value="item.id"> <a-select-option
v-for="item in deviceData"
:key="item.id"
:value="item.id"
>
{{ item.name }} {{ item.name }}
</a-select-option> </a-select-option>
</a-select> </a-select>
...@@ -36,20 +55,36 @@ ...@@ -36,20 +55,36 @@
</a-select> </a-select>
<a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time"> <a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time">
</a-range-picker> </a-range-picker>
<a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch"> <a-input
v-model="searchForm.flownum"
placeholder="请输入排队编号搜索"
@pressEnter="handleSearch"
>
<a-icon slot="prefix" type="search" /> <a-icon slot="prefix" type="search" />
</a-input> </a-input>
<a-button type="primary" class="addclass" @click="handleSearch">搜索</a-button> <a-button type="primary" class="addclass" @click="handleSearch"
>搜索</a-button
>
<a-button @click="resetBtn">重置</a-button> <a-button @click="resetBtn">重置</a-button>
</a-space> </a-space>
</span> </span>
</div> </div>
<div class="main"> <div class="main">
<a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{ <a-table
size="small"
bordered
:row-key="(record) => record.id"
:row-selection="{
selectedRowKeys: tableSelectedKeys, selectedRowKeys: tableSelectedKeys,
onChange: onSelectChange, onChange: onSelectChange,
}" :scroll="{ y: 590 }" :pagination="tablePagination" @change="changeTablePage" :loading="tableLoading" }"
:columns="tableHeaders" :dataSource="tableList"> :scroll="{ y: 590 }"
:pagination="tablePagination"
@change="changeTablePage"
:loading="tableLoading"
:columns="tableHeaders"
:dataSource="tableList"
>
<!-- 序号 --> <!-- 序号 -->
<span slot="num" slot-scope="text, record, index">{{ <span slot="num" slot-scope="text, record, index">{{
(tablePagination.current - 1) * tablePagination.pageSize + index + 1 (tablePagination.current - 1) * tablePagination.pageSize + index + 1
...@@ -71,7 +106,11 @@ ...@@ -71,7 +106,11 @@
</template> </template>
<!-- 办理业务 --> <!-- 办理业务 -->
<template slot="business" slot-scope="text"> <template slot="business" slot-scope="text">
<a v-if="text.business" @click="openBusiness(text.business, text.businessid)">{{ text.business }}</a> <a
v-if="text.business"
@click="openBusiness(text.business, text.businessid)"
>{{ text.business }}</a
>
<span v-else>--</span> <span v-else>--</span>
</template> </template>
<!-- 办理开始时间 --> <!-- 办理开始时间 -->
...@@ -112,11 +151,13 @@ ...@@ -112,11 +151,13 @@
</template> </template>
<!-- 状态 --> <!-- 状态 -->
<template slot="style" slot-scope="text"> <template slot="style" slot-scope="text">
<span :class="{ <span
:class="{
'stand-line': text.style === 0, 'stand-line': text.style === 0,
'on-transact': text.style === 1, 'on-transact': text.style === 1,
'on-end': text.style === 4, 'on-end': text.style === 4,
}"> }"
>
{{ $codeMap.queueState[text.style] }} {{ $codeMap.queueState[text.style] }}
</span> </span>
</template> </template>
...@@ -280,7 +321,7 @@ export default { ...@@ -280,7 +321,7 @@ export default {
time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间 time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
flownum: "", // 排号编码 flownum: "", // 排号编码
hallid: "", hallid: "",
sectionid: "" sectionid: "",
}, },
// 大厅列表 // 大厅列表
datingList: [], datingList: [],
...@@ -354,7 +395,7 @@ export default { ...@@ -354,7 +395,7 @@ export default {
this.getCalllistArr(); this.getCalllistArr();
this.getCallQueListArr(); this.getCallQueListArr();
}, },
mounted() { }, mounted() {},
methods: { methods: {
// 获取大厅列表 // 获取大厅列表
async getDatingListArr() { async getDatingListArr() {
...@@ -379,7 +420,7 @@ export default { ...@@ -379,7 +420,7 @@ export default {
time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间 time: [moment().format("YYYY-MM-DD"), moment().format("YYYY-MM-DD")], // 时间区间
flownum: "", // 排号编码 flownum: "", // 排号编码
hallid: "", hallid: "",
sectionid: "" sectionid: "",
}; };
this.getCallQueListArr(); this.getCallQueListArr();
}, },
...@@ -408,7 +449,7 @@ export default { ...@@ -408,7 +449,7 @@ export default {
let { data, total } = res.data; let { data, total } = res.data;
this.tableList = data; this.tableList = data;
this.tablePagination.total = total; this.tablePagination.total = total;
console.log(this.tableList) console.log(this.tableList);
return data; return data;
} }
}, },
......
portal-manager-ui/admin/src/views/dataAdmin/components/serviceDataAnalyse/makeTrendResearch.vue
View file @ 0945abb5
...@@ -90,11 +90,19 @@ export default { ...@@ -90,11 +90,19 @@ export default {
title: "整体同比", title: "整体同比",
align: "center", align: "center",
dataIndex: "整体同比", dataIndex: "整体同比",
customRender: (text, record, index) => {
console.log(text);
return text + "%";
},
}, },
{ {
title: "整体环比", title: "整体环比",
align: "center", align: "center",
dataIndex: "整体环比", dataIndex: "整体环比",
customRender: (text, record, index) => {
console.log(text);
return text + "%";
},
}, },
], ],
}; };
......
portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue
View file @ 0945abb5
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="img_box img3"></div> <div class="img_box img3"></div>
</a-carousel> </a-carousel>
<div class="title"> <div class="title">
<h3 style="text-align: center;font-size: 50px;">宜人·宜宾·宜办事</h3> <h3 style="text-align: center; font-size: 50px">宜人·宜宾·宜办事</h3>
<!-- <p>“互联网+政务服务”整体解决方案提供商和服务商</p> --> <!-- <p>“互联网+政务服务”整体解决方案提供商和服务商</p> -->
</div> </div>
<div class="classification"> <div class="classification">
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
class="mod_max" class="mod_max"
v-for="item of siteModelList" v-for="item of siteModelList"
:key="item.id" :key="item.id"
@click="openWindow(item.modelUrl)" @click="openWindow(item)"
> >
<div class="picture" :style="{background: item.color}"> <div class="picture" :style="{ background: item.color }">
<img <img
width="40" width="40"
height="35" height="35"
...@@ -76,38 +76,38 @@ export default { ...@@ -76,38 +76,38 @@ export default {
this.siteId = Storage.get(2, "siteId"); this.siteId = Storage.get(2, "siteId");
let res = await appsListInterface({ siteId: this.siteId }); let res = await appsListInterface({ siteId: this.siteId });
let { data } = res.data; let { data } = res.data;
let color = [] let color = [];
let colorArr = ['#546DFF','#1E6FFF','#3CBFFF','#00AA5B','#FFAB00'] let colorArr = ["#546DFF", "#1E6FFF", "#3CBFFF", "#00AA5B", "#FFAB00"];
color = colorArr.concat(colorArr,colorArr,colorArr,colorArr,colorArr,colorArr) color = colorArr.concat(
this.siteModelList = data.map((v,i)=>{ colorArr,
v['color'] = color[i] colorArr,
return v colorArr,
colorArr,
colorArr,
colorArr
);
this.siteModelList = data.map((v, i) => {
v["color"] = color[i];
return v;
}); });
}, },
openWindow(href) { openWindow(row) {
let token = Storage.get(2, "Authorization"); let token = Storage.get(2, "Authorization");
let siteid = Storage.get(2, "siteId") ? Storage.get(2, "siteId") : 0; let siteid = Storage.get(2, "siteId") ? Storage.get(2, "siteId") : 0;
let siteName = Storage.get(2, "siteName") let siteName = Storage.get(2, "siteName")
? Storage.get(2, "siteName") ? Storage.get(2, "siteName")
: ""; : "";
let reg = /^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/;
let info = Storage.get(2, "userInfo"); let info = Storage.get(2, "userInfo");
let userInfo = JSON.stringify({ let userInfo = JSON.stringify({
id: info.id, id: info.id,
name: info.loginName, name: info.loginName,
}); });
let { modelUrl, modelName, modelIcon } = row;
window.open( let path = this.$route.path;
`${href}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}`,
"_blank"
);
/* if (reg.test(href)) {
window.open( window.open(
`${href}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}`, `${modelUrl}?token=${token}&siteid=${siteid}&siteName=${siteName}&userInfo=${userInfo}&sysName=${modelName}&sysLogo=${modelIcon}&path=${path}`,
"_blank" "_blank"
); );
}*/
}, },
}, },
}; };
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/APIServe/components/portDocument.vue
View file @ 0945abb5
...@@ -3,7 +3,13 @@ ...@@ -3,7 +3,13 @@
<div class="content"> <div class="content">
<div class="top"> <div class="top">
<h1 class="title_text">{{ detailsForm.interfaceName }}</h1> <h1 class="title_text">{{ detailsForm.interfaceName }}</h1>
<a-button type="primary" class="addclass" @click="$router.go(-1)" style="margin-bottom: 1rem">返回上一级</a-button> <a-button
type="primary"
class="addclass"
@click="$router.go(-1)"
style="margin-bottom: 1rem"
>返回上一级</a-button
>
</div> </div>
<a-card title="接口信息" :bordered="false" class="card_box"> <a-card title="接口信息" :bordered="false" class="card_box">
<a-descriptions> <a-descriptions>
...@@ -22,12 +28,21 @@ ...@@ -22,12 +28,21 @@
<a-descriptions-item label="content-type">{{ <a-descriptions-item label="content-type">{{
detailsForm.contentType detailsForm.contentType
}}</a-descriptions-item> }}</a-descriptions-item>
<a-descriptions-item label="超时时长">{{ detailsForm.timeoutValue }}秒</a-descriptions-item> <a-descriptions-item label="超时时长"
>{{ detailsForm.timeoutValue }}秒</a-descriptions-item
>
<a-descriptions-item label="限流策略">{{ <a-descriptions-item label="限流策略">{{
detailsForm.limitStrategy == 1 ? "分钟" : "小时" detailsForm.limitStrategy == 1 ? "分钟" : "小时"
}}</a-descriptions-item> }}</a-descriptions-item>
<a-descriptions-item label="访问网络" v-if="detailsForm && detailsForm.network"> <a-descriptions-item
<span v-for="(item, idx) of dict.network" v-show="detailsForm.network.indexOf(idx) != -1" :key="idx"> label="访问网络"
v-if="detailsForm && detailsForm.network"
>
<span
v-for="(item, idx) of dict.network"
v-show="detailsForm.network.indexOf(idx) != -1"
:key="idx"
>
{{ item }} {{ item }}
</span> </span>
</a-descriptions-item> </a-descriptions-item>
...@@ -49,7 +64,7 @@ ...@@ -49,7 +64,7 @@
</a-card> </a-card>
<a-card title="请求参数" :bordered="false" class="card_box"> <a-card title="请求参数" :bordered="false" class="card_box">
<div class="flex aic jcb mb10"> <div class="flex aic jcb mb10">
<a-radio-group v-model="requestPam.type" button-style="solid" disabled> <a-radio-group v-model="requestPam.type" button-style="solid">
<a-radio-button value="path"> 路径参数 </a-radio-button> <a-radio-button value="path"> 路径参数 </a-radio-button>
<a-radio-button value="headers"> headers </a-radio-button> <a-radio-button value="headers"> headers </a-radio-button>
<a-radio-button value="query"> query </a-radio-button> <a-radio-button value="query"> query </a-radio-button>
...@@ -60,8 +75,15 @@ ...@@ -60,8 +75,15 @@
<div>{{ detailsForm.inEncrypt == 1 ? "加密" : "不加密" }}</div> <div>{{ detailsForm.inEncrypt == 1 ? "加密" : "不加密" }}</div>
</div> </div>
</div> </div>
<a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false" <a-table
:columns="table_columns" :dataSource="requestPam.table"> size="middle"
bordered
:row-key="(record) => record.id"
:locale="{ emptyText: '无' }"
:pagination="false"
:columns="table_columns"
:dataSource="requestPam.table"
>
</a-table> </a-table>
</a-card> </a-card>
...@@ -72,8 +94,15 @@ ...@@ -72,8 +94,15 @@
<div>{{ detailsForm.outEncrypt == 1 ? "加密" : "不加密" }}</div> <div>{{ detailsForm.outEncrypt == 1 ? "加密" : "不加密" }}</div>
</div> </div>
</div> </div>
<a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false" <a-table
:columns="table_columns" :dataSource="responsePam.table"> size="middle"
bordered
:row-key="(record) => record.id"
:locale="{ emptyText: '无' }"
:pagination="false"
:columns="table_columns"
:dataSource="responsePam.table"
>
</a-table> </a-table>
</a-card> </a-card>
...@@ -92,8 +121,15 @@ ...@@ -92,8 +121,15 @@
</div> </div>
</a-card> </a-card>
<a-card title="变更记录" :bordered="false" class="card_box"> <a-card title="变更记录" :bordered="false" class="card_box">
<a-table size="middle" bordered :row-key="(record) => record.id" :locale="{ emptyText: '无' }" :pagination="false" <a-table
:columns="table_columns_gb" :dataSource="[]"> size="middle"
bordered
:row-key="(record) => record.id"
:locale="{ emptyText: '无' }"
:pagination="false"
:columns="table_columns_gb"
:dataSource="[]"
>
</a-table> </a-table>
</a-card> </a-card>
</div> </div>
...@@ -276,7 +312,7 @@ export default { ...@@ -276,7 +312,7 @@ export default {
margin-bottom: 1rem; margin-bottom: 1rem;
} }
&+.card_box { & + .card_box {
margin-top: 1rem; margin-top: 1rem;
} }
} }
...@@ -288,15 +324,21 @@ export default { ...@@ -288,15 +324,21 @@ export default {
width: 100%; width: 100%;
height: @headerH; height: @headerH;
background: rgb(59, 135, 255); background: rgb(59, 135, 255);
background: -moz-linear-gradient(174deg, background: -moz-linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%, rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%); rgba(108, 53, 247, 1) 85%
background: -webkit-linear-gradient(174deg, );
background: -webkit-linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%, rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%); rgba(108, 53, 247, 1) 85%
background: linear-gradient(174deg, );
background: linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%, rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%); rgba(108, 53, 247, 1) 85%
);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1);
} }
} }
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/dictionary/dictionary.vue
View file @ 0945abb5
<template> <template>
<div class="Container"> <div class="Container">
<div class="main">
<a-tabs v-model="tabsActive" @change="tabsChange" :forceRender="false">
<a-button
style="margin-right: 16px"
slot="tabBarExtraContent"
@click="$router.back()"
>返回上一级</a-button
>
<a-tab-pane :tab="tabsList['meta']['title']" :key="0"> </a-tab-pane>
</a-tabs>
<div class="my-card"> <div class="my-card">
<div class="head-menu">
<div>属性字典</div>
</div>
<div class="pd20"> <div class="pd20">
<div class="from-item"> <div class="from-item">
<div class="name">排队机分辨率：</div> <div class="name">排队机分辨率：</div>
<div> <div>
<a-tag color="blue" closable v-for="item, index in fblList" :key="index"> <a-tag
color="blue"
closable
v-for="(item, index) in fblList"
:key="index"
>
{{ item.name }} {{ item.name }}
</a-tag> </a-tag>
</div> </div>
<a-button icon="plus" size="small" @click="addZdShow('fblList', '排队机分辨率')">添加字典值</a-button> <a-button
icon="plus"
size="small"
@click="addZdShow('fblList', '排队机分辨率')"
>添加字典值</a-button
>
</div> </div>
<div class="from-item"> <div class="from-item">
<div class="name">接口标签：</div> <div class="name">接口标签：</div>
<div> <div>
<a-tag color="blue" closable v-for="item, index in bqList" :key="index"> <a-tag
color="blue"
closable
v-for="(item, index) in bqList"
:key="index"
>
{{ item.name }} {{ item.name }}
</a-tag> </a-tag>
</div> </div>
<a-button icon="plus" size="small" @click="addZdShow('bqList', '接口标签')">添加字典值</a-button> <a-button
icon="plus"
size="small"
@click="addZdShow('bqList', '接口标签')"
>添加字典值</a-button
>
</div>
</div> </div>
</div> </div>
</div> </div>
<a-modal :title="VisibleTitle" :centered="true" :destroyOnClose="true" :visible="Visible" @cancel="Visible = false" <a-modal
width="30%"> :title="VisibleTitle"
<a-form-model :label-col="{ span: 5 }" :wrapper-col="{ span: 19 }" layout="horizontal" ref="appInfoFome" :centered="true"
:model="appInfoFome" :rules="appInfoRules"> :destroyOnClose="true"
:visible="Visible"
@cancel="Visible = false"
width="30%"
>
<a-form-model
:label-col="{ span: 5 }"
:wrapper-col="{ span: 19 }"
layout="horizontal"
ref="appInfoFome"
:model="appInfoFome"
:rules="appInfoRules"
>
<a-form-model-item label="字典值" prop="productName"> <a-form-model-item label="字典值" prop="productName">
<a-input placeholder="请输入字典值" allowClear v-model="appInfoFome.productName" /> <a-input
placeholder="请输入字典值"
allowClear
v-model="appInfoFome.productName"
/>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
<template slot="footer"> <template slot="footer">
<a-button type="primary" class="addclass" @click="Modal_Ok">确定</a-button> <a-button type="primary" class="addclass" @click="Modal_Ok"
>确定</a-button
>
<a-button @click="resetForm">重置</a-button> <a-button @click="resetForm">重置</a-button>
</template> </template>
</a-modal> </a-modal>
...@@ -43,19 +89,24 @@ ...@@ -43,19 +89,24 @@
</template> </template>
<script> <script>
import { getItemData } from "@/utils/js/common.js";
import common from "@/mixins/common"; import common from "@/mixins/common";
export default { export default {
name: "dictionary", name: "dictionary",
mixins: [common], mixins: [common],
data() { data() {
return { return {
fblList: [{ fblList: [
name: "1920*1080" {
}, { name: "1920*1080",
name: "1080*1920" },
}, { {
name: "1280*1280" name: "1080*1920",
}], },
{
name: "1280*1280",
},
],
bqList: [ bqList: [
{ name: "政务外网" }, { name: "政务外网" },
{ name: "便民服务" }, { name: "便民服务" },
...@@ -65,7 +116,7 @@ export default { ...@@ -65,7 +116,7 @@ export default {
Visible: false, Visible: false,
appInfoFome: { appInfoFome: {
productName: undefined, productName: undefined,
siteId: JSON.parse(localStorage.getItem("siteId")) siteId: JSON.parse(localStorage.getItem("siteId")),
}, //页面表单信息 }, //页面表单信息
appInfoRules: { appInfoRules: {
productName: [ productName: [
...@@ -74,31 +125,34 @@ export default { ...@@ -74,31 +125,34 @@ export default {
whitespace: true, //必选时，空格是否会被视为错误 whitespace: true, //必选时，空格是否会被视为错误
message: "请输入字典值", message: "请输入字典值",
trigger: "blur", trigger: "blur",
} },
], ],
}, },
keyName: "" keyName: "",
tabsActive: 0,
}; };
}, },
created() { mounted() {},
computed: {
tabsList() {
return getItemData(this.$router.options.routes, "name", "dictionary");
}, },
mounted() {
}, },
methods: { methods: {
addZdShow(key, title) { addZdShow(key, title) {
this.Visible = true this.Visible = true;
this.resetForm() this.resetForm();
this.keyName = key this.keyName = key;
this.VisibleTitle = title this.VisibleTitle = title;
}, },
Modal_Ok() { Modal_Ok() {
this.$refs.appInfoFome.validate((valid) => { this.$refs.appInfoFome.validate((valid) => {
if (valid) { if (valid) {
this[this.keyName].push({ this[this.keyName].push({
name: this.appInfoFome.productName name: this.appInfoFome.productName,
}) });
this.Visible = false this.Visible = false;
this.resetForm() this.resetForm();
} else { } else {
this.$message.error(`请完善表单信息！`); this.$message.error(`请完善表单信息！`);
return false; return false;
...@@ -107,7 +161,13 @@ export default { ...@@ -107,7 +161,13 @@ export default {
}, },
resetForm() { resetForm() {
this.$nextTick(() => { this.$nextTick(() => {
this.appInfoFome.productName = '' this.appInfoFome.productName = "";
});
},
tabsChange(val) {
this.$router.push({
path: `/home/thePlatformIsSet/menuManagement/${val}`,
// query: { testoption: "test001" },
}); });
}, },
}, },
...@@ -115,6 +175,7 @@ export default { ...@@ -115,6 +175,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@headerH: 4.5rem;
.from-item { .from-item {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -151,11 +212,40 @@ export default { ...@@ -151,11 +212,40 @@ export default {
line-height: 52px; line-height: 52px;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
color: #0595FD; color: #0595fd;
border-bottom: 2px solid #0595FD; border-bottom: 2px solid #0595fd;
padding: 0 30px; padding: 0 30px;
margin-left: 20px; margin-left: 20px;
} }
} }
} }
.Container {
height: 100% !important;
// background: #fac;
background: #f5f5f5;
display: flex;
flex-direction: column;
.main {
// background: #afc;
background: #ffffff;
border-radius: 6px;
flex: 1;
overflow-y: auto;
overflow-x: hidden;
margin: 1.2rem 2rem;
}
.ant-tabs-nav {
.ant-tabs-tab {
margin: 0 !important;
}
}
.ant-tabs-tab {
font-size: 1rem !important;
& + .ant-tabs-tab {
margin: 0 !important;
margin-left: 0.7rem !important;
}
}
}
</style> </style>
portal-manager-ui/admin/src/views/thePlatformIsSet/components/logService/Service.vue
View file @ 0945abb5
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="logService"> <div class="logService">
<div class="header_box"> <div class="header_box">
<a-space> <a-space>
<a-input v-model="searchName" placeholder="请输入内容关键之搜索"> <a-input v-model="searchName" placeholder="请输入内容关键字搜索">
</a-input> </a-input>
<a-range-picker <a-range-picker
format="YYYY年MM月DD日" format="YYYY年MM月DD日"
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/authorityMis.vue
View file @ 0945abb5
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
<!-- <button class="addRoles_btn" @click="showRoleEditModal(false)"> <!-- <button class="addRoles_btn" @click="showRoleEditModal(false)">
<span>新增角色</span> <span>新增角色</span>
</button> --> </button> -->
<a-button type="primary" class="addclass" @click="showRoleEditModal(false)" <a-button
type="primary"
class="addclass"
@click="showRoleEditModal(false)"
>新增角色</a-button >新增角色</a-button
> >
<span> <span>
...@@ -40,8 +43,13 @@ ...@@ -40,8 +43,13 @@
>编辑</a-button >编辑</a-button
> >
<a-button <a-button
style="color: #ff4420" :style="
userInfo.id == record.id
? { color: '#3333' }
: { color: '#ff4420' }
"
type="link" type="link"
:disabled="userInfo.id === record.id"
@click="deleteRole(record, index)" @click="deleteRole(record, index)"
>删除</a-button >删除</a-button
> >
...@@ -66,6 +74,7 @@ export default { ...@@ -66,6 +74,7 @@ export default {
name: "PortalAdminVueAuthorityMis", name: "PortalAdminVueAuthorityMis",
data() { data() {
return { return {
userInfo: {},
searchRoleName: undefined, searchRoleName: undefined,
tableLoading: false, tableLoading: false,
tablePagination: { tablePagination: {
...@@ -130,6 +139,10 @@ export default { ...@@ -130,6 +139,10 @@ export default {
// remark: `该角色定义为省级权限${key + 1}`, // remark: `该角色定义为省级权限${key + 1}`,
// }); // });
// } // }
localStorage.getItem("userInfo")
? (this.userInfo = JSON.parse(localStorage.getItem("userInfo")))
: "";
console.log(this.userInfo);
this.getRoleList(); this.getRoleList();
}, },
methods: { methods: {
...@@ -137,7 +150,7 @@ export default { ...@@ -137,7 +150,7 @@ export default {
let res = await roleList({ let res = await roleList({
page: this.tablePagination.current, //当前页 page: this.tablePagination.current, //当前页
size: this.tablePagination.pageSize, //每页条数 size: this.tablePagination.pageSize, //每页条数
name: this.searchRoleName, name: this.searchRoleName ? "%" + this.searchRoleName + "%" : "",
}); });
let { code, data, dict } = res; let { code, data, dict } = res;
if (!data.data && this.tablePagination.current > 1) { if (!data.data && this.tablePagination.current > 1) {
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue
View file @ 0945abb5
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<div class="user"> <div class="user">
<div class="user_btn"> <div class="user_btn">
<div class="add_btn"> <div class="add_btn">
<a-button type="primary" class="addclass" @click="addUserModal">新增用户</a-button> <a-button type="primary" class="addclass" @click="addUserModal"
>新增用户</a-button
>
</div> </div>
<div class="search_btn"> <div class="search_btn">
<a-space> <a-space>
...@@ -25,7 +27,9 @@ ...@@ -25,7 +27,9 @@
>{{ v.value }}</a-select-option >{{ v.value }}</a-select-option
> >
</a-select> </a-select>
<a-button type="primary" class="addclass" @click="getUserList">搜索</a-button> <a-button type="primary" class="addclass" @click="getUserList"
>搜索</a-button
>
<a-button @click="resetList">重置</a-button> <a-button @click="resetList">重置</a-button>
</a-space> </a-space>
</div> </div>
...@@ -195,11 +199,18 @@ export default { ...@@ -195,11 +199,18 @@ export default {
async getUserList() { async getUserList() {
let realName = ""; let realName = "";
let mobile = ""; let mobile = "";
if (/^[\u4e00-\u9fa5]+$/.test(this.userform.searchVal)) { if (this.userform.searchVal) {
realName = this.userform.searchVal; if (/^[\d]+$/.test(this.userform.searchVal)) {
} else if (/^[\d]+$/.test(this.userform.searchVal)) { mobile = "%" + this.userform.searchVal + "%";
mobile = this.userform.searchVal; } else {
realName = "%" + this.userform.searchVal + "%";
}
} }
// if (/^[\u4e00-\u9fa5]+$/.test(this.userform.searchVal)) {
// realName = "%" + this.userform.searchVal + "%";
// } else if (/^[\d]+$/.test(this.userform.searchVal)) {
// mobile = "%" + this.userform.searchVal + "%";
// }
let res = await userList({ let res = await userList({
page: this.tablePagination.current, page: this.tablePagination.current,
size: this.tablePagination.pageSize, size: this.tablePagination.pageSize,
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/components/Details.vue
View file @ 0945abb5
...@@ -628,9 +628,12 @@ export default { ...@@ -628,9 +628,12 @@ export default {
//type //type
onReqType(type) { onReqType(type) {
let index = this.requestPam.type; let index = this.requestPam.type;
console.log(index);
if (index == "path") { if (index == "path") {
this.requestPam.table = []; this.requestPam.table = [];
} else { } else {
console.log(this.requestPam.table);
let obj = { let obj = {
name: ``, name: ``,
type: "String", type: "String",
...@@ -639,10 +642,12 @@ export default { ...@@ -639,10 +642,12 @@ export default {
describe: ``, describe: ``,
isType: true, isType: true,
}; };
if (index == "body") { if (index == "body") {
obj.isType = false; obj.isType = false;
} }
if (type == "new") { if (type == "new") {
console.log(333);
this.requestPam.table = [obj]; this.requestPam.table = [obj];
} else { } else {
this.requestPam.table.push(obj); this.requestPam.table.push(obj);
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/productManage.vue
View file @ 0945abb5
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
getProduct({ getProduct({
page: 1, page: 1,
size: -1, size: -1,
productName: this.searchVal, productName: this.searchVal ? "%" + this.searchVal + "%" : "",
}).then((res) => { }).then((res) => {
this.listData = res.data.data; this.listData = res.data.data;
}); });
...@@ -116,7 +116,7 @@ export default { ...@@ -116,7 +116,7 @@ export default {
this.$refs.AddEditAppName.appInfoFome.id = item.id; this.$refs.AddEditAppName.appInfoFome.id = item.id;
this.$refs.AddEditAppName.appInfoFome.productName = item.productName; this.$refs.AddEditAppName.appInfoFome.productName = item.productName;
} else { } else {
this.$refs.AddEditAppName.appInfoFome.id = ''; this.$refs.AddEditAppName.appInfoFome.id = "";
this.$refs.AddEditAppName.VisibleTitle = "新增产品"; this.$refs.AddEditAppName.VisibleTitle = "新增产品";
} }
this.$refs.AddEditAppName.Visible = true; this.$refs.AddEditAppName.Visible = true;
......
smart-gateway/pom.xml
View file @ 0945abb5
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
<profile> <profile>
<id>product</id> <id>product</id>
<properties> <properties>
<profiles.active>product</profiles.active> <profiles.active>yibin</profiles.active>
<profiles.server.ip>192.168.0.251</profiles.server.ip> <profiles.server.ip>192.168.0.250</profiles.server.ip>
<profiles.server.port>17214</profiles.server.port> <profiles.server.port>17214</profiles.server.port>
<profiles.nginx.port>11078</profiles.nginx.port> <profiles.nginx.port>11078</profiles.nginx.port>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host> <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username> <profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password> <profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost> <profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
...@@ -99,7 +99,6 @@ ...@@ -99,7 +99,6 @@
<profiles.log.level>INFO</profiles.log.level> <profiles.log.level>INFO</profiles.log.level>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
</properties> </properties>
</profile> </profile>
......
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