Merge branch 'dev' of http://47.106.221.167:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -157,7 +157,7 @@
               <div v-html="scope.row.compareDescription2">  </div>
             </template>
           </el-table-column>
-          <el-table-column v-if="this.taskWorkRemakA==0" label="操作" min-width="120"  align="center" >
+          <el-table-column v-if="this.taskWorkRemakA==0" fixed="right" label="操作" min-width="120"  align="center" >
             <template slot-scope="scope">
               <div  v-if="scope.row.isDelShow==1">
                 <el-button  @click="handleClick(scope.row)" size="small">同意协同人意见</el-button>

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Result.vue

@@ -733,7 +733,7 @@ export default {
 
 </script>
 
-<style lang="less" scoped>
+<style>
 .success-row {
   background-color:#eaf3fb !important; 
 }

RMS-FrontEnd/src/views/report/reportDetails/components/ContrastPlan.vue

@@ -247,7 +247,7 @@ export default {
       // 表格隔行变色
       tableRowClassName({ row, rowIndex }) {
         if (rowIndex % 2 === 0) {
-          return 'success-row'
+          return 'success-row1'
         } else  {
           return ''
         }
@@ -375,10 +375,10 @@ export default {
 }
 </script>
 <style>
-.success-row {
+.success-row1 {
   background-color:#eaf3fb !important; 
 }
-.success-row:first-child td:first-child{
+.success-row1:first-child td:first-child{
   background-color: #FFF;
 }
 </style>

RMS-FrontEnd/src/views/task/MyHandle.vue

@@ -323,13 +323,14 @@
 			// })
     },
     // 超时提醒
-    remind({ row, column, rowIndex, columnIndex }) {
+    remind({ row, rowIndex }) {
       if (this.queryParams.taskStatus==0 &&row.endTime) {
         // if (row.endTime) {
           var bendTime = Date.parse(new Date)
           var aendTime = Date.parse(row.endTime)
+          
+        if (aendTime < bendTime) {
           console.log(aendTime, bendTime, row.endTime);
-          if (aendTime < bendTime) {
             return 'red'
           }
         // }
@@ -487,8 +488,8 @@
   };
   </script>
   
-<style lang="scss" scoped>
-.el-table .red{
-    background: #df543e;
+<style>
+.red{
+    background: #e99385 !important;
   }
   </style>