Skip to content

S
smart_gov_platform
Commit 3df87e6a authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

pref:修改应用字段配置

parent b69bce65
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 191 deletions
base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue
View file @ 3df87e6a
...@@ -333,4 +333,7 @@ export default { ...@@ -333,4 +333,7 @@ export default {
font-weight: 600; font-weight: 600;
} }
} }
/deep/.ant-form-item {
align-items: flex-start;
}
</style> </style>
\ No newline at end of file
base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
View file @ 3df87e6a
...@@ -144,7 +144,6 @@ export default { ...@@ -144,7 +144,6 @@ export default {
}, },
created() { created() {
this.getDatasetList(); this.getDatasetList();
console.log(this.appTemplate);
}, },
methods: { methods: {
// 获取数据列表 // 获取数据列表
......
base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue
View file @ 3df87e6a
...@@ -55,9 +55,11 @@ ...@@ -55,9 +55,11 @@
</template> </template>
<!-- 简介 --> <!-- 简介 -->
<template slot="summary" slot-scope="text"> <template slot="summary" slot-scope="text">
{{ text.summary ? text.summary : "--" }} <span :title="text.summary">{{
text.summary ? text.summary : "--"
}}</span>
</template> </template>
<!-- 简介 --> <!-- 版本 -->
<template slot="version" slot-scope="text"> <template slot="version" slot-scope="text">
{{ text.version ? "v" + text.version : "--" }} {{ text.version ? "v" + text.version : "--" }}
</template> </template>
...@@ -135,11 +137,12 @@ const columns = [ ...@@ -135,11 +137,12 @@ const columns = [
}, },
{ {
title: "应用主题", title: "应用主题",
ellipsis: true,
dataIndex: "appThemeName", dataIndex: "appThemeName",
}, },
{ {
title: "应用简介", title: "应用简介",
width: "20%", ellipsis: true,
scopedSlots: { customRender: "summary" }, scopedSlots: { customRender: "summary" },
}, },
{ {
......
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
View file @ 3df87e6a
...@@ -82,14 +82,14 @@ const fieldTypeItem = [ ...@@ -82,14 +82,14 @@ const fieldTypeItem = [
value: "date", value: "date",
label: "日期选择框", label: "日期选择框",
}, },
{
value: "text",
label: "富文本",
},
{ {
value: "upload", value: "upload",
label: "文件上传", label: "文件上传",
}, },
{
value: "text",
label: "富文本",
},
]; ];
export default { export default {
props: { props: {
......
base-manager-ui/admin/src/pages/basicset/site/website.vue
View file @ 3df87e6a
...@@ -7,206 +7,209 @@ ...@@ -7,206 +7,209 @@
<div class="line"></div> <div class="line"></div>
<div class="main-right right ff"> <div class="main-right right ff">
<div class="right_box"> <a-spin size="large" :spinning="loading">
<div v-if="siteData.length" class="rigth-content"> <div class="right_box">
<div <div v-if="siteData.length" class="rigth-content">
v-show="active === index" <div
v-for="(item, index) in siteData" v-show="active === index"
:key="item.id" v-for="(item, index) in siteData"
> :key="item.id"
<div class="site_box"> >
<div class="site_message">站点信息</div> <div class="site_box">
<div class="btn-box"> <div class="site_message">站点信息</div>
<a-button <div class="btn-box">
v-permission="[1]" <a-button
type="primary" v-permission="[1]"
@click="handleSync(item.id)" type="primary"
>同步数据</a-button @click="handleSync(item.id)"
> >同步数据</a-button
<a-button type="primary" @click="editSiteInfo(item)" >
>编辑</a-button <a-button type="primary" @click="editSiteInfo(item)"
> >编辑</a-button
<a-button type="danger" @click="deleteSite(item.id)" >
>删除</a-button <a-button type="danger" @click="deleteSite(item.id)"
> >删除</a-button
>
</div>
</div> </div>
</div>
<div class="website-content"> <div class="website-content">
<div class="base_message"> <div class="base_message">
<div class="color_title">基本信息</div> <div class="color_title">基本信息</div>
<div class="base_main"> <div class="base_main">
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<span>中心名称：</span> <span>中心名称：</span>
<span>{{ item.siteName }}</span> <span>{{ item.siteName }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>中心编号：</span> <span>中心编号：</span>
<span>{{ item.siteCode }}</span> <span>{{ item.siteCode }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>区域编号：</span> <span>区域编号：</span>
<span>{{ item.areaCode }}</span> <span>{{ item.areaCode }}</span>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<span>ip：</span> <span>ip：</span>
<span>{{ item.siteIp }}</span> <span>{{ item.siteIp }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>中心端口：</span> <span>中心端口：</span>
<span>{{ item.sitePort }}</span> <span>{{ item.sitePort }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>中心电话：</span> <span>中心电话：</span>
<span>{{ item.siteTel }}</span> <span>{{ item.siteTel }}</span>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<span>站点负责人：</span> <span>站点负责人：</span>
<span>{{ item.leadingOfficial }}</span> <span>{{ item.leadingOfficial }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>负责人电话：</span> <span>负责人电话：</span>
<span>{{ item.leadingOfficialTelephone }}</span> <span>{{ item.leadingOfficialTelephone }}</span>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<span>总栋数：</span> <span>总栋数：</span>
<span>{{ item.building }}栋</span> <span>{{ item.building }}栋</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>总楼层：</span> <span>总楼层：</span>
<span>{{ item.level }}楼</span> <span>{{ item.level }}楼</span>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<span>中心位置：</span> <span>中心位置：</span>
<span <span
>{{ item.proCode }} {{ item.cityCode }} >{{ item.proCode }} {{ item.cityCode }}
{{ item.districtCode }}</span {{ item.districtCode }}</span
> >
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>详细位置：</span> <span>详细位置：</span>
<span>{{ item.detailAddress }}</span> <span>{{ item.detailAddress }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>经纬度：</span> <span>经纬度：</span>
<span>{{ `${item.longitude}, ${item.latitude}` }}</span> <span>{{ `${item.longitude}, ${item.latitude}` }}</span>
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="19"> <a-col :span="19">
<span>中心简介：</span> <span>中心简介：</span>
<div class="col_item"> <div class="col_item">
<div class="detail_place">{{ item.siteRemark }}</div> <div class="detail_place">{{ item.siteRemark }}</div>
<span @click="cookAll(item.siteRemark)">查看全部</span> <span @click="cookAll(item.siteRemark)"
</div> >查看全部</span
</a-col> >
</a-row> </div>
</a-col>
</a-row>
</div>
</div> </div>
</div>
<div class="office_message"> <div class="office_message">
<div class="color_title">办公信息</div> <div class="color_title">办公信息</div>
<div class="office_main"> <div class="office_main">
<a-row> <a-row>
<a-col :span="8"> <a-col :span="8">
<span>上午上班：</span> <span>上午上班：</span>
<span v-if="item.amWorkStartTime">{{ <span v-if="item.amWorkStartTime">{{
item.amWorkStartTime | times item.amWorkStartTime | times
}}</span> }}</span>
<i v-if="item.amWorkStartTime && item.amWorkEndTime" <i v-if="item.amWorkStartTime && item.amWorkEndTime"
>～</i >～</i
> >
<span v-if="item.amWorkEndTime">{{ <span v-if="item.amWorkEndTime">{{
item.amWorkEndTime | times item.amWorkEndTime | times
}}</span> }}</span>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
<span>下午上班：</span> <span>下午上班：</span>
<span v-if="item.pmWorkStartTime">{{ <span v-if="item.pmWorkStartTime">{{
item.pmWorkStartTime | times item.pmWorkStartTime | times
}}</span> }}</span>
<i v-if="item.pmWorkStartTime && item.pmWorkEndTime" <i v-if="item.pmWorkStartTime && item.pmWorkEndTime"
>～</i >～</i
> >
<span v-if="item.pmWorkEndTime">{{ <span v-if="item.pmWorkEndTime">{{
item.pmWorkEndTime | times item.pmWorkEndTime | times
}}</span> }}</span>
</a-col> </a-col>
</a-row> </a-row>
<a-row>
<a-col :span="8">
<span>工作日：</span>
<span class="work-day" v-if="item.workday1 === 1"
>星期一</span
>
<span class="work-day" v-if="item.workday2 === 1"
>星期二</span
>
<span class="work-day" v-if="item.workday3 === 1"
>星期三</span
>
<span class="work-day" v-if="item.workday4 === 1"
>星期四</span
>
<span class="work-day" v-if="item.workday5 === 1"
>星期五</span
>
<span class="work-day" v-if="item.workday6 === 1"
>星期六</span
>
<span class="work-day" v-if="item.workday7 === 1"
>星期天</span
>
</a-col>
</a-row>
</div>
</div>
<div class="deploy_module">
<div class="color_title">部署模块</div>
<a-row> <a-row>
<a-col :span="8"> <a-col :span="20">
<span>工作日：</span> <div class="item_box">
<span class="work-day" v-if="item.workday1 === 1" <div
>星期一</span class="item"
> v-for="(v, i) in item.modelData"
<span class="work-day" v-if="item.workday2 === 1" :key="i"
>星期二</span >
> {{ v }}
<span class="work-day" v-if="item.workday3 === 1" </div>
>星期三</span </div>
>
<span class="work-day" v-if="item.workday4 === 1"
>星期四</span
>
<span class="work-day" v-if="item.workday5 === 1"
>星期五</span
>
<span class="work-day" v-if="item.workday6 === 1"
>星期六</span
>
<span class="work-day" v-if="item.workday7 === 1"
>星期天</span
>
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
</div> </div>
<div class="deploy_module">
<div class="color_title">部署模块</div>
<a-row>
<a-col :span="20">
<div class="item_box">
<div
class="item"
v-for="(v, i) in item.modelData"
:key="i"
>
{{ v }}
</div>
</div>
</a-col>
</a-row>
</div>
</div> </div>
</div> </div>
</div> <div v-else class="empty-show">
<div v-else class="empty-show"> <a-empty description="暂无站点" />
<a-empty description="暂无站点" /> <div class="btn_box" v-if="!siteData.length">
<div class="btn_box" v-if="!siteData.length"> <div style="width: 200px">
<div style="width: 200px"> <a-button block size="large" @click="addSiteAll"
<a-button block size="large" @click="addSiteAll" >新增站点</a-button
>新增站点</a-button >
> </div>
</div> </div>
</div> </div>
</div> <!-- 切换站点 -->
<!-- 切换站点 --> <!-- <div class="cut-btn">
<!-- <div class="cut-btn">
<div> <div>
<a-icon <a-icon
type="vertical-right" type="vertical-right"
...@@ -222,7 +225,8 @@ ...@@ -222,7 +225,8 @@
/> />
</div> </div>
</div> --> </div> -->
</div> </div>
</a-spin>
</div> </div>
<!-- 新增站点 --> <!-- 新增站点 -->
...@@ -256,6 +260,7 @@ export default { ...@@ -256,6 +260,7 @@ export default {
data() { data() {
return { return {
loading: false,
title: "新增站点", title: "新增站点",
formVisible: false, formVisible: false,
allShow: false, //查看全部对话框 allShow: false, //查看全部对话框
...@@ -282,6 +287,7 @@ export default { ...@@ -282,6 +287,7 @@ export default {
}, },
// 获取站点列表 // 获取站点列表
async getSiteList(info = {}) { async getSiteList(info = {}) {
this.loading = true;
let res = await getSiteList(info); let res = await getSiteList(info);
let { data, dict } = res.data.data; let { data, dict } = res.data.data;
data.forEach((v) => { data.forEach((v) => {
...@@ -294,9 +300,11 @@ export default { ...@@ -294,9 +300,11 @@ export default {
); );
}); });
this.siteData = data; this.siteData = data;
this.loading = false;
}, },
// 获取站点信息 // 获取站点信息
async getSiteInfo() { async getSiteInfo() {
this.loading = true;
let res = await siteInfo({ id: this.siteId }); let res = await siteInfo({ id: this.siteId });
let { data, dict } = res.data; let { data, dict } = res.data;
data.modelIds = data.modelIds.split(","); data.modelIds = data.modelIds.split(",");
...@@ -307,6 +315,7 @@ export default { ...@@ -307,6 +315,7 @@ export default {
[] []
); );
this.siteData = [data]; this.siteData = [data];
this.loading = false;
}, },
// 删除 // 删除
......
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