diff --git a/config/index.js b/config/index.js
index 54b75a90..f3965d23 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,7 +11,7 @@ module.exports = {
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {
- /**
+
'/api/m1/xm': {
target: 'http://localhost:7067',
changeOrigin: true,
@@ -19,7 +19,7 @@ module.exports = {
'^/api/m1/xm': '/xm'
}
},
-
+ /**
'/api/m1/workflow': {
target: 'http://localhost:7080',
changeOrigin: true,
diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index c6ae1bb1..00f73bb8 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -165,14 +165,14 @@
.tips{
position:absolute;
- font-size: 10px;
- bottom: 0px;
+ font-size: 14px;
+ bottom: -10px;
color: red;
padding-left: 10px;
flex: 0 0 auto;
display: flex;
flex-direction: row;
justify-content: flex-start;
- align-items: center;
+ align-items: bottom;
overflow-x: hidden;
}
\ No newline at end of file
diff --git a/src/views/xm/core/xmIteration/XmIterationComplex.vue b/src/views/xm/core/xmIteration/XmIterationComplex.vue
index 248eecd7..e381173c 100644
--- a/src/views/xm/core/xmIteration/XmIterationComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationComplex.vue
@@ -15,13 +15,13 @@
-
+
-
+
-
+
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index b1aa57ba..5e6c938c 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -5,7 +5,7 @@
-
+
@@ -23,12 +23,9 @@
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
>
-
-
-
-
+
-
+
故事
修改
@@ -89,9 +86,9 @@
-
+
+
-
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 08b17ff8..cf29c56b 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -5,7 +5,6 @@
-
@@ -38,21 +37,20 @@
trigger="click" >
+ 查询条件
产品查询范围：
-
+
-
-
+
-
创建时间:
-
产品名称:
@@ -84,7 +81,18 @@
选责任人
我的
-
+
+
+
+ 项目 {{selProject?selProject.name:''}}
+
+
+
+
+ 迭代 {{xmIteration.iterationName}}
+
+
+
查询
@@ -182,7 +190,7 @@
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
export default {
- props:['selProject'],
+ props:['selProject','xmIteration'],
computed: {
...mapGetters([
'userInfo','roles'
@@ -307,18 +315,19 @@
}
if(this.filters.queryScope=="branchId"){
- params.branchId=this.userInfo.branchId
- params.projectId=null;
+ params.branchId=this.userInfo.branchId
}
- if(!this.selProject && this.filters.queryScope!='productId'){
+ if(!this.selProject && !this.xmIteration && this.filters.queryScope!='productId' && this.filters.queryScope!='compete'){
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
return;
}
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
+ }
+ if(this.xmIteration){
+ params.iterationId=this.xmIteration.id
}
-
if(this.filters.key!==""){
params.key="%"+this.filters.key+"%"
}