first commit
@@ -5,7 +5,7 @@ switch (process.env.NODE_ENV) {
|
||||
case 'development': // 开发环境代理地址
|
||||
proxyObj = {
|
||||
'/Riskmanage': {
|
||||
target: 'http://47.102.125.25:80', // 开发环境
|
||||
target: 'http://127.0.0.1:8082', // 开发环境
|
||||
changeOrigin: true, // 是否跨域
|
||||
pathRewrite: {
|
||||
'^/Riskmanage': '/Riskmanage'
|
||||
@@ -13,7 +13,7 @@ switch (process.env.NODE_ENV) {
|
||||
|
||||
},
|
||||
'/trading': {
|
||||
target: 'http://47.242.85.45:80', // 开发环境
|
||||
target: 'http://127.0.0.1:8071', // 开发环境
|
||||
changeOrigin: true, // 是否跨域
|
||||
pathRewrite: {
|
||||
'^/trading': '/trading'
|
||||
@@ -84,6 +84,25 @@ switch (process.env.NODE_ENV) {
|
||||
}
|
||||
}
|
||||
break
|
||||
case 'produce': // 生产环境
|
||||
proxyObj = {
|
||||
'/Riskmanage': {
|
||||
target: 'http://47.99.93.74:8099', // 生产环境
|
||||
changeOrigin: true, // 是否跨域
|
||||
pathRewrite: {
|
||||
'^/Riskmanage': '/Riskmanage'
|
||||
}
|
||||
},
|
||||
'/trading': {
|
||||
target: 'http://47.99.93.74:8099', // 开发环境
|
||||
changeOrigin: true, // 是否跨域
|
||||
pathRewrite: {
|
||||
'^/trading': '/trading'
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
module.exports = proxyObj
|
||||
|
||||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
1290
h5-datax-manager/package-lock.json
generated
@@ -3,7 +3,7 @@
|
||||
"version": "4.2.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"serve": "vue-cli-service serve",
|
||||
"serve": "vue-cli-service serve --mode development",
|
||||
"serve:test": "vue-cli-service serve --mode test",
|
||||
"serve:jia": "vue-cli-service serve --mode jia",
|
||||
"serve:niu": "vue-cli-service serve --mode niu",
|
||||
|
||||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 21 KiB |
BIN
h5-datax-manager/public/logo1.png
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
BIN
h5-datax-manager/src/assets/img/img2.png
Normal file
|
After Width: | Height: | Size: 21 KiB |
@@ -54,7 +54,7 @@
|
||||
</div> -->
|
||||
<!-- 用户头像 -->
|
||||
<div class="user-avator">
|
||||
<img src="../../assets/img/img.jpg" />
|
||||
<img src="../../assets/img/img2.png" />
|
||||
</div>
|
||||
<!-- 用户名下拉菜单 -->
|
||||
<el-dropdown class="user-name" trigger="click" @command="handleCommand">
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<template>
|
||||
<div class="cont_cont">
|
||||
|
||||
<div class="cont_left" v-loading="leftloading">
|
||||
<!-- <div class="cont_left" v-loading="leftloading">
|
||||
<div class="cont_header">
|
||||
<p class="cont_header_title">{{title}}</p>
|
||||
<p class="cont_header_subtitle">{{title}}</p>
|
||||
@@ -15,8 +15,56 @@
|
||||
@updatafilelist="updatafilelist" @delectFun="delectFun">
|
||||
</fileHome>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="cont_right" v-loading="contloading" @click="tempHintLeft=null;tempHintTop=null;">
|
||||
<div v-if="!listRedact" class="search-form">
|
||||
<el-form :model="searchForm" label-width="100px">
|
||||
<el-row :gutter="20">
|
||||
<!-- 用户名查询 -->
|
||||
<el-col :span="6" v-for="item in getSearch">
|
||||
<el-form-item :label="item.name">
|
||||
<el-input v-if="item.type==='1'" v-model="searchForm[item.key]" placeholder="请输入用户名"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- 角色查询 -->
|
||||
<!-- <el-col :span="6">
|
||||
<el-form-item label="字段中文名">
|
||||
<el-input v-model="searchForm.username" placeholder="请输入用户名"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!– 注册日期查询 –>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker v-model="searchForm.registrationDate" type="daterange" range-separator="至"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<!– 状态查询 –>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="searchForm.role" placeholder="状态">
|
||||
<el-option label="启用" value="admin"></el-option>
|
||||
<el-option label="禁用" value="user"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>-->
|
||||
<!-- 查询和重置按钮,放在一行 -->
|
||||
<el-row>
|
||||
<el-col :span="24" class="button-container">
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="handleSearch">查询</el-button>
|
||||
<el-button @click="handleReset">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
<div v-if="!listRedact">
|
||||
<div v-if="showRight===false" class="cont_right_hint">
|
||||
请先选择左侧文件夹
|
||||
@@ -24,15 +72,16 @@
|
||||
<div v-else>
|
||||
<div class="cont_right_top">
|
||||
<div>
|
||||
<el-button type="primary" @click="listRedact=true" :disabled="currid!=99999999?false:'disabled'">新增</el-button>
|
||||
<!-- <el-button typeof="primary" @click="listRedact=true" :disabled="currid!=99999999?false:'disabled'">新增</el-button>-->
|
||||
<el-button type="primary" @click="listRedact=true">新增</el-button>
|
||||
<el-button type="danger" @click="using(-1)" :disabled="this.selection.length>0?false:'disabled'">删除</el-button>
|
||||
<el-button type="success" @click="using(1)" :disabled="this.selection.length>0?false:'disabled'">启用</el-button>
|
||||
<el-button type="warning" @click="using(0)" :disabled="this.selection.length>0?false:'disabled'">停用</el-button>
|
||||
<!-- <el-select v-model="tempMove" placeholder="移动到:" style="margin-left: 10px;" :disabled="this.selection.length>0?false:'disabled'" filterable @change="mixinMoveChange"> -->
|
||||
<el-select v-model="tempMove" placeholder="移动到:" style="margin-left: 10px;" :disabled="this.selection.length>0?false:'disabled'"
|
||||
<!-- <el-select v-model="tempMove" placeholder="移动到:" style="margin-left: 10px;" :disabled="this.selection.length>0?false:'disabled'"
|
||||
filterable @change="moveChange">
|
||||
<el-option v-for="value in listunfold" :key="value.id" :label="value.name" :value="value.id" v-show="value.id!=99999999"></el-option>
|
||||
</el-select>
|
||||
</el-select>-->
|
||||
<!-- 断点 准备移动 -->
|
||||
</div>
|
||||
<div v-if="getData.type==1">
|
||||
@@ -136,6 +185,10 @@
|
||||
type: Object,
|
||||
default: null
|
||||
},
|
||||
getSearch: {
|
||||
type: Array,
|
||||
default: null
|
||||
},
|
||||
|
||||
},
|
||||
watch: {
|
||||
@@ -165,7 +218,8 @@
|
||||
tempId: null,
|
||||
listRedact: false, //新增页面开启
|
||||
tempRedactId: 0,
|
||||
selection: []
|
||||
selection: [],
|
||||
searchForm: {}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
||||
@@ -351,7 +351,6 @@ export default {
|
||||
this.loading = true
|
||||
this.getInfo(this.id, {}).then(res => {
|
||||
this.loading = false
|
||||
|
||||
if (res.status === "1") {
|
||||
this.jsonValue = JSON.stringify(JSON.parse(res.data.fieldVo.jsonValue), null, 4)
|
||||
|
||||
@@ -368,9 +367,12 @@ export default {
|
||||
this.fid = res.data.fieldVo.fieldTypeId
|
||||
this.isOutput = res.data.fieldVo.isOutput == 1 ? true : false
|
||||
this.isLocalVariable = res.data.fieldVo.isLocalVariable
|
||||
console.log("3333")
|
||||
console.log(res.data.fieldVo.isDerivative)
|
||||
console.log(res.data.fieldVo.isUseSql)
|
||||
if (res.data.fieldVo.isDerivative) {
|
||||
this.isDerivative = 'Derivative'
|
||||
} else if (res.data.fieldVo.useSql) {
|
||||
} else if (res.data.fieldVo.isUseSql) {
|
||||
this.isDerivative = 'SQL'
|
||||
this.SQLType = this.$store.state.Sourcelist.find(x => x.id == res.data.fieldVo
|
||||
.dataSourceId).type
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<el-col :span="8">
|
||||
<el-card shadow="hover" class="mgb20" style="height:252px;">
|
||||
<div class="user-info">
|
||||
<img src="../../assets/img/img.jpg" class="user-avator" alt />
|
||||
<img src="../../assets/img/img2.png" class="user-avator" alt />
|
||||
<div class="user-info-cont">
|
||||
<div class="user-info-name">{{name}}</div>
|
||||
<!-- <div>{{role}}</div> -->
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
|
||||
<div>
|
||||
<cont title="常量指标" :getData="getDataFun"></cont>
|
||||
|
||||
<cont title="常量指标" :getData="getDataFun" :getSearch="getSearchForm"></cont>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -110,6 +110,28 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
getSearchForm: [
|
||||
{
|
||||
name:"字段名称",
|
||||
key:"userName",
|
||||
type:"1",
|
||||
},
|
||||
{
|
||||
name:"字段中文名",
|
||||
key:"userName1",
|
||||
type:"1",
|
||||
},
|
||||
{
|
||||
name:"创建时间",
|
||||
key:"userName1",
|
||||
type:"1",
|
||||
},
|
||||
{
|
||||
name:"状态",
|
||||
key:"userName1",
|
||||
type:"1",
|
||||
}
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
@@ -118,4 +140,8 @@
|
||||
|
||||
<style>
|
||||
|
||||
.button-container {
|
||||
text-align: right; /* 使按钮右对齐 */
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<el-upload
|
||||
:headers="header"
|
||||
class="upload-demo"
|
||||
action="Riskmanage/models/uploadAndParseFile"
|
||||
action="/models/uploadAndParseFile"
|
||||
:on-remove="handleRemove"
|
||||
:before-remove="beforeRemove"
|
||||
:before-upload="beforeUpload"
|
||||
|
||||