Commit ad580498 authored by 张伯涛's avatar 张伯涛

修改

parent 1d0bc9d1
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="auto"> label-width="auto">
<el-form-item label="序号" prop="xh"> <!-- <el-form-item label="序号" prop="xh">-->
<el-input <!-- <el-input-->
v-model="queryParams.xh" <!-- v-model="queryParams.xh"-->
placeholder="请输入序号" <!-- placeholder="请输入序号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="市" prop="city"> <el-form-item label="市" prop="city">
<el-input <el-input
v-model="queryParams.city" v-model="queryParams.city"
...@@ -286,14 +286,14 @@ ...@@ -286,14 +286,14 @@
<el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" /> <el-table-column label="姓名" align="center" prop="userName" width="100" :show-overflow-tooltip="true" />
<el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" /> <el-table-column label="身份证号码" align="center" prop="cardNo" width="180" :show-overflow-tooltip="true" />
<el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" /> <el-table-column label="联系方式" align="center" prop="phone" width="120" :show-overflow-tooltip="true" />
<el-table-column label="性别" align="center" prop="sex"> <el-table-column label="性别" align="center" prop="sex" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" /> <el-table-column label="住址" align="center" prop="address" width="120" :show-overflow-tooltip="true" />
<el-table-column label="年龄" align="center" prop="age" /> <el-table-column label="年龄" align="center" prop="age" width="100" :show-overflow-tooltip="true" />
<el-table-column label="类别" align="center" prop="category" /> <el-table-column label="类别" align="center" prop="category" width="100" :show-overflow-tooltip="true" />
<el-table-column label="采集时间" align="center" prop="cjTime"width="100" :show-overflow-tooltip="true"> <el-table-column label="采集时间" align="center" prop="cjTime"width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.cjTime) ? parseTime(scope.row.cjTime).substring(0,10) : '' }}</span> <span>{{ parseTime(scope.row.cjTime) ? parseTime(scope.row.cjTime).substring(0,10) : '' }}</span>
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" width="100" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
......
...@@ -35,7 +35,8 @@ module.exports = { ...@@ -35,7 +35,8 @@ module.exports = {
proxy: { proxy: {
// 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:8080`, target: `http://110.249.132.101:10069/`,
// target: `http://124.71.16.228:18081/`,
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