Browse Source

url 调整

preview
jiangyy 5 years ago
parent
commit
ba5df519ad
  1. 1
      epmet-oper-web/.eslintignore
  2. 4
      epmet-oper-web/.vscode/settings.json
  3. 116
      epmet-oper-web/public/index.html
  4. 6
      epmet-oper-web/src/views/components/CForm.vue
  5. 8
      epmet-oper-web/src/views/modules/code/CommitForm.vue
  6. 8
      epmet-oper-web/src/views/modules/code/CommitList.vue
  7. 3
      epmet-oper-web/src/views/modules/code/OperHistory.vue
  8. 4
      epmet-oper-web/src/views/modules/code/SubmitFailReason.vue
  9. 4
      epmet-oper-web/src/views/modules/code/SubmitForm.vue
  10. 6
      epmet-oper-web/src/views/modules/code/SubmitItem.vue
  11. 42
      epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue
  12. 2
      epmet-oper-web/src/views/modules/customer-manage/customer-info.vue
  13. 24
      epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue

1
epmet-oper-web/.eslintignore

@ -1,3 +1,2 @@
/src/icons/iconfont.js
/*.js
/*.vue

4
epmet-oper-web/.vscode/settings.json

@ -13,11 +13,9 @@
"eslint.autoFixOnSave": true,
//  vue 
"eslint.validate": [],
"semi": true, //
"singleQuote": true, //
"trailingComma": "es5", //
// #
"prettier.semi": false,
"prettier.trailingComma": "none",
// #使
"prettier.singleQuote": true,
// #()

116
epmet-oper-web/public/index.html

@ -1,59 +1,67 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
<!-- 站点配置 -->
<script>
window.SITE_CONFIG = {}
window.SITE_CONFIG['version'] = 'v2.0.0'
window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>'
window.SITE_CONFIG['apiURL'] = '' // api请求地址
window.SITE_CONFIG['storeState'] = {} // vuex本地储存初始化状态(用于不刷新页面的情况下,也能重置初始化项目中所有状态)
window.SITE_CONFIG['contentTabDefault'] = {
// 内容标签页默认属性对象
name: '', // 名称, 由 this.$route.name 自动赋值(默认,名称 === 路由名称 === 路由路径)
params: {}, // 参数, 由 this.$route.params 自动赋值
query: {}, // 查询参数, 由 this.$route.query 自动赋值
menuId: '', // 菜单id(用于选中侧边栏菜单,与this.$store.state.sidebarMenuActiveName进行匹配)
title: '', // 标题
isTab: true, // 是否通过tab展示内容?
iframeURL: '' // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配)
}
window.SITE_CONFIG['menuList'] = [] // 左侧菜单列表(后台返回,未做处理)
window.SITE_CONFIG['permissions'] = [] // 页面按钮操作权限(后台返回,未做处理)
window.SITE_CONFIG['dynamicRoutes'] = [] // 动态路由列表
window.SITE_CONFIG['dynamicMenuRoutes'] = [] // 动态(菜单)路由列表
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false // 动态(菜单)路由是否已经添加的状态标示(用于判断是否需要重新拉取数据并进行动态添加操作)
</script>
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
<!-- 站点配置 -->
<script>
window.SITE_CONFIG = {};
window.SITE_CONFIG['version'] = 'v2.0.0';
window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>';
window.SITE_CONFIG['apiURL'] = ''; // api请求地址
window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态(用于不刷新页面的情况下,也能重置初始化项目中所有状态)
window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象
'name': '', // 名称, 由 this.$route.name 自动赋值(默认,名称 === 路由名称 === 路由路径)
'params': {}, // 参数, 由 this.$route.params 自动赋值
'query': {}, // 查询参数, 由 this.$route.query 自动赋值
'menuId': '', // 菜单id(用于选中侧边栏菜单,与this.$store.state.sidebarMenuActiveName进行匹配)
'title': '', // 标题
'isTab': true, // 是否通过tab展示内容?
'iframeURL': '' // 是否通过iframe嵌套展示内容? (以http[s]://开头, 自动匹配)
};
window.SITE_CONFIG['menuList'] = []; // 左侧菜单列表(后台返回,未做处理)
window.SITE_CONFIG['permissions'] = []; // 页面按钮操作权限(后台返回,未做处理)
window.SITE_CONFIG['dynamicRoutes'] = []; // 动态路由列表
window.SITE_CONFIG['dynamicMenuRoutes'] = []; // 动态(菜单)路由列表
window.SITE_CONFIG['dynamicMenuRoutesHasAdded'] = false; // 动态(菜单)路由是否已经添加的状态标示(用于判断是否需要重新拉取数据并进行动态添加操作)
</script>
<!-- 打包命令示例 -->
<!-- npm run build:sit -->
<!-- 打包命令示例 -->
<!-- npm run build:sit -->
<!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<!-- <script>window.SITE_CONFIG['apiURL'] = 'http://10.10.10.98:8080/api';</script> -->
<script>
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.130:8080/api'
</script>
<!-- <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/api';</script> -->
<!-- <script>window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api';</script> -->
<% } %>
<!-- 集成测试环境 dev -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
<script>
window.SITE_CONFIG['apiURL'] =
'http://epmet-dev.elinkservice.cn:48080/api'
</script>
<% } %>
<!-- 验收测试环境 aliyun -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
<script>
window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api'
</script>
<% } %>
<!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script>
window.SITE_CONFIG['apiURL'] = 'https://epmet-cloud.elinkservice.cn/api'
</script>
<% } %>
</head>
<!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<!-- <script>window.SITE_CONFIG['apiURL'] = 'http://10.10.10.98:8080/api';</script> -->
<!-- <script>window.SITE_CONFIG['apiURL'] = 'http://192.168.1.130:8080/api';</script> -->
<!-- <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/api';</script> -->
<script>window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api';</script>
<% } %>
<!-- 集成测试环境 dev -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
<script>window.SITE_CONFIG['apiURL'] = 'http://epmet-dev.elinkservice.cn:48080/api';</script>
<% } %>
<!-- 验收测试环境 aliyun -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
<script>window.SITE_CONFIG['apiURL'] = 'https://epmet-dev.elinkservice.cn/api';</script>
<% } %>
<!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script>window.SITE_CONFIG['apiURL'] = 'https://epmet-cloud.elinkservice.cn/api';</script>
<% } %>
</head>
<body>
<div id="app"></div>
</body>
</html>
<body>
<div id="app"></div>
</body>
</html>

6
epmet-oper-web/src/views/components/CForm.vue

@ -552,7 +552,7 @@ export default {
handleOk (data, key, formIndex) {
this.model[key] = data.label//
const keyid = this.columns[formIndex].keyid// key
const id = data.id
let id = data.id
const p = /[a-z]/i
if (p.test(data.id.substring(0, 1))) { //
id = data.id.substring(1)
@ -625,7 +625,7 @@ export default {
//
changeShow (showKeyArray, showIndexArray, showDefault, hideKeyArray, hideIndexArray) {
// debugger
for (const i = 0; i < showIndexArray.length; i++) {
for (let i = 0; i < showIndexArray.length; i++) {
// this.columns[showIndexArray[i]].showFlag = '1'
this.columns[showIndexArray[i]].show = true
if (this.columns[showIndexArray[i]].required) { //
@ -633,7 +633,7 @@ export default {
}
this.model[showKeyArray[i]] = showDefault[i]
}
for (const j = 0; j < hideIndexArray.length; j++) {
for (let j = 0; j < hideIndexArray.length; j++) {
// this.columns[showIndexArray[j]].showFlag = '1'
this.columns[hideIndexArray[j]].show = false
if (this.columns[hideIndexArray[j]].required) { //

8
epmet-oper-web/src/views/modules/code/CommitForm.vue

@ -66,8 +66,7 @@ export default {
data () {
return {
tempForm: {
commitUrl: '/third/code/upload',
// commitUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/audit',
commitUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/upload',
method: 'A',
dataUrl: [], // //url
data: {
@ -88,8 +87,7 @@ export default {
},
//
selTempId: '',
tableUrl: '/third/code/templatelist',
// tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/templatelist',
tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/templatelist',
tableParams: {
type: Object, // table
default () {
@ -154,7 +152,7 @@ export default {
return false
}
this.startLoading()
const url = '/third/code/getextjson'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/getextjson'
const param = {
customerId: _data.customerId,
clientType: _data.clientType

8
epmet-oper-web/src/views/modules/code/CommitList.vue

@ -138,7 +138,7 @@ export default {
source: this.env
},
//
tableUrl: '/third/code/uploadlist',
tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/uploadlist',
//
operations: [
{
@ -352,7 +352,7 @@ export default {
//
submitRecall (row) {
const url = '/third/code/undo'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/undo'
const param = {
codeId: row.id
}
@ -368,7 +368,7 @@ export default {
//
showQRCode (row) {
this.qrCodeDia.visible = true
const url = '/third/code/qrcode'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/qrcode'
const param = {
codeId: row.id
}
@ -390,7 +390,7 @@ export default {
},
//
issueCode (row) {
const url = '/third/code/release'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/release'
const param = {
codeId: row.id
}

3
epmet-oper-web/src/views/modules/code/OperHistory.vue

@ -35,8 +35,7 @@ export default {
diaVisible: false,
codeId: '',
//
tableUrl: '/third/code/history',
// tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/history',
tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/history',
tableParams: {
type: Object, // table
default () {

4
epmet-oper-web/src/views/modules/code/SubmitFailReason.vue

@ -14,7 +14,7 @@
label-width="150px"
style="display:block">
<span>{{dataForm.reason}}</span>
<div>{{dataForm.reason}}</div>
</el-form-item>
@ -67,7 +67,7 @@ export default {
this.diaVisible = true
// this.dataForm.reason = ','
// this.dataForm.screenshotUrl = ['https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg', 'https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg']
const url = '/third/code/reason'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/reason'
const param = {
codeId: codeId
}

4
epmet-oper-web/src/views/modules/code/SubmitForm.vue

@ -238,7 +238,7 @@ export default {
},
//
dialogImageUrl: '/third/code/mediaupload',
dialogImageUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/mediaupload',
upload_url: '', // URL
upload_name: '', //
picList: [], //
@ -557,7 +557,7 @@ export default {
// console.log('')
// console.log(params.feedbackStuff)
const url = '/third/code/audit'
const url = 'https://epmet-cloud.elinkservice.cn/api/third/code/audit'
this.startLoading()
window.app.ajax.post(url, params,
(data, rspMsg) => {

6
epmet-oper-web/src/views/modules/code/SubmitItem.vue

@ -179,10 +179,8 @@ export default {
data () {
return {
codeId: '',
// addressUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/getpage',
addressUrl: '/third/code/getpage',
categoryUrl: '/third/code/getcategory',
// categoryUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/code/getcategory',
addressUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getpage',
categoryUrl: 'https://epmet-cloud.elinkservice.cn/api/third/code/getcategory',
addressList: [], //
categoryList: [], //
templateRadio: '',

42
epmet-oper-web/src/views/modules/customer-manage/RegisterList.vue

@ -9,7 +9,6 @@
<el-form-item>
<el-input v-model="dataForm.name"
placeholder="组织名称">
</el-input>
</el-form-item>
@ -28,10 +27,8 @@
@commitCode="commitCode"
@init="init">
</c-table>
</div>
</el-card>
</div>
</template>
@ -48,7 +45,8 @@ export default {
name: '' //
},
//
tableUrl: 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerinfo',
tableUrl:
'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerinfo',
// tableUrl: 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/third/pacustomer/registerinfo',
tableParams: {
source: this.env
@ -63,8 +61,12 @@ export default {
slot: '',
plain: false,
methodName: 'init', //
isShow: function (row) {
if (row.initState === 0 && row.resiAuth === 1 && row.workAuth === 1) {
isShow: (row) => {
if (
row.initState === 0 &&
row.resiAuth === 1 &&
row.workAuth === 1
) {
return true
} else {
return false
@ -79,7 +81,7 @@ export default {
slot: '',
plain: false,
methodName: 'commitCode', //
isShow: function (row) {
isShow: (row) => {
if (row.initState === 1) {
return true
} else {
@ -89,8 +91,7 @@ export default {
}
],
//
optionData:
{
optionData: {
client: [
{
value: '01',
@ -173,7 +174,9 @@ export default {
const param = {
customerId: row.customerId
}
window.app.ajax.post(this.initUrl, param,
window.app.ajax.post(
this.initUrl,
param,
(data, rspMsg) => {
this.endLoading()
this.$message.success('初始化成功')
@ -183,11 +186,13 @@ export default {
(rspMsg, data) => {
this.endLoading()
this.$message.error(rspMsg)
})
}
)
},
//
commitCode (row) {
const customerUrl = 'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth'
const customerUrl =
'https://epmet-cloud.elinkservice.cn/api/third/pacustomer/registerbyauth'
const param = {
// workAuth: 1,
// resiAuth: 1,
@ -195,13 +200,15 @@ export default {
initState: 1
}
this.startLoading()
window.app.ajax.post(customerUrl, param,
window.app.ajax.post(
customerUrl,
param,
(data, rspMsg) => {
this.endLoading()
if (data) {
let customerList = []
data.forEach(element => {
data.forEach((element) => {
let oneObj = {
value: element.customerId,
label: element.customerName
@ -210,8 +217,8 @@ export default {
})
this.$router.push({
'name': 'code-CommitList',
'params': {
name: 'code-CommitList',
params: {
showCommit: true,
customerId: row.customerId,
name: row.agencyName,
@ -223,7 +230,8 @@ export default {
(rspMsg, data) => {
this.endLoading()
this.$message.error(rspMsg)
})
}
)
},
//
startLoading () {

2
epmet-oper-web/src/views/modules/customer-manage/customer-info.vue

@ -44,7 +44,7 @@ export default {
props: {
dataList: {
type: [Object, Array],
default: function () {
default: () => {
return {
customerInfoDTO: {},
rootAgencyDTO: {},

24
epmet-oper-web/src/views/modules/customer-manage/customer-manage.vue

@ -225,7 +225,7 @@
></style>
<script>
/* eslint-disable */
import mixinViewModule from '@/mixins/view-module'
import VDistpicker from 'v-distpicker'
import { Loading } from 'element-ui'
@ -237,7 +237,7 @@ export default {
return {
mixinViewModuleOptions: {
getDataListURL: '/oper/crm/customer/getvalidcustomerlist',
getDataListIsPage: false,
getDataListIsPage: false
},
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/customerlogo/upload',
pcd: 'district',
@ -248,7 +248,7 @@ export default {
'乡(镇、街道)级': 'street',
区县级: 'district',
市级: 'city',
省级: 'province',
省级: 'province'
},
genders: ['未知', '男', '女'],
step: 1,
@ -287,15 +287,15 @@ export default {
return callback(new Error('请输入正确格式的手机号'))
}
callback()
},
}
}
},
components: {
VDistpicker,
componentInfo,
componentInfo
},
mounted () {
console.log(app.ajax)
// console.log(app.ajax)
},
methods: {
toStep (s) {
@ -378,17 +378,14 @@ export default {
console.log(dataForm)
const url = '/oper/crm/customer/addmanager'
app.ajax.post(url, dataForm,
window.app.ajax.post(url, dataForm,
(data, rspMsg) => {
this.$message.success('提交信息成功' + this.step)
this.toStep(0)
},
(rspMsg, data) => {
this.$message.error(rspMsg);
});
this.$message.error(rspMsg)
})
// return this.$http
// .post(url, dataForm)
@ -416,7 +413,6 @@ export default {
loadingInstance.close()
},
submitStepHandle () {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
return false
@ -540,7 +536,7 @@ export default {
}
}
},
'dataForm3.level': function (nVal) {
'dataForm3.level': (nVal) => {
this.pcdError = true
this.dataForm3.areaCode = ''
if (nVal === 'province') {

Loading…
Cancel
Save