From 2d6bfa860ed7fdde82144382f5284d69172a8646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 18 Dec 2022 15:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=A1=E4=BB=B6=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=20=E6=9B=B4=E5=A4=9A=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |   6 +-
 src/views/login/components/login.vue          |   2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  39 ++--
 src/views/xm/core/xmTask/XmTaskMng.vue        | 171 +++++++++++-------
 4 files changed, 135 insertions(+), 83 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index f5db46b4..205ac83d 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -153,13 +153,13 @@ function getQueryVariable(variable,url){
 function setIndexPath() {  
 	var indexPath=null
 	var url=window.location.href;
-	if(url.indexOf("/login")<=0){
+	if(url.indexOf("/login")<0){
 		var indexOf=url.indexOf("/#")
 		if(indexOf > 0){
 		indexPath=url.substring(indexOf+2)
-		localStorage.setItem("index-path",indexPath);
+		sessionStorage.setItem("index-path",indexPath);
 		}else{
-		localStorage.setItem("index-path",null);
+		sessionStorage.setItem("index-path",null);
 		}
 	} 
 }
diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue
index 03411a77..7d59fd8c 100644
--- a/src/views/login/components/login.vue
+++ b/src/views/login/components/login.vue
@@ -312,7 +312,7 @@ export default {
         },
         //角色身份验证
         rolesChecked(){ 
-            var indexPath=localStorage.getItem("index-path");
+            var indexPath=sessionStorage.getItem("index-path");
             if(!indexPath){
                 indexPath="/"
             }
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 3020eb89..4532839c 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -27,7 +27,7 @@
 				<el-popover
 					placement="top-start"
 					title="更多条件、操作"
-					width="500"
+					width="800"
 					v-model="moreVisible"
 					trigger="manual" >
 					
@@ -38,39 +38,47 @@
 					</el-row>
 					 <el-divider></el-divider>  
 						<el-row>
-							<font class="more-label-font">创建者:</font>
-							<mdp-select-user-xm label="选择创建者" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>  
-						</el-row>
-						<el-row>
-							<font class="more-label-font">指派给:</font>
-							<mdp-select-user-xm label="选择负责人" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>   
+							<el-col :span="12">
+								<font class="more-label-font">创建者:</font>
+								<mdp-select-user-xm label="选择创建者" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>  
+							</el-col>  
+							<el-col :span="12">
+								<font class="more-label-font">指派给:</font>
+								<mdp-select-user-xm label="选择负责人" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>   
+							</el-col>
 						</el-row> 
 						<el-row>
+							<el-col :span="12">
 								<font class="more-label-font">需求:</font>
 							<font  v-if="  filters.menus && filters.menus.length>0">
 								<el-tag  v-for="(item,index) in filters.menus" :key="index"  closable  @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag>
 							</font>
 							<el-button v-else    @click="showMenu" type="plian" icon="el-icon-search">选需求</el-button>
-						</el-row> 
-						<el-row>
+						
+							</el-col>  
+							<el-col :span="12">
 								<font class="more-label-font">缺陷编号:</font>  
 								<el-input v-model="filters.id" style="width:200px;" clearable></el-input>
+							</el-col>  
 						</el-row>
 						<el-row>
+							<el-col :span="12">
 							<font class="more-label-font">优先级:</font>  
 							<el-select   v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;">
 								<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
-						</el-row>
-						<el-row>
+							</el-col>  
+							<el-col :span="12">
 							<font class="more-label-font">解决方案:</font>  
 							<el-select  v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;">
 								<el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}}
 								</el-option>
 							</el-select>
+							</el-col>  
 						</el-row>
 						<el-row>
+							<el-col :span="12">
 							<font class="more-label-font">创建时间:</font>
 							<el-date-picker
 								v-model="dateRanger"
@@ -84,8 +92,8 @@
 								:default-time="['00:00:00','23:59:59']"
 								:picker-options="pickerOptions"
 							></el-date-picker>
-						</el-row>
-						<el-row>
+							</el-col>  
+							<el-col :span="12">
 							<font class="more-label-font">更新时间:</font>
 							<el-date-picker
 								v-model="ltimeRanger"
@@ -99,6 +107,7 @@
 								:default-time="['00:00:00','23:59:59']"
 								:picker-options="pickerOptions"
 							></el-date-picker>
+							</el-col>  
 						</el-row>
 						<el-row>
 							<el-button   type="primary" style="float:right;" icon="el-icon-search" @click="searchXmQuestions">查询</el-button> 
@@ -1094,4 +1103,8 @@
   margin-top: 10px;
   margin-right: 40px;
 }
+
+>>> .el-date-editor--daterange.el-input, .el-date-editor--daterange.el-input__inner, .el-date-editor--timerange.el-input, .el-date-editor--timerange.el-input__inner {
+     width: 250px;
+}
 </style>
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 5f81ca8b..d981dc8b 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -73,7 +73,7 @@
           <el-popover
             placement="top-start"
             title="更多查询条件或者操作"
-            width="700"
+            width="800"
             trigger="manual"
             v-model="moreVisible"
           >
@@ -99,18 +99,23 @@
               </el-row>
               <el-divider></el-divider>
               <el-row>
-                <font class="more-label-font">责任人:</font> 
-                <mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm> 
-              </el-row>
-              <el-row>
-                <font class="more-label-font">执行人:</font> 
-                <mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm> 
+                <el-col :span="12"> 
+                  <font class="more-label-font">责任人:</font> 
+                  <mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm> 
+                </el-col>
+                <el-col :span="12"> 
+                  <font class="more-label-font">执行人:</font> 
+                  <mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm> 
+                </el-col>
               </el-row>
               <el-row>
+                <el-col :span="12">
+                  
                 <font class="more-label-font">产品:</font
                 > <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
-              </el-row>
-              <el-row>
+                </el-col>
+                <el-col :span="12">
+                  
                 <font class="more-label-font">需求:</font>
                 <font v-if="filters.menus && filters.menus.length > 0">
                   <el-tag
@@ -124,9 +129,11 @@
                 <el-button v-else @click="showMenuStory" type="plian" icon="el-icon-search"
                   >选需求</el-button
                 >
+                </el-col>
               </el-row>
               <el-row>
-                <font class="more-label-font">技能:</font>
+                <el-col :span="12">
+                  <font class="more-label-font">技能:</font>
                 <el-button
                   v-if="!filters.skillTags || filters.skillTags.length == 0"
                   icon="el-icon-search"
@@ -142,42 +149,84 @@
                   @close="skillTagClear(skill)"
                   >{{ skill.skillName }}</el-tag
                 >
+                </el-col>
+                <el-col :span="12">
+                    <font class="more-label-font">标签:</font>
+                  <el-button
+                    v-if="!filters.tags || filters.tags.length == 0"
+                    @click.native="$refs.tagDialog.open()" icon="el-icon-search"
+                    >选标签</el-button
+                  >
+                  <el-tag
+                    v-else
+                    @click="$refs.tagDialog.open()"
+                    closable
+                    @close="clearFiltersTag(filters.tags[0])"
+                    >{{ filters.tags[0].tagName.substr(0, 5) }}等({{
+                      filters.tags.length
+                    }})个</el-tag
+                  >
+                </el-col>
               </el-row>
+              <el-row> 
+                <el-col :span="12" > 
+                  
+                  <font class="more-label-font">众包任务:</font>
+
+                  <el-checkbox  class="more-label-font"
+                    v-model="filters.taskOut"
+                    true-label="1"
+                    false-label=""
+                    >只查众包</el-checkbox
+                  >
+                </el-col>
+              </el-row> 
+              
               <el-row>
-                <font class="more-label-font">标签:</font>
-                <el-button
-                  v-if="!filters.tags || filters.tags.length == 0"
-                  @click.native="$refs.tagDialog.open()" icon="el-icon-search"
-                  >选标签</el-button
-                >
-                <el-tag
-                  v-else
-                  @click="$refs.tagDialog.open()"
-                  closable
-                  @close="clearFiltersTag(filters.tags[0])"
-                  >{{ filters.tags[0].tagName.substr(0, 5) }}等({{
-                    filters.tags.length
-                  }})个</el-tag
-                >
-              </el-row>
-
-              <el-row>
-                <font class="more-label-font">众包任务:</font>
-
-                <el-checkbox  class="more-label-font"
-                  v-model="filters.taskOut"
-                  true-label="1"
-                  false-label=""
-                  >众包</el-checkbox
-                >
-              </el-row>
+                <el-col :span="12">
+                  
+                  <font class="more-label-font">最后变动日期:</font>
+                  <mdp-date-range
+                    v-model="filters"
+                    type="daterange" 
+                    start-key="ltimeStart"
+                    end-key="ltimeEnd"  
+                    unlink-panels
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="完成日期"
+                    value-format="yyyy-MM-dd HH:mm:ss" 
+                    :default-time="['00:00:00', '23:59:59']" 
+                    :auto-default="false"
+                    key="ltime"
+                  ></mdp-date-range>
+                </el-col> 
+              </el-row> 
               <el-row>
-                <font class="more-label-font">计划开始时间:</font>
+                <el-col :span="12">
+                  <font class="more-label-font">计划开始时间:</font>
+                  <mdp-date-range
+                    v-model="filters"
+                    type="daterange" 
+                    start-key="planStartTimeStart"
+                    end-key="planStartTimeEnd"
+                    unlink-panels
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="完成日期"
+                    value-format="yyyy-MM-dd HH:mm:ss" 
+                    :default-time="['00:00:00', '23:59:59']" 
+                    :auto-default="false"
+                    key="planStartTime"
+                  ></mdp-date-range>
+                </el-col>
+                <el-col :span="12">
+                  <font class="more-label-font">实际开始时间:</font>
                 <mdp-date-range
                   v-model="filters"
                   type="daterange" 
-                  start-key="planStartTimeStart"
-                  end-key="planStartTimeEnd"
+                  start-key="actStartTimeStart"
+                  end-key="actStartTimeEnd"
                   unlink-panels
                   range-separator="至"
                   start-placeholder="开始日期"
@@ -185,11 +234,13 @@
                   value-format="yyyy-MM-dd HH:mm:ss" 
                   :default-time="['00:00:00', '23:59:59']" 
                   :auto-default="false"
-                  key="planStartTime"
                 ></mdp-date-range>
-              </el-row>
+                  
+                </el-col>
+              </el-row> 
               <el-row>
-                <font class="more-label-font">计划结束时间:</font>
+                <el-col :span="12">
+                  <font class="more-label-font">计划结束时间:</font>
                 <mdp-date-range
                   v-model="filters"
                   type="daterange" 
@@ -204,26 +255,9 @@
                   :auto-default="false" 
                   key="planEndTime"
                 ></mdp-date-range>
-              </el-row>
-              
-              <el-row>
-                <font class="more-label-font">实际开始时间:</font>
-                <mdp-date-range
-                  v-model="filters"
-                  type="daterange" 
-                  start-key="actStartTimeStart"
-                  end-key="actStartTimeEnd"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="完成日期"
-                  value-format="yyyy-MM-dd HH:mm:ss" 
-                  :default-time="['00:00:00', '23:59:59']" 
-                  :auto-default="false"
-                ></mdp-date-range>
-              </el-row>
-              <el-row>
-                <font class="more-label-font">实际结束时间:</font>
+                </el-col>
+                <el-col :span="12">
+                  <font class="more-label-font">实际结束时间:</font>
                 <mdp-date-range
                   v-model="filters"
                   type="daterange" 
@@ -237,7 +271,8 @@
                   :default-time="['00:00:00', '23:59:59']" 
                   :auto-default="false"
                 ></mdp-date-range>
-              </el-row>
+                </el-col>
+              </el-row>  
               <el-row>
                 <el-button style="float:right;"
                   type="primary"
@@ -2195,7 +2230,7 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .align-right {
   float: right;
 }
@@ -2231,6 +2266,10 @@ export default {
   font-size: 16px;
   overflow-x: auto;
   overflow-y: hidden;
-}
+} 
+ 
 
+>>> .el-date-editor--daterange.el-input, .el-date-editor--daterange.el-input__inner, .el-date-editor--timerange.el-input, .el-date-editor--timerange.el-input__inner {
+     width: 250px;
+}
 </style>