优化

src/common/js/util.js

@@ -81,12 +81,12 @@ export default {
     var innerHeight=window.innerHeight  
     var defaultInnerHeight=616;  
     var pageHeight=32/defaultInnerHeight*innerHeight 
-    var top=148/defaultInnerHeight*innerHeight;
-    var bottomHeight=38/defaultInnerHeight*innerHeight
+    var top=150/defaultInnerHeight*innerHeight;
+    var bottomHeight=36/defaultInnerHeight*innerHeight
     if(innerHeight>=916){
       bottomHeight=20/defaultInnerHeight*innerHeight
     }else if(innerHeight>=800){
-      bottomHeight=28/defaultInnerHeight*innerHeight
+      bottomHeight=26/defaultInnerHeight*innerHeight
     }else if(innerHeight>=700){
       bottomHeight=32/defaultInnerHeight*innerHeight
     }

src/views/xm/core/components/XmProductSelect.vue

@@ -4,24 +4,44 @@
       placement="bottom"
       width="400"
       trigger="manual"
-							v-model="productVisible">  
+      v-model="productVisible"
+    >
       <el-row>
-									 <el-button type="text" icon="el-icon-refresh" @click="refreshSelect" title="重新从后台刷新数据回来">刷新</el-button>&nbsp;&nbsp;
-												<el-button v-if="editForm && editForm.id" type="text" icon="el-icon-circle-close" @click="clearSelect" title="清空当前选中的产品">清除选中</el-button>&nbsp;&nbsp;
+        <el-button
+          type="text"
+          icon="el-icon-refresh"
+          @click="refreshSelect"
+          title="重新从后台刷新数据回来"
+          >刷新</el-button
+        >&nbsp;&nbsp;
+        <el-button
+          v-if="editForm && editForm.id"
+          type="text"
+          icon="el-icon-circle-close"
+          @click="clearSelect"
+          title="清空当前选中的产品"
+          >清除选中</el-button
+        >&nbsp;&nbsp;
         <el-popover
           placement="top-start"
           title=""
           width="400"
           v-model="moreVisible"
-													trigger="manual" >
+          trigger="manual"
+        >
           <el-row>
-														<el-col  :span="24"  style="padding-top:5px;">
+            <el-col :span="24" style="padding-top: 5px">
               <font class="more-label-font">产品编号:</font>
-															<el-input   v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
+              <el-input
+                v-model="filters.id"
+                style="width: 100%"
+                placeholder="输入产品编号"
+                @keyup.enter.native="searchXmProducts"
+              >
               </el-input>
             </el-col>
 
-														<el-col  :span="24"  style="padding-top:5px;">
+            <el-col :span="24" style="padding-top: 5px">
               <font class="more-label-font">创建时间:</font>
               <el-date-picker
                 v-model="dateRanger"
@@ -37,81 +57,171 @@
               ></el-date-picker>
             </el-col>
 
-														<el-col  :span="24"  style="padding-top:5px;">
-															<font class="more-label-font">
-																产品名称:
-															</font>
-															<el-input   v-model="filters.key" style="width:100%;"  placeholder="输入产品名字关键字">
+            <el-col :span="24" style="padding-top: 5px">
+              <font class="more-label-font"> 产品名称: </font>
+              <el-input
+                v-model="filters.key"
+                style="width: 100%"
+                placeholder="输入产品名字关键字"
+              >
               </el-input>
             </el-col>
-														<el-col  :span="24"  style="padding-top:5px;">
-															<font class="more-label-font">
-																产品经理:
-															</font>
-															<el-tag v-if="filters.pmUser" closable @click="selectFiltersPmUser" @close="clearFiltersPmUser()">{{filters.pmUser.username}}</el-tag>
-															<el-button   v-else @click="selectFiltersPmUser()">选责任人</el-button>
+            <el-col :span="24" style="padding-top: 5px">
+              <font class="more-label-font"> 产品经理: </font>
+              <el-tag
+                v-if="filters.pmUser"
+                closable
+                @click="selectFiltersPmUser"
+                @close="clearFiltersPmUser()"
+                >{{ filters.pmUser.username }}</el-tag
+              >
+              <el-button v-else @click="selectFiltersPmUser()"
+                >选责任人</el-button
+              >
               <el-button @click="setFiltersPmUserAsMySelf()">我的</el-button>
             </el-col>
-														<el-col  :span="24"  style="padding-top:5px;">
-															<el-button type="text"  @click="moreVisible=false" >关闭</el-button><el-button type="primary"  @click="searchXmProducts" >查询</el-button>
+            <el-col :span="24" style="padding-top: 5px">
+              <el-button type="text" @click="moreVisible = false"
+                >关闭</el-button
+              ><el-button type="primary" @click="searchXmProducts"
+                >查询</el-button
+              >
             </el-col>
           </el-row>
-													<el-button type="text" slot="reference" @click="moreVisible=!moreVisible">更多条件</el-button> 
+          <el-button
+            type="text"
+            slot="reference"
+            @click="moreVisible = !moreVisible"
+            >更多条件</el-button
+          >
         </el-popover>
-												<el-button style="float:right;" type="text" @click="close" icon="el-icon-close" title="关闭当前窗口">关闭</el-button>  
+        <el-button
+          style="float: right"
+          type="text"
+          @click="close"
+          icon="el-icon-close"
+          title="关闭当前窗口"
+          >关闭</el-button
+        >
       </el-row>
-								<el-row v-if="load.list==false && (!xmProducts ||xmProducts.length==0)">
+      <el-row
+        v-if="load.list == false && (!xmProducts || xmProducts.length == 0)"
+      >
         <el-row v-if="linkProjectId">
-										<el-row>没有查到与项目【{{linkProjectId}}】关联的产品,您可以尝试&nbsp;&nbsp;												
-										<el-button type="text" icon="el-icon-refresh" @click="refreshSelect" title="重新从后台刷新数据回来">刷新</el-button>&nbsp;&nbsp;
-										重新从后台加载，或者<el-button @click="addProductVisible=true" icon="el-icon-plus" type="text">创建产品</el-button> ，并自动关联项目【{{linkProjectId}}】，或者到【项目->关联产品->加入更多产品到项目】手动关联一个已存在的产品。
+          <el-row
+            >没有查到与项目【{{
+              linkProjectId
+            }}】关联的产品,您可以尝试&nbsp;&nbsp;
+            <el-button
+              type="text"
+              icon="el-icon-refresh"
+              @click="refreshSelect"
+              title="重新从后台刷新数据回来"
+              >刷新</el-button
+            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
+              @click="addProductVisible = true"
+              icon="el-icon-plus"
+              type="text"
+              >创建产品</el-button
+            >
+            ，并自动关联项目【{{
+              linkProjectId
+            }}】，或者到【项目->关联产品->加入更多产品到项目】手动关联一个已存在的产品。
           </el-row>
         </el-row>
         <el-row v-else>
-										<el-row>没有查到相关产品,您可以尝试&nbsp;&nbsp;												
-										<el-button type="text" icon="el-icon-refresh" @click="refreshSelect" title="重新从后台刷新数据回来">刷新</el-button>&nbsp;&nbsp;
-										重新从后台加载，或者<el-button @click="addProductVisible=true" icon="el-icon-plus" type="text">创建产品</el-button>
+          <el-row
+            >没有查到相关产品,您可以尝试&nbsp;&nbsp;
+            <el-button
+              type="text"
+              icon="el-icon-refresh"
+              @click="refreshSelect"
+              title="重新从后台刷新数据回来"
+              >刷新</el-button
+            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
+              @click="addProductVisible = true"
+              icon="el-icon-plus"
+              type="text"
+              >创建产品</el-button
+            >
           </el-row>
         </el-row>
         <el-dialog append-to-body :visible.sync="addProductVisible" width="70%">
-										<xm-product-add :sel-project="{id:linkProjectId,name:''}" @cancel="addProductVisible=false" @submit="afterAddSubmit"> </xm-product-add>
+          <xm-product-add
+            :sel-project="{ id: linkProjectId, name: '' }"
+            @cancel="addProductVisible = false"
+            @submit="afterAddSubmit"
+          >
+          </xm-product-add>
         </el-dialog>
       </el-row>
       <el-row>
         <!--列表 XmProduct 产品表-->
-									<el-table  ref="table" :height="maxTableHeight" :data="xmProducts" :row-class-name="tableRowClassName" @sort-change="sortChange" :highlight-current-row="true" current-row-key="id" v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+        <el-table
+          ref="table"
+          :height="maxTableHeight"
+          :data="xmProducts"
+          :row-class-name="tableRowClassName"
+          @sort-change="sortChange"
+          :highlight-current-row="true"
+          current-row-key="id"
+          v-loading="load.list"
+          border
+          @selection-change="selsChange"
+          @row-click="rowClick"
+          style="width: 100%"
+        >
           <el-table-column prop="productName" label="产品名称">
-											<template slot="header" slot-scope="scope">
-												产品名称 
-											</template>
+            <template slot="header" slot-scope="scope"> 产品名称 </template>
             <template slot-scope="scope">
               <font>{{ scope.row.productName }}</font>
             </template>
           </el-table-column>
         </el-table>
-									<el-pagination  layout="total, prev, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
+        <el-pagination
+          layout="total, prev, next"
+          @current-change="handleCurrentChange"
+          @size-change="handleSizeChange"
+          :page-sizes="[10, 20, 50, 100, 500]"
+          :current-page="pageInfo.pageNum"
+          :page-size="pageInfo.pageSize"
+          :total="pageInfo.total"
+          style="float: right"
+        ></el-pagination>
       </el-row>
-								<slot name="reference"><el-link title="产品，点击选择、清除选择" @click="referenceClick" type="warning" slot="reference" v-loading="load.list"  icon="el-icon-search"><font style="font-size:14px;"><slot name="title">{{editForm && editForm.id?editForm.productName:'选择产品'}}</slot></font></el-link> </slot>
+      <slot name="reference"
+        ><el-link
+          title="产品，点击选择、清除选择"
+          @click="referenceClick"
+          type="warning"
+          slot="reference"
+          v-loading="load.list"
+          icon="el-icon-search"
+          ><font style="font-size: 14px"
+            ><slot name="title">{{
+              editForm && editForm.id ? editForm.productName : "选择产品"
+            }}</slot></font
+          ></el-link
+        >
+      </slot>
     </el-popover>
   </section>
 </template>
 
 <script>
-	import util from '@/common/js/util';//全局公共库
+import util from "@/common/js/util"; //全局公共库
 //import Sticky from '@/components/Sticky' // 粘性header组件
 //import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { listXmProductWithState } from '@/api/xm/core/xmProduct';
-	import { mapGetters } from 'vuex'
+import { listXmProductWithState } from "@/api/xm/core/xmProduct";
+import { mapGetters } from "vuex";
 import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
-	import XmProductAdd from '../xmProduct/XmProductAdd.vue';
+import XmProductAdd from "../xmProduct/XmProductAdd.vue";
 const map = new Map();
 
 export default {
-		props:['dialog','linkProjectId','iterationId','autoSelect'],
+  props: ["dialog", "linkProjectId", "iterationId", "autoSelect"],
   computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
+    ...mapGetters(["userInfo", "roles"]),
   },
   watch: {
     iterationId() {
@@ -120,7 +230,7 @@
 
     linkProjectId() {
       this.initData();
-			}
+    },
   },
   data() {
     const beginDate = new Date();
@@ -128,19 +238,19 @@
     beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12);
     return {
       filters: {
-					key: '',
-					id:'',//产品编号
+        key: "",
+        id: "", //产品编号
         pmUser: null, //产品经理
-
       },
       xmProducts: [], //查询结果
-				pageInfo:{//分页数据
+      pageInfo: {
+        //分页数据
         total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize: 10, //每页数据
         count: false, //是否需要重新计算总记录数
         pageNum: 1, //当前页码、从1开始计算
         orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+        orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
       },
       load: { list: false, edit: false, del: false, add: false }, //查询中...
       sels: [], //列表选中数据
@@ -148,17 +258,23 @@
 
       //新增xmProduct界面初始化数据
       addForm: {
-					id:'',productName:'',branchId:'',remark:''
+        id: "",
+        productName: "",
+        branchId: "",
+        remark: "",
       },
 
       //编辑xmProduct界面初始化数据
       editForm: {
-					id:'',productName:'',branchId:'',remark:''
+        id: "",
+        productName: "",
+        branchId: "",
+        remark: "",
       },
       selectFiltersPmUserVisible: false,
       maxTableHeight: 300,
       dateRanger: [],
-				pickerOptions:  util.getPickerOptions('datarange'),
+      pickerOptions: util.getPickerOptions("datarange"),
       productVisible: false,
       moreVisible: false,
       hadInit: false,
@@ -166,7 +282,7 @@
       /**begin 自定义属性请在下面加 请加备注**/
 
       /**end 自定义属性请在上面加 请加备注**/
-			}
+    };
   }, //end data
   methods: {
     handleSizeChange(pageSize) {
@@ -179,14 +295,14 @@
     },
     // 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
     sortChange(obj) {
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
+      var dir = "asc";
+      if (obj.order == "ascending") {
+        dir = "asc";
       } else {
-					dir='desc';
+        dir = "desc";
       }
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
+      if (obj.prop == "xxx") {
+        this.pageInfo.orderFields = ["xxx"];
         this.pageInfo.orderDirs = [dir];
       }
       this.getXmProducts();
@@ -201,55 +317,71 @@
         pageSize: this.pageInfo.pageSize,
         pageNum: this.pageInfo.pageNum,
         total: this.pageInfo.total,
-					count:this.pageInfo.count
+        count: this.pageInfo.count,
       };
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
+      if (
+        this.pageInfo.orderFields != null &&
+        this.pageInfo.orderFields.length > 0
+      ) {
         let orderBys = [];
         for (var i = 0; i < this.pageInfo.orderFields.length; i++) {
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
+          orderBys.push(
+            this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i]
+          );
         }
-					params.orderBy= orderBys.join(",")
+        params.orderBy = orderBys.join(",");
       }
       if (this.filters.key !== "") {
-					params.key="%"+this.filters.key+"%"
+        params.key = "%" + this.filters.key + "%";
       }
       if (this.linkProjectId) {
-					params.linkProjectId=this.linkProjectId
+        params.linkProjectId = this.linkProjectId;
       }
       if (this.linkIterationId) {
-					params.linkIterationId=this.linkIterationId
+        params.linkIterationId = this.linkIterationId;
       }
       if (this.filters.id) {
-					params.id=this.filters.id
+        params.id = this.filters.id;
       }
 
       if (this.filters.pmUser) {
-					params.pmUserid=this.filters.pmUser.userid
+        params.pmUserid = this.filters.pmUser.userid;
       }
       this.load.list = true;
-				listXmProductWithState(params).then((res) => {
+      listXmProductWithState(params)
+        .then((res) => {
           var tips = res.data.tips;
           if (tips.isOk) {
             this.pageInfo.total = res.data.total;
             this.pageInfo.count = false;
             this.xmProducts = res.data.data;
             if (this.iterationId) {
-							 map.set(this.iterationId,this.xmProducts)
+              map.set(this.iterationId, this.xmProducts);
             } else if (this.linkProjectId) {
-							map.set(this.linkProjectId,this.xmProducts)
+              map.set(this.linkProjectId, this.xmProducts);
             }
-						if(this.autoSelect!==false&&this.xmProducts.length>0 && this.productVisible==false){
+            if (
+              this.autoSelect !== false &&
+              this.xmProducts.length > 0 &&
+              this.productVisible == false
+            ) {
               var row = this.xmProducts[0];
               this.$refs.table.setCurrentRow(row);
               this.rowClick(row);
             } else {
-							this.editForm=null
+              this.editForm = null;
             }
           } else {
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
+            this.$notify({
+              position: "bottom-left",
+              showClose: true,
+              message: tips.msg,
+              type: "error",
+            });
           }
           this.load.list = false;
-				}).catch( err => this.load.list = false );
+        })
+        .catch((err) => (this.load.list = false));
     },
 
     //选择行xmProduct
@@ -258,15 +390,15 @@
     },
 
     rowClick: function (row, event, column) {
-				this.editForm=row
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-				this.selectedProduct(row)
+      this.editForm = row;
+      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
+      this.selectedProduct(row);
       this.productVisible = false;
       this.moreVisible = false;
     },
     selectedProduct: function (row) {
-				this.editForm=row
-				this.$emit('selected',row);
+      this.editForm = row;
+      this.$emit("selected", row);
       this.productVisible = false;
       this.moreVisible = false;
     },
@@ -281,7 +413,7 @@
     },
     onFiltersPmUserSelected(users) {
       if (users && users.length > 0) {
-					 this.filters.pmUser=users[0]
+        this.filters.pmUser = users[0];
       } else {
         this.filters.pmUser = null;
       }
@@ -295,9 +427,9 @@
 
     tableRowClassName({ row, rowIndex }) {
       if (row && this.editForm && row.id == this.editForm.id) {
-					return 'success-row';
+        return "success-row";
       }
-				return '';
+      return "";
     },
     clearSelect() {
       this.$refs.table.setCurrentRow();
@@ -361,25 +493,29 @@
       listXmProductWithState({ id: this.editForm.id }).then((res) => {
         var tips = res.data.tips;
         if (tips.isOk && rea.data.data && res.data.data.length > 0) {
-						Object.assign(this.editForm,res.data.data[0])
-						this.rowClick(this.editForm)
+          Object.assign(this.editForm, res.data.data[0]);
+          this.rowClick(this.editForm);
         }
-				})
+      });
     },
     afterAddSubmit(row) {
-				this.xmProducts.push(row)
+      this.xmProducts.push(row);
       if (this.iterationId) {
-					map.set(this.iterationId,this.xmProducts)
+        map.set(this.iterationId, this.xmProducts);
       } else if (this.linkProjectId) {
-					map.set(this.linkProjectId,this.xmProducts)
+        map.set(this.linkProjectId, this.xmProducts);
       }
-				if(this.autoSelect!==false&&this.xmProducts.length>0 && this.productVisible==false){
+      if (
+        this.autoSelect !== false &&
+        this.xmProducts.length > 0 &&
+        this.productVisible == false
+      ) {
         var row = this.xmProducts[0];
         this.$refs.table.setCurrentRow(row);
         this.rowClick(row);
       }
       this.addProductVisible = false;
-			}
+    },
   }, //end methods
   components: {
     UsersSelect,
@@ -393,15 +529,11 @@
         this.initData();
         this.hadInit = true;
       }
-
     });
-		}
-	}
-
+  },
+};
 </script>
 <style scoped>
-
-
 .more-label-font {
   text-align: center;
   float: left;

src/views/xm/core/xmProduct/XmProductForLinkComplex.vue

@@ -2,7 +2,7 @@
   <section>
     <el-row>
       <el-col :span="4">
-	  <el-row class="padding">
+	  <el-row>
           <el-col :span="24"> 
               <xm-product-select
                 ref="xmProductSelect"
@@ -17,6 +17,7 @@
         <el-row
           ref="pageBody"
           class="padding"
+		  :class="{border:xmProduct && xmProduct.id}"
           :style="{ maxHeight: maxTableHeight + 'px', overflowY: 'auto' }"
         >
           <h4 class="padding-bottom" v-if="xmProduct && xmProduct.id">常用功能导航</h4>
@@ -151,7 +152,7 @@
         </el-row>
       </el-col>
       <el-col :span="20" class="padding-left">
-        <el-tabs :value="showPanel" @tab-click="tabClick"> 
+        <el-tabs :value="showPanel" @tab-click="tabClick" style="margin-top:-20px;"> 
           <el-tab-pane
             label="产品概览"
             name="productOverview"
@@ -190,7 +191,7 @@
             name="iterationProductLink"
             v-if="xmProduct && xmProduct.id"
           >
-            <xm-iteration-mng
+            <xm-iteration-mng style="margin-top:-10px;"
               v-if="showPanel == 'iterationProductLink'"
               :xm-product="xmProduct"
             ></xm-iteration-mng>

src/views/xm/core/xmProduct/XmProductOverview.vue

@@ -1,6 +1,6 @@
 <template>
-  <section class="padding">
-    <el-row class="page-main" :style="{overflowX:'hidden',height:maxTableHeight+'px'}" ref="pageMainRef"> 
+  <section ref="pageMainRef">
+    <el-row :style="{overflowX:'hidden',height:maxTableHeight+'px'}" > 
       <el-row :gutter="10" style="margin-bottom:10px">
           <el-col :span="8" >
             <el-card class="box-card" style="padding:0px ;height:425px">
@@ -13,7 +13,7 @@
                 </el-row> 
               </el-row>
               <el-row style="margin-bottom:18px">
-                <el-col :span="8" @click="">
+                <el-col :span="8">
                   <div class="item">
                     <div class="icon" style="background-color:  rgb(79, 140, 255);">
                       <i class="el-icon-right"></i>