Skip to content

S
smart_gov_platform
Commit e6a74240 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 377388a2 e1195843
Hide whitespace changes
Inline Side-by-side
Showing with 399 additions and 205 deletions
base-manager-ui/admin/src/layouts/Layouts.vue
View file @ e6a74240
......@@ -21,7 +21,9 @@
初始化区域数据
</a>
<a-tooltip class="header-item" title="返回门户" placement="bottom">
<a :href="portalUrl + path"> <a-icon type="home" /> 返回门户 </a>
<a :href="portalUrl + path ? path : ''">
<a-icon type="home" /> 返回门户
</a>
</a-tooltip>
</a-space>
</div>
......
base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
View file @ e6a74240
......@@ -2,7 +2,10 @@
<div class="data-update">
<!-- 头部 -->
<div class="header flex aic jcb mb20 pdr6">
<a-button type="primary" @click="handleAdd">新增</a-button>
<a-space>
<a-button type="primary" @click="handleAdd">新增</a-button>
<a-button type="danger" @click="handleDelAll">批量删除</a-button>
</a-space>
<div class="search-box">
<a-input-group compact>
<a-select style="min-width: 100px" v-model="fieldCode">
......@@ -54,6 +57,10 @@
onShowSizeChange: showSizeChange,
}"
:data-source="tableData"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
:rowKey="(record) => record.id"
>
<!-- 序号 -->
......@@ -147,6 +154,7 @@ export default {
previewVisible: false,
previewData: {}, // 预览信息
appTemplate: [], // 字段模板列表
selectedRowKeys: [],
};
},
computed: {
......@@ -248,6 +256,7 @@ export default {
// 搜索
onSearch() {
this.current = 1;
this.selectedRowKeys = [];
this.getDatasetList();
},
// 翻页
......@@ -267,6 +276,19 @@ export default {
this.$refs.AddData.onEdit(row);
this.AddVisible = true;
},
// 选择
onSelectChange(keys) {
this.selectedRowKeys = keys;
},
// 批量删除
handleDelAll() {
if (!this.selectedRowKeys.length) {
this.$message.warn("请先勾选数据");
return;
}
let ids = this.selectedRowKeys.join(",");
this.handleDel(ids);
},
// 删除
handleDel(id) {
let _this = this;
......@@ -284,6 +306,7 @@ export default {
let { code, msg } = res.data;
if (code === 1) {
_this.$message.success(msg);
_this.selectedRowKeys = [];
_this.getDatasetList();
}
},
......
base-manager-ui/admin/src/pages/basicset/appmarket/components/FieldConfig.vue
View file @ e6a74240
......@@ -2,7 +2,10 @@
<div class="field-config">
<!-- 头部 -->
<div class="header flex aic jcb mb20 pdr6">
<a-button type="primary" @click="handleAdd">新增字段</a-button>
<a-space>
<a-button type="primary" @click="handleAdd">新增字段</a-button>
<a-button type="danger" @click="handleDelAll">批量删除</a-button>
</a-space>
<a-input-search
style="width: 300px"
placeholder="请输入字段名称搜索"
......@@ -31,6 +34,10 @@
onShowSizeChange: showSizeChange,
}"
:data-source="tableData"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
:rowKey="(record) => record.id"
>
<!-- 序号 -->
......@@ -131,6 +138,7 @@ export default {
tableData: [],
fieldVisible: false,
title: "",
selectedRowKeys: [],
};
},
created() {
......@@ -168,6 +176,7 @@ export default {
// 搜索
onSearch() {
this.current = 1;
this.selectedRowKeys = [];
this.getTempleteList();
},
// 翻页
......@@ -187,6 +196,19 @@ export default {
this.$refs.AddField.onEdit(row);
this.fieldVisible = true;
},
// 选择
onSelectChange(keys) {
this.selectedRowKeys = keys;
},
// 批量删除
handleDelAll() {
if (!this.selectedRowKeys.length) {
this.$message.warn("请先勾选数据");
return;
}
let ids = this.selectedRowKeys.join(",");
this.handleDel(ids);
},
// 删除
handleDel(id) {
let _this = this;
......@@ -204,6 +226,7 @@ export default {
let { code, msg } = res.data;
if (code === 1) {
_this.$message.success(msg);
_this.selectedRowKeys = [];
_this.getTempleteList();
}
},
......
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue
View file @ e6a74240
......@@ -14,170 +14,199 @@
:label-col="labelCol"
:wrapper-col="wrapperCol"
>
<a-form-model-item
v-for="(v, i) in form.appInfoFieldList"
:key="v.fieldCode"
:label="v.fieldName"
:class="{
content: v.fieldType == 'text',
'upload-item': v.fieldType == 'upload',
}"
:prop="`appInfoFieldList.${i}.fieldValue`"
:rules="{
required: v.fieldNull ? false : true,
message: `${v.fieldName}不能为空`,
trigger: v.fieldType == 'text' ? 'blur' : 'change',
}"
>
<!-- 单行输入框 -->
<a-input
v-if="v.fieldType == 'input'"
v-model="v.fieldValue"
:placeholder="`请输入${v.fieldName}`"
/>
<!-- 多选框 -->
<a-checkbox-group
v-else-if="v.fieldType == 'checkbox'"
v-model="v.checkbox"
@change="(vals) => changeCheckBox(vals, v)"
<template v-for="(v, i) in form.appInfoFieldList">
<a-form-model-item
:label="v.fieldName"
:key="v.fieldCode"
v-if="changeShow(v)"
:class="{
content: v.fieldType == 'text',
'upload-item': v.fieldType == 'upload',
}"
:prop="`appInfoFieldList.${i}.fieldValue`"
:rules="{
required: v.fieldNull ? false : true,
message: `${v.fieldName}不能为空`,
trigger: v.fieldType == 'text' ? 'blur' : 'change',
}"
>
<a-checkbox
v-for="(item, key) in JSON.parse(v.fieldTypeValue)"
:key="key"
:value="key"
<!-- 单行输入框 -->
<a-input
v-if="v.fieldType == 'input'"
v-model="v.fieldValue"
:placeholder="`请输入${v.fieldName}`"
/>
<!-- 多选框 -->
<a-checkbox-group
v-else-if="v.fieldType == 'checkbox'"
v-model="v.checkbox"
@change="(vals) => changeCheckBox(vals, v)"
>
{{ item }}
</a-checkbox>
</a-checkbox-group>
<!--单选框 -->
<a-radio-group
v-else-if="v.fieldType == 'radio'"
v-model="v.fieldValue"
>
<a-radio
v-for="(item, key) in JSON.parse(v.fieldTypeValue)"
:key="key"
:value="key"
<a-checkbox
v-for="(item, key) in JSON.parse(v.fieldTypeValue)"
:key="key"
:value="key"
>
{{ item }}
</a-checkbox>
</a-checkbox-group>
<!--单选框 -->
<a-radio-group
v-else-if="v.fieldType == 'radio'"
v-model="v.fieldValue"
>
{{ item }}
</a-radio>
</a-radio-group>
<!-- 下拉选择框 -->
<a-select
v-else-if="v.fieldType == 'select'"
v-model="v.fieldValue"
placeholder="请选择"
>
<a-select-option
v-for="(item, key) in JSON.parse(v.fieldTypeValue)"
:key="key"
:value="key"
<a-radio
v-for="(item, key) in JSON.parse(v.fieldTypeValue)"
:key="key"
:value="key"
>
{{ item }}
</a-radio>
</a-radio-group>
<!-- 下拉选择框 -->
<a-select
v-else-if="v.fieldType == 'select'"
v-model="v.fieldValue"
placeholder="请选择"
>
{{ item }}
</a-select-option>
</a-select>
<!-- 日期选择器 -->
<a-date-picker
v-else-if="v.fieldType == 'date'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY-MM-DD"
/>
<!-- 年选择器 -->
<a-date-picker
mode="year"
v-else-if="v.fieldType == 'year'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY"
format="YYYY"
:open="isopen"
@openChange="handYearChange"
@panelChange="(value) => panelYearChange(value, v)"
/>
<!-- 月选择器 -->
<a-month-picker
v-else-if="v.fieldType == 'month'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="M"
/>
<!-- 周选择器 -->
<a-week-picker
v-else-if="v.fieldType == 'week'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY-WW"
/>
<!-- 多行文本输入框 -->
<a-textarea
v-else-if="v.fieldType == 'textarea'"
v-model="v.fieldValue"
:autoSize="{
minRows: 4,
maxRows: 4,
}"
:placeholder="`请输入${v.fieldName}`"
allow-clear
/>
<!-- 富文本 -->
<div v-else-if="v.fieldType == 'text'" class="content-box">
<YQuillEditor v-model="v.fieldValue" height="auto"></YQuillEditor>
</div>
<!-- 文件上传 -->
<a-upload
v-else-if="v.fieldType == 'upload'"
:action="api + '/base/file/commonupload'"
:multiple="true"
:file-list="v.fileList"
@change="
(info) => {
handleChange(info, v);
}
"
>
<a-button type="primary">
<a-icon type="upload" /> 点击上传
</a-button>
</a-upload>
<!-- 表格 -->
<a-table
bordered
v-else-if="v.fieldType == 'table'"
size="small"
:scroll="{ y: 550 }"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: current,
total: total,
pageSize: size,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
}"
:columns="columns"
:data-source="tableList"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: (keys, rows) => {
onSelectChange(
keys,
rows,
v,
`appInfoFieldList.${i}.fieldValue`
);
},
}"
@change="changeTable"
:rowKey="(record) => record.id"
>
<template slot="num" slot-scope="text, record, index">
<span>
{{ (current - 1) * size + index + 1 }}
</span>
</template>
</a-table>
</a-form-model-item>
<a-select-option
v-for="(item, key) in JSON.parse(v.fieldTypeValue)"
:key="key"
:value="key"
>
{{ item }}
</a-select-option>
</a-select>
<!-- 日期选择器 -->
<a-date-picker
v-else-if="v.fieldType == 'date'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY-MM-DD"
/>
<!-- 年选择器 -->
<a-date-picker
mode="year"
v-else-if="v.fieldType == 'year'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY"
format="YYYY"
:open="isopen"
@openChange="handYearChange"
@panelChange="(value) => panelYearChange(value, v)"
/>
<!-- 月选择器 -->
<a-month-picker
v-else-if="v.fieldType == 'month'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="M"
/>
<!-- 周选择器 -->
<a-week-picker
v-else-if="v.fieldType == 'week'"
v-model="v.fieldValue"
:placeholder="`请选择${v.fieldName}`"
valueFormat="YYYY-WW"
/>
<!-- 多行文本输入框 -->
<a-textarea
v-else-if="v.fieldType == 'textarea'"
v-model="v.fieldValue"
:autoSize="{
minRows: 4,
maxRows: 4,
}"
:placeholder="`请输入${v.fieldName}`"
allow-clear
/>
<!-- 富文本 -->
<div v-else-if="v.fieldType == 'text'" class="content-box">
<YQuillEditor
v-model="v.fieldValue"
height="auto"
></YQuillEditor>
</div>
<!-- 文件上传 -->
<a-upload
v-else-if="v.fieldType == 'upload'"
:action="api + '/base/file/commonupload'"
:multiple="true"
:file-list="v.fileList"
@change="
(info) => {
handleChange(info, v);
}
"
>
<a-button type="primary">
<a-icon type="upload" /> 点击上传
</a-button>
</a-upload>
<!-- 表格 -->
<div v-else-if="v.fieldType == 'table'">
<div class="search-box">
<a-space>
<a-select style="width: 120px" v-model="searchName">
<a-select-option value=""> 全部 </a-select-option>
<a-select-option
v-for="(v, i) in fieldTypeValue"
:key="i"
:value="v.dataIndex"
>
{{ v.title }}
</a-select-option>
</a-select>
<a-input-search
style="width: 300px"
placeholder="请输入关键字搜索"
enter-button="搜索"
v-model="searchVal"
allowClear
@search="onSearch"
/>
</a-space>
</div>
<a-table
bordered
size="small"
:scroll="{ y: 550 }"
:loading="tableLoading"
:pagination="{
showTotal: (total) => `共 ${total} 条`,
current: current,
total: total,
pageSize: size,
showSizeChanger: true,
showQuickJumper: true,
pageSizeOptions: pageSizeOptions,
}"
:columns="columns"
:data-source="tableList"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: (keys, rows) => {
onSelectChange(
keys,
rows,
v,
`appInfoFieldList.${i}.fieldValue`
);
},
}"
@change="changeTable"
:rowKey="(record) => record.id"
>
<template slot="num" slot-scope="text, record, index">
<span>
{{ (current - 1) * size + index + 1 }}
</span>
</template>
</a-table>
</div>
</a-form-model-item>
</template>
</a-form-model>
</div>
<!-- 底部按钮 -->
......@@ -227,6 +256,7 @@ export default {
data() {
return {
loading: false,
tableLoading: false,
siteId: local.getLocal("siteId"),
api: process.env.VUE_APP_API_BASE_URL,
pageSizeOptions: ["10", "30", "50", "100", "200"],
......@@ -251,6 +281,9 @@ export default {
columns: [],
serviceApi: "",
serviceApiParams: {},
fieldTypeValue: [],
searchName: "",
searchVal: "",
};
},
computed: {
......@@ -267,6 +300,8 @@ export default {
// 关闭
onClose() {
this.$refs.form.resetFields();
this.selectedRowKeys = [];
this.selectedRow = [];
this.Visible = false;
},
// 提交
......@@ -286,6 +321,9 @@ export default {
item.fieldValue = v[this.serviceApiParams[key]];
}
});
if (item.fieldType == "table") {
item.fieldValue = "";
}
return item;
})
),
......@@ -315,7 +353,7 @@ export default {
if (v.id) {
delete v.id;
}
v.fieldValue = "";
v.fieldValue = undefined;
if (v.fieldType == "upload") {
v.fileList = [];
}
......@@ -330,14 +368,14 @@ export default {
customRender: "num",
},
};
let fieldTypeValue = JSON.parse(v.fieldTypeValue);
fieldTypeValue = Object.keys(fieldTypeValue).map((key) => {
this.fieldTypeValue = JSON.parse(v.fieldTypeValue);
this.fieldTypeValue = Object.keys(this.fieldTypeValue).map((key) => {
return {
title: fieldTypeValue[key],
title: this.fieldTypeValue[key],
dataIndex: key,
};
});
this.columns = [index, ...fieldTypeValue];
this.columns = [index, ...this.fieldTypeValue];
this.serviceApi = v.serviceApi;
this.serviceApiParams = JSON.parse(v.serviceApiParams);
this.getData();
......@@ -447,12 +485,19 @@ export default {
},
// 获取数据函数
async getData(data) {
let obj = {};
if (this.searchName) {
obj[this.searchName] = `%${this.searchVal}%`;
}
this.tableLoading = true;
let res = await request(this.api + this.serviceApi, "post", {
size: this.size,
page: this.current,
siteId: this.siteId,
...obj,
...data,
});
this.tableLoading = false;
if (res.data.code == 1) {
let { data, total } = res.data.data;
this.tableList = data;
......@@ -465,6 +510,21 @@ export default {
this.size = pageSize;
this.getData();
},
// 搜索表格
onSearch() {
this.current = 1;
this.getData();
},
changeShow(row) {
let bol = Object.keys(this.serviceApiParams).some((key) => {
return row.fieldCode == key;
});
if (this.selectedRow.length && bol) {
return false;
} else {
return true;
}
},
},
};
</script>
......@@ -496,6 +556,10 @@ export default {
.upload-item {
display: block !important;
}
.search-box {
margin-bottom: 10px;
text-align: right;
}
// .ant-input,
// .ant-select,
// .ant-calendar-picker {
......
base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue
View file @ e6a74240
<template>
<div>
<a-modal :width="750" v-model="Visible" title="新增数据字段">
<a-modal
:width="750"
v-model="Visible"
title="新增数据字段"
@cancel="handleCancel"
>
<a-form-model
:model="form"
ref="form"
......@@ -153,7 +158,7 @@
</template>
<script>
import { saveTemplete } from "@/services/market";
import { saveTemplete, getTempleteList } from "@/services/market";
import { changeCodeNumber } from "@/utils/validate";
const fieldTypeItem = [
{
......@@ -265,6 +270,7 @@ export default {
serviceApiParams: "", // 动态数据参数配置
remark: "", //
},
templeteList: [], // 字段列表
rules: {
fieldCode: [
{ required: true, validator: changeCodeNumber, trigger: "blur" },
......@@ -306,9 +312,26 @@ export default {
},
},
methods: {
// 获取数据模板
async getTempleteList() {
let res = await getTempleteList({
page: 1,
size: -1,
appId: this.$route.query.id,
});
if (res.data.code === 1) {
let { data } = res.data.data;
this.templeteList = data;
}
},
handleOk() {
this.$refs.form.validate(async (valid) => {
if (valid) {
let bol = this.templeteList.some((v) => v.fieldType == "table");
if (bol && !this.form.id) {
this.$message.warn("只能存在一个表格");
return;
}
let fieldTypeObj = {};
let apiParamsObj = {};
this.fieldType.forEach((v) => {
......@@ -356,6 +379,7 @@ export default {
Object.assign(this.form, this.$options.data().form);
this.form.appId = this.$route.query.id;
this.form.id && this.$delete(this.form, "id");
this.getTempleteList();
},
// 编辑
onEdit(data) {
......@@ -392,6 +416,7 @@ export default {
];
}
this.form = { ...data };
this.getTempleteList();
},
// 添加数据配置行数
insertion(index, type) {
......
portal-manager-ui/admin/src/main.js
View file @ e6a74240
......@@ -62,7 +62,7 @@ Vue.prototype.$bus = new Vue();
import "swiper/css/swiper.min.css";
Vue.config.productionTip = false;
// 图片预约
// 图片预览
import Viewer from "v-viewer";
import "viewerjs/dist/viewer.css";
Vue.use(Viewer);
......
portal-manager-ui/admin/src/views/dataActuary/dataActuary.vue
View file @ e6a74240
......@@ -154,7 +154,7 @@ export default {
overflow: hidden;
}
.actuary {
background: url("~@/assets/images/dataActuary/bg.png") center no-repeat;
background: url("~@/assets/images/dataActuary/bg2.png") center no-repeat;
background-size: cover;
.act_cont {
......
portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue
View file @ e6a74240
......@@ -217,7 +217,7 @@ export default {
<style lang="less" scoped>
.data-manage {
padding: 72px 60px 0px 60px;
background: url("@/assets/images/dataManage/bg.png");
background: url("@/assets/images/dataManage/bg_2.png") no-repeat;
background-size: 100% 100%;
.main {
height: 714px;
......
portal-manager-ui/admin/src/views/home/components/changePassword.vue
View file @ e6a74240
......@@ -5,26 +5,74 @@
:destroyOnClose="true"
:visible="visibleEditPwd"
@cancel="handleClose"
width="480px"
width="600px"
>
<a-form-model
:model="form"
:rules="rules"
ref="formData"
:label-col="{ span: 5 }"
:wrapper-col="{ span: 19 }"
:label-col="{ span: 4 }"
:wrapper-col="{ span: 20 }"
>
<a-form-model-item label="原密码" prop="oldPwd">
<a-input-password v-model="form.oldPwd" placeholder="请输入原密码" />
<a-input
:type="oldPwd"
v-model="form.oldPwd"
placeholder="请输入原密码"
>
<template slot="suffix">
<i
v-if="oldPwd == 'password'"
class="iconfont icon-hidden cursor-pointer"
@click="oldPwd = 'text'"
></i>
<i
v-else
class="iconfont icon-show cursor-pointer"
@click="oldPwd = 'password'"
></i>
</template>
</a-input>
</a-form-model-item>
<a-form-model-item label="新密码" prop="newPwd">
<a-input-password v-model="form.newPwd" placeholder="请输入新密码" />
<a-input
:type="newPwd"
v-model="form.newPwd"
placeholder="请输入新密码"
>
<template slot="suffix">
<i
v-if="newPwd == 'password'"
class="iconfont icon-hidden cursor-pointer"
@click="newPwd = 'text'"
></i>
<i
v-else
class="iconfont icon-show cursor-pointer"
@click="newPwd = 'password'"
></i>
</template>
</a-input>
</a-form-model-item>
<a-form-model-item label="确认新密码" prop="newPwdAgain">
<a-input-password
<a-input
:type="newPwdAgain"
v-model="form.newPwdAgain"
placeholder="请再次输入新密码"
/>
>
<template slot="suffix">
<i
v-if="newPwdAgain == 'password'"
class="iconfont icon-hidden cursor-pointer"
@click="newPwdAgain = 'text'"
></i>
<i
v-else
class="iconfont icon-show cursor-pointer"
@click="newPwdAgain = 'password'"
></i>
</template>
</a-input>
</a-form-model-item>
</a-form-model>
......@@ -41,7 +89,7 @@
import { changePassWord } from "@/utils/js/validate";
import { changePassword, LogoutInterface } from "@/api/user";
import { mapMutations } from "vuex";
// import { encrypt } from "@/utils";
import { encrypt } from "@/utils";
import storage from "@/utils/js/Storage";
export default {
props: {
......@@ -61,6 +109,9 @@ export default {
}
};
return {
oldPwd: "password",
newPwd: "password",
newPwdAgain: "password",
form: {
loginName: "",
oldPwd: "",
......@@ -99,16 +150,16 @@ export default {
let _this = this;
this.$refs.formData.validate(async (valid) => {
if (valid) {
// let obj = {
// loginName: encrypt(this.form.loginName),
// oldPwd: encrypt(this.form.oldPwd),
// newPwd: encrypt(this.form.newPwd),
// };
let obj = {
loginName: this.form.loginName,
oldPwd: this.form.oldPwd,
newPwd: this.form.newPwd,
loginName: encrypt(this.form.loginName),
oldPwd: encrypt(this.form.oldPwd),
newPwd: encrypt(this.form.newPwd),
};
// let obj = {
// loginName: this.form.loginName,
// oldPwd: this.form.oldPwd,
// newPwd: this.form.newPwd,
// };
let res = await changePassword(obj);
let { code } = res;
if (code === 1) {
......@@ -128,6 +179,9 @@ export default {
});
},
handleClose() {
this.oldPwd = "password";
this.newPwd = "password";
this.newPwdAgain = "password";
this.$refs.formData.resetFields();
this.Visible = false;
},
......
portal-manager-ui/admin/src/views/signIn/signIn.vue
View file @ e6a74240
......@@ -168,6 +168,8 @@ export default {
setTimeout(() => {
this.$router.push("/home");
}, 20);
} else {
this.createCode();
}
this.loading = false;
}
......@@ -307,6 +309,7 @@ export default {
img {
width: 100%;
height: 100%;
cursor: pointer;
}
}
.login-btn {
......
portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue
View file @ e6a74240
......@@ -233,7 +233,7 @@ export default {
<style lang="less" scoped>
.station {
background: url("@/assets/images/siteArrange/bg.png") no-repeat;
background: url("@/assets/images/siteArrange/bg_2.png") no-repeat;
background-size: 100% 100%;
overflow: hidden;
.del-box {
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue
View file @ e6a74240
......@@ -47,7 +47,7 @@
<script>
import { changeAccount, changePassWord } from "@/utils/js/validate";
import { editPassword } from "@/api/user";
// import { encrypt } from "@/utils";
import { encrypt } from "@/utils";
export default {
props: {
visibleEditPwd: {
......@@ -101,14 +101,14 @@ export default {
handleOk() {
this.$refs.formData.validate(async (valid) => {
if (valid) {
// let obj = {
// loginName: encrypt(this.form.loginName),
// newPwd: encrypt(this.form.newPwd),
// };
let obj = {
loginName: this.form.loginName,
newPwd: this.form.newPwd,
loginName: encrypt(this.form.loginName),
newPwd: encrypt(this.form.newPwd),
};
// let obj = {
// loginName: this.form.loginName,
// newPwd: this.form.newPwd,
// };
let res = await editPassword(obj);
if (res.code === 1) {
this.$message.success("密码修改成功");
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditUser.vue
View file @ e6a74240
......@@ -69,7 +69,7 @@ import { getListByParentId } from "@/api/area.js";
import { userSave } from "@/api/userManagement.js";
import { TreeSelect } from "ant-design-vue";
const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT, SHOW_CHILD
// import { encrypt } from "@/utils";
import { encrypt } from "@/utils";
export default {
data() {
return {
......@@ -181,7 +181,7 @@ export default {
...this.form,
areaNames: JSON.stringify(this.form.areaNames),
areaCodes: this.form.areaNames.map((v) => v.areaCode).join(","),
// loginName: encrypt(this.form.loginName),
loginName: encrypt(this.form.loginName),
});
let { code, msg } = res;
if (code === 1) {
......
portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/addUser.vue
View file @ e6a74240
......@@ -93,7 +93,7 @@ import { changeAccount, changePassWord } from "@/utils/js/validate";
import { getListByParentId } from "@/api/area.js";
import { userSave } from "@/api/userManagement.js";
import { TreeSelect } from "ant-design-vue";
// import { encrypt } from "@/utils";
import { encrypt } from "@/utils";
const SHOW_PARENT = TreeSelect.SHOW_PARENT; //SHOW_ALL, SHOW_PARENT, SHOW_CHILD
export default {
data() {
......@@ -192,8 +192,8 @@ export default {
...this.form,
areaCodes: this.form.areaCodes.join(","),
areaNames: JSON.stringify(this.changeSelect),
// loginName: encrypt(this.form.loginName),
// loginPwd: encrypt(this.form.loginPwd),
loginName: encrypt(this.form.loginName),
loginPwd: encrypt(this.form.loginPwd),
});
let { code, msg } = res;
if (code === 1) {
......
portal-manager-ui/admin/src/views/thePlatformIsSet/setPlatformes copy 3.vue
View file @ e6a74240
......@@ -267,7 +267,7 @@ export default {
.platform {
width: 100%;
height: 100%;
background: url("~@/assets/images/siteArrange/bg-pintai.jpg") no-repeat center /
background: url("@/assets/images/platformSet/bg-pintai.jpg") no-repeat center /
100% 100%;
.container-bg {
padding-top: @headerH;
......
portal-manager-ui/admin/src/views/thePlatformIsSet/setPlatformes copy.vue
View file @ e6a74240
......@@ -126,7 +126,7 @@ export default {
.playground {
width: 100%;
height: 100%;
background: url("~@/assets/images/siteArrange/bg-pintai.jpg") center no-repeat;
background: url("@/assets/images/platformSet/bg-pintai.jpg") no-repeat center;
background-size: cover;
padding-top: @headerH;
......
portal-manager-ui/admin/src/views/thePlatformIsSet/setPlatformes.vue
View file @ e6a74240
......@@ -3265,7 +3265,7 @@ export default {
.modal {
width: 100%;
height: 100%;
background: url("~@/assets/images/siteArrange/bg-pintai.jpg") center no-repeat;
background: url("@/assets/images/platformSet/bg-pintai.jpg") no-repeat center;
background-size: cover;
padding-top: @headerH;
......
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