Skip to content

P
peizhen-vue
Commit cc27e602 by 裴梁博
Options

Merge branch 'feature/v1/plb' into 'master' 

Feature/v1/plb

See merge request !3
parents b14db3e2 6891837f
Showing with 498 additions and 129 deletions
src/api/index.js 0 → 100644
/*
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-10-09 14:59:34
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-10-09 18:59:06
* @FilePath: \peizhen-vue\src\api\index.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import request from "@/utils/request";
// 新增用户统计
export function dataUserGet(query) {
return request({
url: "/system/data/dataUser",
method: "get",
params: query,
});
}
// 新增陪诊员统计
export function dataEmployeesGet(query) {
return request({
url: "/system/data/dataEmployees",
method: "get",
params: query,
});
}
// 订单销售额
export function saleroomGet(query) {
return request({
url: "/system/data/saleroom",
method: "get",
params: query,
});
}
// 平台收益
export function platformRevenueGet(query) {
return request({
url: "/system/data/platformRevenue",
method: "get",
params: query,
});
}
// 订单量
export function orderQuantityGet(query) {
return request({
url: "/system/data/orderQuantity",
method: "get",
params: query,
});
}
// 数据总览柱状图
export function orderQuantityEchartsGet(query) {
return request({
url: `/system/data/findOrderColumnarVoList`,
method: "get",
params: query,
});
}
// 新增陪诊员
export function addEmployeesPost(data) {
return request({
url: "/merchant/employees",
method: "post",
data: data,
});
}
// 陪诊员详情
export function employeesDetailsGet(query) {
return request({
url: `/merchant/employees/${query.id}`,
method: "get",
});
}
// 陪诊员修改
export function employeesUpdatePut(data) {
return request({
url: "/merchant/employees/EmployeesUpdate",
method: "put",
data: data,
});
}
// 陪诊员冻结
export function switchStatusPut(data) {
return request({
url: `/merchant/app/employees/switchStatus?emId=${data.emId}`,
method: "put",
// data: data,
});
}
// 设置为陪护人员
export function switchIdentityPut(data) {
return request({
url: `/merchant/app/employees/switchIdentity?emId=${data.emId}`,
method: "put",
// data: data,
});
}
// 所属商户
export function companyPlistGet(query) {
return request({
url: `/merchant/company/Plist`,
method: "get",
params: query,
});
}
// 设置时间
export function employeesSetWorkHourPut(data) {
return request({
url: "/merchant/app/employees/setWorkHour",
method: "put",
data: data,
});
}
\ No newline at end of file
src/api/merchant/company.js 0 → 100644
import request from '@/utils/request'
// 查询商户列表
export function listCompany(query) {
return request({
url: '/merchant/company/list',
method: 'get',
params: query
})
}
// 查询商户详细
export function getCompany(id) {
return request({
url: '/merchant/company/' + id,
method: 'get'
})
}
// 新增商户
export function addCompany(data) {
return request({
url: '/merchant/company',
method: 'post',
data: data
})
}
// 修改商户
export function updateCompany(data) {
return request({
url: '/merchant/company',
method: 'put',
data: data
})
}
// 删除商户
export function delCompany(id) {
return request({
url: '/merchant/company/' + id,
method: 'delete'
})
}
src/api/merchant/employees.js 0 → 100644
import request from '@/utils/request'
// 查询陪诊员列表
export function listEmployees(query) {
return request({
url: '/merchant/employees/list',
method: 'get',
params: query
})
}
// 查询陪诊员详细
export function getEmployees(id) {
return request({
url: '/merchant/employees/' + id,
method: 'get'
})
}
// 新增陪诊员
export function addEmployees(data) {
return request({
url: '/merchant/employees',
method: 'post',
data: data
})
}
// 修改陪诊员
export function updateEmployees(data) {
return request({
url: '/merchant/employees',
method: 'put',
data: data
})
}
// 删除陪诊员
export function delEmployees(id) {
return request({
url: '/merchant/employees/' + id,
method: 'delete'
})
}
src/api/system/message.js 0 → 100644
import request from '@/utils/request'
// 查询订单消息列表
export function listMessage(query) {
return request({
url: '/system/message/list',
method: 'get',
params: query
})
}
// 查询订单消息详细
export function getMessage(id) {
return request({
url: '/system/message/' + id,
method: 'get'
})
}
// 新增订单消息
export function addMessage(data) {
return request({
url: '/system/message',
method: 'post',
data: data
})
}
// 修改订单消息
export function updateMessage(data) {
return request({
url: '/system/message',
method: 'put',
data: data
})
}
// 删除订单消息
export function delMessage(id) {
return request({
url: '/system/message/' + id,
method: 'delete'
})
}
src/layout/components/Navbar.vue
<template> <template>
<div class="navbar"> <div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> <hamburger
id="hamburger-container"
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/> :is-active="sidebar.opened"
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb
id="breadcrumb-container"
class="breadcrumb-container"
v-if="!topNav"
/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <template v-if="device !== 'mobile'">
<!-- <search id="header-search" class="right-menu-item" /> --> <!-- <search id="header-search" class="right-menu-item" /> -->
<!-- <el-tooltip content="源码地址" effect="dark" placement="bottom"> <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom">
...@@ -22,12 +31,14 @@ ...@@ -22,12 +31,14 @@
<!-- <el-tooltip content="布局大小" effect="dark" placement="bottom"> <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" /> <size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip> --> </el-tooltip> -->
</template> </template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar" class="user-avatar"> <img :src="avatar" class="user-avatar" />
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
...@@ -47,15 +58,15 @@ ...@@ -47,15 +58,15 @@
</template> </template>
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from "vuex";
import Breadcrumb from '@/components/Breadcrumb' import Breadcrumb from "@/components/Breadcrumb";
import TopNav from '@/components/TopNav' import TopNav from "@/components/TopNav";
import Hamburger from '@/components/Hamburger' import Hamburger from "@/components/Hamburger";
import Screenfull from '@/components/Screenfull' import Screenfull from "@/components/Screenfull";
import SizeSelect from '@/components/SizeSelect' import SizeSelect from "@/components/SizeSelect";
import Search from '@/components/HeaderSearch' import Search from "@/components/HeaderSearch";
import RuoYiGit from '@/components/RuoYi/Git' import RuoYiGit from "@/components/RuoYi/Git";
import RuoYiDoc from '@/components/RuoYi/Doc' import RuoYiDoc from "@/components/RuoYi/Doc";
export default { export default {
components: { components: {
...@@ -66,48 +77,51 @@ export default { ...@@ -66,48 +77,51 @@ export default {
SizeSelect, SizeSelect,
Search, Search,
RuoYiGit, RuoYiGit,
RuoYiDoc RuoYiDoc,
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(["sidebar", "avatar", "device"]),
'sidebar',
'avatar',
'device'
]),
setting: { setting: {
get() { get() {
return this.$store.state.settings.showSettings return this.$store.state.settings.showSettings;
}, },
set(val) { set(val) {
this.$store.dispatch('settings/changeSetting', { this.$store.dispatch("settings/changeSetting", {
key: 'showSettings', key: "showSettings",
value: val value: val,
}) });
} },
}, },
topNav: { topNav: {
get() { get() {
return this.$store.state.settings.topNav return this.$store.state.settings.topNav;
} },
} },
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
this.$store.dispatch('app/toggleSideBar') this.$store.dispatch("app/toggleSideBar");
}, },
async logout() { async logout() {
this.$confirm('确定注销并退出系统吗？', '提示', { this.$confirm("确定注销并退出系统吗？", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
location.href = process.env.VUE_APP_CONTEXT_PATH + "#/index";
}) })
}).catch(() => {}); .then(() => {
} this.$store.dispatch("LogOut").then(() => {
console.log("process.env.NODE_ENV",process.env.NODE_ENV);
if (process.env.NODE_ENV === "development") {
location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
} else {
location.href = process.env.VUE_APP_CONTEXT_PATH + "#/index";
} }
} });
})
.catch(() => {});
},
},
};
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
...@@ -116,18 +130,18 @@ export default { ...@@ -116,18 +130,18 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #fff; background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08); box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container { .hamburger-container {
line-height: 46px; line-height: 46px;
height: 100%; height: 100%;
float: left; float: left;
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
-webkit-tap-highlight-color:transparent; -webkit-tap-highlight-color: transparent;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
...@@ -164,10 +178,10 @@ export default { ...@@ -164,10 +178,10 @@ export default {
&.hover-effect { &.hover-effect {
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
} }
......
src/store/getters.js
/*
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-07 10:41:27
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-10-10 13:22:57
* @FilePath: \peizhen-vue\src\store\getters.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
const getters = { const getters = {
sidebar: state => state.app.sidebar, sidebar: state => state.app.sidebar,
size: state => state.app.size, size: state => state.app.size,
...@@ -8,6 +16,7 @@ const getters = { ...@@ -8,6 +16,7 @@ const getters = {
token: state => state.user.token, token: state => state.user.token,
avatar: state => state.user.avatar, avatar: state => state.user.avatar,
name: state => state.user.name, name: state => state.user.name,
user: state => state.user.user,
introduction: state => state.user.introduction, introduction: state => state.user.introduction,
roles: state => state.user.roles, roles: state => state.user.roles,
permissions: state => state.user.permissions, permissions: state => state.user.permissions,
......
src/store/modules/permission.js
...@@ -122,7 +122,6 @@ export function filterDynamicRoutes(routes) { ...@@ -122,7 +122,6 @@ export function filterDynamicRoutes(routes) {
} }
export const loadView = (view) => { export const loadView = (view) => {
console.log(view,"=======loadView")
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
return (resolve) => require([`@/views/${view}`], resolve) return (resolve) => require([`@/views/${view}`], resolve)
} else { } else {
......
src/store/modules/user.js
import { login, logout, getInfo } from '@/api/login' import { login, logout, getInfo } from "@/api/login";
import { getToken, setToken, removeToken } from '@/utils/auth' import { getToken, setToken, removeToken } from "@/utils/auth";
const user = { const user = {
state: { state: {
token: getToken(), token: getToken(),
name: '', name: "",
avatar: '', avatar: "",
roles: [], roles: [],
permissions: [] permissions: [],
user: {},
}, },
mutations: { mutations: {
SET_TOKEN: (state, token) => { SET_TOKEN: (state, token) => {
state.token = token state.token = token;
}, },
SET_NAME: (state, name) => { SET_NAME: (state, name) => {
state.name = name state.name = name;
}, },
SET_AVATAR: (state, avatar) => { SET_AVATAR: (state, avatar) => {
state.avatar = avatar state.avatar = avatar;
}, },
SET_ROLES: (state, roles) => { SET_ROLES: (state, roles) => {
state.roles = roles state.roles = roles;
}, },
SET_PERMISSIONS: (state, permissions) => { SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions state.permissions = permissions;
} },
SET_USER: (state, user) => {
state.user = user;
},
}, },
actions: { actions: {
// 登录 // 登录
Login({ commit }, userInfo) { Login({ commit }, userInfo) {
const username = userInfo.username.trim() const username = userInfo.username.trim();
const password = userInfo.password const password = userInfo.password;
const code = userInfo.code const code = userInfo.code;
const uuid = userInfo.uuid const uuid = userInfo.uuid;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => { login(username, password, code, uuid)
setToken(res.data.token) .then((res) => {
commit('SET_TOKEN', res.data.token) setToken(res.data.token);
resolve() commit("SET_TOKEN", res.data.token);
}).catch(error => { resolve();
reject(error)
})
}) })
.catch((error) => {
reject(error);
});
});
}, },
// 获取用户信息 // 获取用户信息
GetInfo({ commit, state }) { GetInfo({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo().then(res => { getInfo()
const user = res.data.user .then((res) => {
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar; const user = res.data.user;
if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 const avatar =
commit('SET_ROLES', res.data.roles) user.avatar == "" || user.avatar == null
commit('SET_PERMISSIONS', res.data.permissions) ? require("@/assets/images/profile.jpg")
: user.avatar;
if (res.data.roles && res.data.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
commit("SET_ROLES", res.data.roles);
commit("SET_PERMISSIONS", res.data.permissions);
} else { } else {
commit('SET_ROLES', ['ROLE_DEFAULT']) commit("SET_ROLES", ["ROLE_DEFAULT"]);
} }
commit('SET_NAME', user.userName) commit("SET_NAME", user.userName);
commit('SET_AVATAR', avatar) commit("SET_AVATAR", avatar);
resolve(res) commit("SET_USER", user);
}).catch(error => { resolve(res);
reject(error)
})
}) })
.catch((error) => {
reject(error);
});
});
}, },
// 退出系统 // 退出系统
LogOut({ commit, state }) { LogOut({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logout(state.token).then(() => { logout(state.token)
commit('SET_TOKEN', '') .then(() => {
commit('SET_ROLES', []) commit("SET_TOKEN", "");
commit('SET_PERMISSIONS', []) commit("SET_ROLES", []);
removeToken() commit("SET_PERMISSIONS", []);
resolve() removeToken();
}).catch(error => { resolve();
reject(error)
})
}) })
.catch((error) => {
reject(error);
});
});
}, },
// 前端 登出 // 前端 登出
FedLogOut({ commit }) { FedLogOut({ commit }) {
return new Promise(resolve => { return new Promise((resolve) => {
commit('SET_TOKEN', '') commit("SET_TOKEN", "");
removeToken() removeToken();
resolve() resolve();
}) });
} },
} },
} };
export default user export default user;
src/views/hispotalManage/hospital/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com * @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-07 16:09:29 * @Date: 2023-09-07 16:09:29
* @LastEditors: ‘巴博尔’ 2164119982@qq.com * @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-09-20 14:33:53 * @LastEditTime: 2023-09-25 09:37:51
* @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue * @FilePath: \peizhen-vue\src\views\hispotalManage\hospital\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
...@@ -293,11 +293,20 @@ ...@@ -293,11 +293,20 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="地址" prop="mapAddress">
<div @click="clickOpenCheckAddress">
<el-input v-model="form.mapAddress" placeholder="请选择地址" readonly="" />
</div>
</el-form-item>
<el-form-item label="经度" prop="lng"> <el-form-item label="经度" prop="lng">
<el-input v-model="form.lng" placeholder="请输入经度" /> <div @click="clickOpenCheckAddress">
<el-input v-model="form.lng" placeholder="请选择经度" readonly="" />
</div>
</el-form-item> </el-form-item>
<el-form-item label="纬度" prop="lat"> <el-form-item label="纬度" prop="lat">
<el-input v-model="form.lat" placeholder="请输入纬度" /> <div @click="clickOpenCheckAddress">
<el-input v-model="form.lat" placeholder="请选择纬度" readonly="" />
</div>
</el-form-item> </el-form-item>
<el-form-item label="类别" prop="category"> <el-form-item label="类别" prop="category">
<el-select <el-select
...@@ -341,6 +350,24 @@ ...@@ -341,6 +350,24 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
title="选择区域"
:modal-append-to-body="true"
:destroy-on-close="true"
center
:visible.sync="openAddress"
width="60%"
>
<iframe
width="100%"
style="height: 60vh; width: 100%; border: none"
:src="map_src"
></iframe>
<span slot="footer">
<el-button @click="openAddress = false">取 消</el-button>
<el-button type="primary" @click="openAddress = false">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -412,13 +439,58 @@ export default { ...@@ -412,13 +439,58 @@ export default {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
name: [{ required: true, message: "请选择城市", trigger: "blur" }], name: [{ required: true, message: "请选择城市", trigger: "blur" }],
}, },
map_src: "",
openAddress: false,
map_data: {
url: "https://mapapi.qq.com/web/mapComponents/locationPicker/v/index.html?search=1&type=1&key=RQOBZ-K2GCA-I6NKY-CPX4H-WBQAO-4SFSQ&referer=appname",
address: "",
lng: "",
lat: "",
},
}; };
}, },
created() { created() {
let that = this;
window.addEventListener(
"message",
function (event) {
// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
var loc = event.data;
if (loc && loc.module == "locationPicker") {
//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
//{
// module:'locationPicker',
// latlng: {
// lat: 39.998766,
// lng: 116.273938
// },
// poiaddress: "北京市海淀区新建宫门路19号",
// poiname: "颐和园",
// cityname: "北京市"
//}
that.map_data.address = loc.poiaddress;
that.map_data.lat = loc.latlng.lat;
that.map_data.lng = loc.latlng.lng;
console.log(that.map_data, "=======that.map_data");
that.$set(that.form, "mapAddress", loc.poiaddress);
that.$set(that.form, "lng", loc.latlng.lng);
that.$set(that.form, "lat", loc.latlng.lat);
}
},
false
);
this.getList(); this.getList();
this.getDeptTree(); this.getDeptTree();
}, },
methods: { methods: {
clickOpenCheckAddress(lat, lng) {
let mat_url = this.map_data.url;
if (lat && lng) {
mat_url += "&coord=" + lat + "," + lng;
}
this.map_src = mat_url;
this.openAddress = true;
},
/** 查询部门下拉树结构 */ /** 查询部门下拉树结构 */
getDeptTree() { getDeptTree() {
listDepartment().then((response) => { listDepartment().then((response) => {
...@@ -470,6 +542,7 @@ export default { ...@@ -470,6 +542,7 @@ export default {
updateTime: undefined, updateTime: undefined,
delFlag: undefined, delFlag: undefined,
status: undefined, status: undefined,
mapAddress: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
......
src/views/operation/article/index.vue
...@@ -106,12 +106,12 @@ ...@@ -106,12 +106,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="内容" label="内容"
align="center" align="center"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</template> </template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="封面图" prop="cover"> <el-form-item label="封面图" prop="cover">
<imageUpload v-model="form.cover"></imageUpload> <imageUpload v-model="form.cover"></imageUpload>
</el-form-item> </el-form-item>
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
cityVoList: [], cityVoList: [],
}; };
......
src/views/operation/banner/index.vue
...@@ -100,12 +100,12 @@ ...@@ -100,12 +100,12 @@
:formatter="getSiteName" :formatter="getSiteName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column label="图片" align="center" prop="imgUrl" width="180"> <el-table-column label="图片" align="center" prop="imgUrl" width="180">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <el-image <!-- <el-image
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="描述" prop="descr"> <el-form-item label="描述" prop="descr">
<el-input <el-input
...@@ -314,7 +314,7 @@ export default { ...@@ -314,7 +314,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
isUseList: [ isUseList: [
{ {
......
src/views/operation/news/index.vue
...@@ -88,12 +88,12 @@ ...@@ -88,12 +88,12 @@
prop="title" prop="title"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column label="封面" align="center" prop="cover" width="170"> <el-table-column label="封面" align="center" prop="cover" width="170">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <el-image <!-- <el-image
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<el-form-item label="标题" prop="title"> <el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" /> <el-input v-model="form.title" placeholder="请输入标题" />
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="封面" prop="cover"> <el-form-item label="封面" prop="cover">
<imageUpload v-model="form.cover"></imageUpload> <imageUpload v-model="form.cover"></imageUpload>
</el-form-item> </el-form-item>
...@@ -262,7 +262,7 @@ export default { ...@@ -262,7 +262,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
openArticle: false, openArticle: false,
rowArticle: undefined, rowArticle: undefined,
......
src/views/operation/notice/index.vue
...@@ -101,12 +101,12 @@ ...@@ -101,12 +101,12 @@
prop="id" prop="id"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <!-- <el-table-column
label="城市" label="城市"
align="center" align="center"
prop="cityName" prop="cityName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> /> -->
<el-table-column <el-table-column
label="内容" label="内容"
align="center" align="center"
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
placeholder="请输入内容" placeholder="请输入内容"
/> />
</el-form-item> </el-form-item>
<el-form-item label="城市" prop="cityId"> <!-- <el-form-item label="城市" prop="cityId">
<el-select <el-select
filterable filterable
clearable clearable
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="位置" prop="site"> <el-form-item label="位置" prop="site">
<el-select clearable v-model="form.site" placeholder="请输入位置"> <el-select clearable v-model="form.site" placeholder="请输入位置">
<el-option <el-option
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
cityId: [{ required: true, message: "请选择城市", trigger: "change" }], // cityId: [{ required: true, message: "请选择城市", trigger: "change" }],
}, },
placeOptions: [ placeOptions: [
{ {
......
vue.config.js
...@@ -36,10 +36,11 @@ module.exports = { ...@@ -36,10 +36,11 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8089`, // target: `http://localhost:8089`,
target: `https://peizheng.shanpeikj.com/api`, // target: `https://peizheng.shanpeikj.com/api`,
// target: `http://192.168.0.169:8089`, target: `http://192.168.0.169:8089`,
// target: `http://192.168.0.137:8089`, // target: `http://192.168.0.137:8089`,
// target: `http://192.168.0.170:8089`, // target: `http://192.168.0.199:8089`,
// target: `http://192.168.0.125:8089`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: '' ['^' + process.env.VUE_APP_BASE_API]: ''
......
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