暂存

src/api/system/pannel.js

+import request from '@/utils/request'
+
+// 查询公告列表
+export function panelData() {
+  return request({
+    url: '/system/panel/panelData',
+    method: 'get'
+  })
+}
\ No newline at end of file

src/components/ProductsSelector/index.vue

 <template>
-  <el-row class="" :gutter="10">
-    <el-col :span="10">
+  <div class="flex" :gutter="10">
+    <div class="flex-1">
       <el-card>
         <div slot="header" class="header">
           <el-select v-model="queryParams.typeId" :placeholder="$t('选择类型')" style="width:120px" clearable>
@@ -19,9 +19,9 @@
           </div>
         </div>
       </el-card>
-    </el-col>
-    <el-col :span="10">
-      <el-card>
+    </div>
+    <div class="flex-1 ml-10">
+      <el-card style="height:100%">
         <div slot="header" class="header">
           {{$t('已选产品')}}
         </div>
@@ -32,8 +32,8 @@
           </div>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
+    </div>
+  </div>
 </template>
 <script>
 import { getProductPage } from '@/api/ecw/product'

src/components/WorkFlow/index.vue

@@ -11,8 +11,8 @@
             />
         </div>
         <el-form label-position="left" label-width="100px">
-          <el-form-item label="抄送">
-            <el-select v-model="valueSync" multiple placeholder="请选择抄送人" style="width:100%">
+          <el-form-item :label="$t('抄送')">
+            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%">
                 <el-option
                 v-for="item in users"
                 :key="item.id"

src/store/modules/tagsView.js

+import router from '@/router'
+window.router = router
 const state = {
   visitedViews: [],
   cachedViews: []
@@ -172,6 +174,25 @@ const actions = {
       commit('DEL_RIGHT_VIEWS', view)
       resolve([...state.visitedViews])
     })
+  },
+  delCurrentView({ dispatch }){
+    // console.log('delCurrentView', router.history.current)
+    const view = router.history.current
+    return dispatch('delView', view).then(({visitedViews}) => {
+      const latestView = visitedViews.slice(-1)[0]
+      if (latestView) {
+        router.push(latestView.fullPath)
+      } else {
+        // now the default is to redirect to the home page if there is no tags-view,
+        // you can adjust it according to your needs.
+        if (view.name === 'Dashboard') {
+          // to reload home page
+          router.replace({ path: '/redirect' + view.fullPath })
+        } else {
+          router.push('/')
+        }
+      }
+    })
   }
 }
 

src/views/dashboard/PanelGroup.vue

 <template>
-  <el-row :gutter="40" class="panel-group">
+  <el-row :gutter="40" class="panel-group" v-if="data">
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
         <div class="card-panel-icon-wrapper icon-people">
@@ -7,9 +7,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            访客
+            {{$t('注册会员数')}}
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="data.memberCount" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -20,22 +20,22 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            消息
+            {{$t('未读消息数')}}
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="data.messageCount" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('purchases')">
         <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
+          <svg-icon icon-class="date" class-name="card-panel-icon" />
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            金额
+            {{$t('待办事项')}}
           </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="data.todoCount" :duration="3200" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -46,9 +46,9 @@
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            订单
+            {{$t('我的订单')}}
           </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="data.orderCount" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -57,15 +57,25 @@
 
 <script>
 import CountTo from 'vue-count-to'
-
+import {panelData} from '@/api/system/pannel'
 export default {
   components: {
     CountTo
   },
+  data(){
+    return {
+      data: null
+    }
+  },
   methods: {
     handleSetLineChartData(type) {
       this.$emit('handleSetLineChartData', type)
     }
+  },
+  created(){
+    panelData().then(res => {
+      this.data = res.data
+    })
   }
 }
 </script>

src/views/ecw/offer/edit.vue

@@ -464,7 +464,7 @@
 
         <el-form-item label="">
             <el-button type="primary" @click="submitForm">{{$t('确定')}}</el-button>
-            <el-button @click="$router.back()">{{$t('取消')}}</el-button>
+            <el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
         </el-form-item>
       </el-form>
   </div>

src/views/ecw/productPrice/index.vue

@@ -143,7 +143,7 @@
       <el-table-column prop="price" :label="$t('价格')" align="center">
           <template slot-scope="scope">
             <div>
-              {{$t('海运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp; 
+              {{$t('运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp; 
               {{ getCurrencyTitle(scope.row.transportPriceUnit) + '/' + getUnitTitle(scope.row.transportVolumeUnit)}}
               <br />
               {{$t('清关费')}}:{{ getCurrencySymbol(scope.row.clearancePriceUnit) + scope.row.clearancePrice}}&nbsp; 

src/views/index.vue

@@ -54,6 +54,7 @@ import RaddarChart from './dashboard/RaddarChart'
 import PieChart from './dashboard/PieChart'
 import BarChart from './dashboard/BarChart'
 import Ueditor from '@/components/Ueditor'
+
 import {
   getProcessDefinitionBpmnXMLByKey
 } from "@/api/bpm/definition";
@@ -98,7 +99,7 @@ export default {
         prefix: "activiti"
       },
       html: "默认内容",
-      watchHtml: ''
+      watchHtml: '',
     }
   },
   watch:{
@@ -108,6 +109,7 @@ export default {
   },
   created() {
     this.handlerBpm();
+    
   },
   methods: {
     handleSetLineChartData(type) {