Merge branch 'hjw-spfmui' into 'master'

Hjw spfmui

See merge request spfm/spfm-market-front!239

src/pages/main/leader/leaderhomeTask.vue

@@ -13,7 +13,7 @@
         <div class="tabbox">
           <!-- 我的待办列表 -->
           <el-table
-            :header-cell-style="{ background: '#F2F2F2' }"
+            :header-cell-style="{ background: '#F2F2F2' ,'text-align':'center'}" 
             :cell-style="{ background: '#FaFaFa' }"
             v-if="tabbox1"
             class="com-table"
@@ -24,20 +24,20 @@
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
             height="442px"
           >
-            <el-table-column prop="woTitle" label="工单标题" align="center">
+            <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                
                 <span
                   :title="scope.row.woTitle"
                   @click="RowTitle(scope.row)"
                   :style="
                     scope.row.woTypeDesc == '预警工单'
-                      ? 'cursor: pointer;color:red;float:left;display:inline-block;width:150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;text-align:left;'
-                      : 'cursor: pointer;color:blue;float:left;display:inline-block;width:150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;text-align:left;'
+                      ? 'cursor: pointer;color:red;'
+                      : 'cursor: pointer;color:blue;'
                   "
-                  ><span style="float: left; color: #afb2d8; margin-right: 5px"
-                  >•</span
-                >{{ scope.row.woTitle }}</span
+                  >
+                  <!-- <span style="float: left; color: #afb2d8;margin-right:5px"
+                  >•</span> -->
+                {{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
@@ -46,9 +46,10 @@
               label="流程名称"
               align="center"
               width="180"
+              :show-overflow-tooltip="true"
             >
               <template slot-scope="scope">
-                <span>{{ scope.row.procName }}</span>
+                <span :title="scope.row.procName">{{ scope.row.procName }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -56,9 +57,10 @@
               label="上一步处理人"
               align="center"
               width="110"
+              :show-overflow-tooltip="true"
             >
               <template slot-scope="scope">
-                <span>{{ $desensitization(scope.row.assigneName, 1) }}</span>
+                <span :title="scope.row.assigneName">{{ scope.row.assigneName}}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -106,7 +108,7 @@
         <div class="tabbox">
           <!-- 我的已办列表 -->
           <el-table
-            :header-cell-style="{ background: '#F2F2F2' }"
+            :header-cell-style="{ background: '#F2F2F2' ,'text-align':'center'}" 
             :cell-style="{ background: '#FaFaFa' }"
             class="com-table"
             ref="tableDatayj"
@@ -117,21 +119,22 @@
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
             height="442px"
           >
-            <el-table-column prop="woTitle" label="工单标题" align="center">
+            <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <span style="float: left; color: #afb2d8; margin-right: 5px"
+                <!-- <span style="float: left; color: #afb2d8;margin-right:5px"
                   >•</span
-                >
+                > -->
                 <span
                   @click="RowDoneTitle(scope.row)"
-                  style="cursor: pointer; color: blue; float: left"
+                  :title="scope.row.woTitle" 
+                  style="cursor: pointer; color: blue;"
                   >{{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
-            <el-table-column prop="procName" label="流程名称" align="center">
+            <el-table-column prop="procName" label="流程名称" align="center" width="180" :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <span>{{ scope.row.procName }}</span>
+                <span :title="scope.row.procName">{{ scope.row.procName }}</span>
               </template>
             </el-table-column>
 
@@ -170,7 +173,7 @@
         <div class="tabbox">
           <!-- 我的发起列表 -->
           <el-table
-            :header-cell-style="{ background: '#F2F2F2' }"
+            :header-cell-style="{ background: '#F2F2F2' ,'text-align':'center'}" 
             :cell-style="{ background: '#FaFaFa' }"
             class="com-table"
             ref="OpList"
@@ -181,21 +184,22 @@
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
             height="442px"
           >
-            <el-table-column prop="woTitle" label="工单标题" align="center">
+            <el-table-column prop="woTitle" label="工单标题" align="left"  :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <span style="float: left; color: #afb2d8; margin-right: 5px"
+                <!-- <span style="float: left; color: #afb2d8;margin-right:5px"
                   >•</span
-                >
+                > -->
                 <span
+                  :title="scope.row.woTitle"
                   @click="RowlaunchTitle(scope.row)"
-                  style="cursor: pointer; color: blue; float: left"
+                  style="cursor: pointer; color: blue;"
                   >{{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
-            <el-table-column prop="procName" label="流程名称" align="center">
+            <el-table-column prop="procName" label="流程名称" align="center"  :show-overflow-tooltip="true">
               <template slot-scope="scope">
-                <span>{{ scope.row.procName }}</span>
+                <span :title="scope.row.procName">{{ scope.row.procName }}</span>
               </template>
             </el-table-column>
 

src/pages/main/leader/numberHits.vue

@@ -17,15 +17,23 @@
         :header-cell-style="{ background: '#F2F2F2' }"
         :cell-style="{ background: '#FaFaFa' }"
       >
-        <el-table-column prop="module_name" label="标题">
+        <el-table-column prop="module_name" label="标" width="34" align="right">
           <template slot-scope="scope">
             <span
               v-if="
                 scope.$index + 1 != 1 &&
                 scope.$index + 1 != 2 &&
-                scope.$index + 1 != 3
+                scope.$index + 1 != 3 &&
+                scope.$index + 1 != 10
               "
-              style="color: #afb2d8; margin-right: 5px;float:left"
+              style="color: #afb2d8;text-align: center;margin-right:5px"
+              >{{ scope.$index + 1 }}.</span
+            >
+            <span
+              v-if="
+                scope.$index + 1 == 10
+              "
+              style="color: #afb2d8;text-align: center;"
               >{{ scope.$index + 1 }}.</span
             >
             <svg
@@ -181,6 +189,10 @@
                 p-id="2748"
               ></path>
             </svg>
+          </template>
+        </el-table-column>
+        <el-table-column prop="module_name" label="题" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
             <span class="titlenum" :title="scope.row.module_name">{{
               scope.row.module_name
             }}</span>
@@ -248,18 +260,21 @@ export default {
     width: 94%;
     .titlenum {
       cursor: pointer;
-      display: inline-block;
+      // display: inline-block;
       color: blue;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis; /*超出部分省略号表示*/
-      max-width: 120px;
-      float: left;
+      // width: 100%;
+      // white-space: nowrap;
+      // overflow: hidden;
+      // text-overflow: ellipsis; /*超出部分省略号表示*/
+      // max-width: 120px;
+      // float: left;
     }
     svg {
       width: 20px;
       height: 20px;
+      display: inline-block;
       float: left;
+      margin-left: 10px;
     }
   }
 }
@@ -269,4 +284,12 @@ export default {
 ::v-deep .el-table__body-wrapper {
   background-color: #fafafa;
 }
+::v-deep .el-table th>.cell{
+  padding-left:0px ;
+  padding-right:0px ;
+}
+::v-deep .el-table .cell{
+  padding-left:0px ;
+  padding-right:0px ;
+}
 </style>