Merge remote-tracking branch 'origin/dev_test' into dev_test

src/pages/home2/components/releaseBuss/index.vue

@@ -32,7 +32,10 @@
                   prop="standName"
                   label="标准名称">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
+                  <span @click="handlePreview(scope.row)" style="display: flex;align-items: center">
+                    <span>{{ scope.row.standardName }}</span>
+                    <img v-if="checkTime(scope.row.releaseDate)" src="/static/images/new.png" style="width: 30px;margin-left: 5px">
+                  </span>
               </template>
           </el-table-column>
           <el-table-column
@@ -56,6 +59,7 @@
 </template>
 
 <script>
+const moment = require('moment')
 export default {
   name: 'ReleaseBuss',
   components: {},
@@ -79,6 +83,9 @@ export default {
     // this.addDate()
   },
   methods: {
+      checkTime (time) {
+        return moment(time).diff(moment(), 'days') > -3
+      },
       pageChange(page) {
           this.page = page
           this.pageSize = this.$store.getters.userInfo.configContent

src/pages/home2/components/releaseBuss2/index.vue

@@ -24,6 +24,9 @@
                   type="index"
                   align="center"
                   width="55">
+            <template slot-scope="{scope, column, $index}">
+              {{ ($index + 1) + (page - 1) * pageSize }}
+            </template>
           </el-table-column>
           <el-table-column
                   label="标准编号">
@@ -35,7 +38,10 @@
                   prop="standName"
                   label="标准名称">
               <template slot-scope="scope">
-                  <span @click="handlePreview(scope.row)">{{ scope.row.standardName }}</span>
+                  <span @click="handlePreview(scope.row)" style="display: flex;align-items: center">
+                    {{ scope.row.standardName }}
+                    <img v-if="checkTime(scope.row.releaseDate)" src="/static/images/new.png" style="width: 30px;margin-left: 5px">
+                  </span>
               </template>
           </el-table-column>
           <el-table-column
@@ -57,6 +63,7 @@
 </template>
 
 <script>
+const moment = require('moment')
 export default {
   name: 'ReleaseBuss2',
   components: {},
@@ -80,6 +87,9 @@ export default {
     // this.addDate()
   },
   methods: {
+      checkTime (time) {
+        return moment(time).diff(moment(), 'days') > -3
+      },
       pageChange(page) {
           this.page = page
           this.pageSize = this.$store.getters.userInfo.configContent
@@ -148,12 +158,12 @@ export default {
     font-size: 13px;
   }
     /deep/.more {
-        position: absolute;
+        //position: absolute;
-        right: 0;
+        //right: 0;
-        bottom: 2px;
+        //bottom: 2px;
-        font-size: 15px;
+        //font-size: 15px;
-        float: right;
+        //float: right;
-        color: #4788c0;
+        //color: #4788c0;
         &:hover {
             color: #3a8ee6;
             cursor: pointer;

src/pages/home2/index.vue

@@ -24,7 +24,10 @@
                <releaseUs></releaseUs>
             </el-tab-pane>
            <el-tab-pane name="releaseBuss" style="overflow-y: auto;height: 100%">
-               <span slot="label"><i class="el-icon-s-promotion"></i> 企业标准发布</span>
+               <span slot="label"><i class="el-icon-s-promotion"></i>
+                 企业标准发布
+                 <img v-if="isNew" src="/static/images/new.png" style="width: 30px;margin-left: 5px">
+               </span>
                <releaseBuss></releaseBuss>
            </el-tab-pane>
              <el-tab-pane name="releaseZL" style="overflow-y: auto;height: 100%">
@@ -51,6 +54,8 @@
 </template>
 
 <script>
+const moment = require('moment')
+
 import searchGroup from './components/searchGroup'
 import release from './components/release'
 import releaseUs from './components/releaseUs'
@@ -78,9 +83,33 @@ export default {
   data() {
     return {
       activeName: 'solicitOpinions',
+      isNew: false
     }
   },
+  created() {
+    this.getAdvice()
+  },
   methods: {
+    getAdvice() {
+      this.$http.get("/lawss/NewsFeed/getNewsFeed", {
+        messageType: 'QYBZFB',
+        page: 1,
+        pageSize: 1
+      }, {
+        _this: this
+      }, res => {
+        if (res.data && res.data.records && res.data.records.length > 0) {
+          if (res.data.records[0].releaseDate && res.data.records[0].releaseDate!== '') {
+            this.isNew = this.checkTime(res.data.records[0].releaseDate)
+          }
+        }
+      }, e => {
+
+      })
+    },
+    checkTime (time) {
+      return moment(time).diff(moment(), 'days') > -3
+    },
     handleTabClick(tab, event) {},
     //退出登录
     logout(){

src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue

@@ -2620,7 +2620,7 @@
                                             if(res.ok){
                                               this.completeTask()
                                             }else{
-                                              this.$message.error(res.data)
+                                              this.$message.error(res.message)
                                             }
                                           })
                                     }else{