提交 ac1ac97a 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码

上级 1a872a80
...@@ -199,11 +199,11 @@ export default class AppDepartmentSelect extends Vue { ...@@ -199,11 +199,11 @@ export default class AppDepartmentSelect extends Vue {
if(this.fillMap && Object.keys(this.fillMap).length > 0){ if(this.fillMap && Object.keys(this.fillMap).length > 0){
Object.keys(this.fillMap).forEach((attribute:string) => { Object.keys(this.fillMap).forEach((attribute:string) => {
let _name = this.fillMap[attribute]; let _name = this.fillMap[attribute];
let _value = selectArr.map((item:any) => item[attribute]); let values = selectArr.map((item:any) => item[attribute]);
this.$emit('select-change',{name: this.fillMap[attribute], value: _value.join(",")}) let _value = $event === "[]" ? null : values.join(",");
this.$emit('select-change',{name: this.fillMap[attribute], value: _value})
}); });
} }
} }
} }
</script> </script>
......
...@@ -26,13 +26,16 @@ ...@@ -26,13 +26,16 @@
top: 50%; top: 50%;
transform: translateY(-60%); transform: translateY(-60%);
width: 300px; width: 300px;
.ivu-card{
border-radius: 15px;
.ivu-card-head { .ivu-card-head {
padding: 14px 6px; padding: 14px 6px;
>p{ >p{
line-height: 20px; line-height: 20px;
font-size: 14px; font-size: 20px;
color: #17233d; color: #17233d;
font-weight: 700; font-weight: 700;
text-align:center;
} }
} }
&-header{ &-header{
...@@ -43,11 +46,25 @@ ...@@ -43,11 +46,25 @@
} }
.form-con{ .form-con{
padding: 10px 0 0; padding: 10px 0 0;
.ivu-form-item{
margin-bottom: 20px;
}
p{
font-size: 14px;
font-weight: bold;
height: 21px;
line-height: 21px;
}
button{
background-image: linear-gradient(to bottom,#8bbcf1 0%,#2d8cf0 100%);
border-color:#8bbcf1;
}
} }
.login-tip{ .login-tip{
font-size: 10px; font-size: 10px;
text-align: center; text-align: center;
color: #c3c3c3; color: #5f4949;
}
} }
} }
} }
\ No newline at end of file
...@@ -10,12 +10,14 @@ ...@@ -10,12 +10,14 @@
<div class='login-con'> <div class='login-con'>
<card :bordered="false"> <card :bordered="false">
<p slot='title'> <p slot='title'>
<icon type='ios-log-in'></icon> <!-- <icon type='ios-log-in'></icon> -->
&nbsp;&nbsp;{{this.$t('components.login.caption')}} <!-- &nbsp;&nbsp; -->
{{this.$t('components.login.caption')}}
</p> </p>
<div class='form-con'> <div class='form-con'>
<i-form ref='loginForm' :rules="rules" :model="form"> <i-form ref='loginForm' :rules="rules" :model="form">
<form-item prop='loginname'> <form-item prop='loginname'>
<p>用户名</p>
<i-input <i-input
prefix='ios-contact' prefix='ios-contact'
v-model="form.loginname" v-model="form.loginname"
...@@ -23,6 +25,7 @@ ...@@ -23,6 +25,7 @@
</i-input> </i-input>
</form-item> </form-item>
<form-item prop='password'> <form-item prop='password'>
<p>密码</p>
<i-input <i-input
prefix='ios-key' prefix='ios-key'
v-model="form.password" v-model="form.password"
......
...@@ -35,4 +35,20 @@ export default class PickupTreeViewEngine extends TreeViewEngine { ...@@ -35,4 +35,20 @@ export default class PickupTreeViewEngine extends TreeViewEngine {
this.view.$emit('viewdataschange', args); this.view.$emit('viewdataschange', args);
} }
} }
/**
* 双击选中激活数据
*
* @param {string} ctrlName
* @param {string} eventName
* @param {*} args
* @memberof PickupTreeViewEngine
*/
public onCtrlEvent(ctrlName: string, eventName: string, args: any): void {
if (Object.is(ctrlName, 'tree') && Object.is(eventName, 'nodedblclick')) {
this.view.$emit('viewdatasactivated', args);
return ;
}
super.onCtrlEvent(ctrlName, eventName, args);
}
} }
\ No newline at end of file
import { ChartSeries } from './chart-series';
/**
* 雷达图序列模型
*
* @export
* @class ChartRadarSeries
*/
export class ChartRadarSeries extends ChartSeries{
/**
* 分类属性
*
* @type {string}
* @memberof ChartRadarSeries
*/
public categorField: string = '';
/**
* 值属性
*
* @type {string}
* @memberof ChartRadarSeries
*/
public valueField: string = '';
/**
* 雷达图指示器
*
* @type {string}
* @memberof ChartRadarSeries
*/
public indicator: Array<any> = [];
/**
* 分类代码表
*
* @type {string}
* @memberof ChartRadarSeries
*/
public categorCodeList: any = null;
/**
* 维度编码
*
* @type {*}
* @memberof ChartRadarSeries
*/
public encode:any = null;
/**
* Creates an instance of ChartRadarSeries.
* ChartRadarSeries 实例
*
* @param {*} [opts={}]
* @memberof ChartRadarSeries
*/
constructor(opts: any = {}) {
super(opts);
this.categorField = !Object.is(opts.categorField, '') ? opts.categorField : '';
this.categorCodeList = opts.categorCodeList ? opts.categorCodeList : null;
this.valueField = !Object.is(opts.valueField, '') ? opts.valueField : '';
this.encode = opts.encode ? opts.encode : null;
this.indicator = opts.indicator ? opts.indicator:[];
}
/**
* 设置分类属性
*
* @param {string} state
* @memberof ChartRadarSeries
*/
public setCategorField(state: string): void {
this.categorField = state;
}
/**
* 设置序列名称
*
* @param {string} state
* @memberof ChartRadarSeries
*/
public setValueField(state: string): void {
this.valueField = state;
}
/**
* 分类代码表
*
* @param {*} state
* @memberof ChartRadarSeries
*/
public setCategorCodeList(state: any): void {
this.categorCodeList = state;
}
/**
* 设置编码
*
* @param {*} state
* @memberof ChartRadarSeries
*/
public setEncode(state: any): void {
this.encode = state;
}
/**
* 设置雷达图指示器
*
* @param {*} state
* @memberof ChartRadarSeries
*/
public setIndicator(state: any): void {
this.indicator = state;
}
}
\ No newline at end of file
...@@ -3,3 +3,4 @@ export { ChartLineSeries } from './chart-line-series'; ...@@ -3,3 +3,4 @@ export { ChartLineSeries } from './chart-line-series';
export { ChartFunnelSeries } from './chart-funnel-series'; export { ChartFunnelSeries } from './chart-funnel-series';
export { ChartPieSeries } from './chart-pie-series'; export { ChartPieSeries } from './chart-pie-series';
export { ChartBarSeries } from './chart-bar-series'; export { ChartBarSeries } from './chart-bar-series';
export { ChartRadarSeries } from './chart-radar-series';
\ No newline at end of file
...@@ -41,6 +41,7 @@ export class UIActionTool { ...@@ -41,6 +41,7 @@ export class UIActionTool {
if (Object.is(actionTarget, 'SINGLEKEY')) { if (Object.is(actionTarget, 'SINGLEKEY')) {
let [arg] = args; let [arg] = args;
Object.keys(_params).forEach((name: string) => { Object.keys(_params).forEach((name: string) => {
let hasProperty = true;
if (!name) { if (!name) {
return; return;
} }
...@@ -50,13 +51,16 @@ export class UIActionTool { ...@@ -50,13 +51,16 @@ export class UIActionTool {
if (arg && arg.hasOwnProperty(key)) { if (arg && arg.hasOwnProperty(key)) {
value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null; value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
} else { } else {
value = null; hasProperty = false;
} }
} }
if(hasProperty){
Object.assign(_data, { [name]: value }); Object.assign(_data, { [name]: value });
}
}); });
} else if (Object.is(actionTarget, 'MULTIKEY')) { } else if (Object.is(actionTarget, 'MULTIKEY')) {
Object.keys(_params).forEach((name: string) => { Object.keys(_params).forEach((name: string) => {
let noPropertyNum = 0;
if (!name) { if (!name) {
return; return;
} }
...@@ -69,11 +73,14 @@ export class UIActionTool { ...@@ -69,11 +73,14 @@ export class UIActionTool {
value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null; value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
} else { } else {
value = null; value = null;
noPropertyNum++;
} }
values.push(value); values.push(value);
}); });
} }
Object.assign(_data, { [name]: values.length > 0 ? values.join(',') : value }); if(values.length !== noPropertyNum){
Object.assign(_data, { [name]: values.length > 0 ? values.join(';') : value });
}
}); });
} }
return _data; return _data;
......
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%;">
<i-form> <i-form style="height:100%">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }" :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)" @sort-change="onSortChange($event)"
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
</el-table> </el-table>
</i-form>
<row class='grid-pagination' v-show="items.length > 0"> <row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)" <page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)" @on-page-size-change="onPageSizeChange($event)"
...@@ -160,6 +160,7 @@ ...@@ -160,6 +160,7 @@
</span> </span>
</page> </page>
</row> </row>
</i-form>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
......
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%;">
<i-form> <i-form style="height:100%">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }" :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)" @sort-change="onSortChange($event)"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
</el-table> </el-table>
</i-form>
<row class='grid-pagination' v-show="items.length > 0"> <row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)" <page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)" @on-page-size-change="onPageSizeChange($event)"
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
</span> </span>
</page> </page>
</row> </row>
</i-form>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
......
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%;">
<i-form> <i-form style="height:100%">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }" :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)" @sort-change="onSortChange($event)"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
</el-table> </el-table>
</i-form>
<row class='grid-pagination' v-show="items.length > 0"> <row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)" <page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)" @on-page-size-change="onPageSizeChange($event)"
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
</span> </span>
</page> </page>
</row> </row>
</i-form>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
......
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%;">
<i-form> <i-form style="height:100%">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }" :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)" @sort-change="onSortChange($event)"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
</el-table> </el-table>
</i-form>
<row class='grid-pagination' v-show="items.length > 0"> <row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)" <page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)" @on-page-size-change="onPageSizeChange($event)"
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
</span> </span>
</page> </page>
</row> </row>
</i-form>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
......
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%;">
<i-form> <i-form style="height:100%">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }" :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)" @sort-change="onSortChange($event)"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
</el-table> </el-table>
</i-form>
<row class='grid-pagination' v-show="items.length > 0"> <row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)" <page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)" @on-page-size-change="onPageSizeChange($event)"
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
</span> </span>
</page> </page>
</row> </row>
</i-form>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
......
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%;">
<i-form> <i-form style="height:100%">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
:default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }" :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"
@sort-change="onSortChange($event)" @sort-change="onSortChange($event)"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
</el-table> </el-table>
</i-form>
<row class='grid-pagination' v-show="items.length > 0"> <row class='grid-pagination' v-show="items.length > 0">
<page class='pull-right' @on-change="pageOnChange($event)" <page class='pull-right' @on-change="pageOnChange($event)"
@on-page-size-change="onPageSizeChange($event)" @on-page-size-change="onPageSizeChange($event)"
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
</span> </span>
</page> </page>
</row> </row>
</i-form>
</div> </div>
</template> </template>
<script lang='tsx'> <script lang='tsx'>
......
...@@ -15,7 +15,7 @@ module.exports = { ...@@ -15,7 +15,7 @@ module.exports = {
port: 8111, port: 8111,
compress: true, compress: true,
disableHostCheck: true, disableHostCheck: true,
// proxy: "http://127.0.0.1:8080/web", // proxy: "http://127.0.0.1:8080/",
historyApiFallback: { historyApiFallback: {
rewrites: [ rewrites: [
] ]
......
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
git clone -b master $para2 ibzuaa/ git clone -b master $para2 ibzuaa/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzuaa/ cd ibzuaa/
mvn clean package -Papi
cd ibzuaa-provider/ibzuaa-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \ ...@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \ sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
EXPOSE 40002 EXPOSE 8081
ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar
...@@ -3,21 +3,9 @@ services: ...@@ -3,21 +3,9 @@ services:
ibzuaa-provider-api: ibzuaa-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
ports: ports:
- "40002:40002" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40002
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy: deploy:
mode: replicated mode: replicated
replicas: 1 replicas: 1
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册