Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-oper into dev

epmet-oper-web/debug.log

@@ -1,3 +1,5 @@
 [1228/131807.836:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1229/091638.578:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
 [1229/154402.360:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1229/174228.174:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
+[1231/140010.226:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

epmet-oper-web/src/views/modules/customer/customize/CustomerList.vue

@@ -59,6 +59,9 @@
               <el-button type="text"
                          size="small"
                          @click="showLimitConfig(scope.row.customerId,scope.row.customerName)">角色权限</el-button>
+			  <el-button type="text"
+						 size="small"
+						 @click="showMost(scope.row.customerId,scope.row.customerName)">最高配置</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -103,6 +106,7 @@
 import ConfigItem from './ConfigItem'
 import FootbarList from '../../productConfig/footbar/FootbarList'
 import MiniHome from './MiniHome'
+import MostList from '../../productConfig/mostedit/MostList'
 import RoleList from './roleList'
 export default {
   data () {
@@ -201,6 +205,12 @@ export default {
       this.showType = 'footbar'
       this.$refs['ref_footbarlist'].initData(customerId, customerName)
     },
+	// footbar配置
+	showMost (customerId, customerName) {
+	  this.showType = 'mostedit'
+	  //this.$refs['ref_footbarlist'].initData(customerId, customerName)
+	},
+	
 
     // 显示权限配置
     showLimitConfig (customerId, customerName) {

epmet-oper-web/src/views/modules/oss/oss.vue

@@ -21,7 +21,7 @@
         style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
         <el-table-column prop="url" :label="$t('oss.url')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" :label="$t('oss.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="createdTime" label="上传时间" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>

epmet-oper-web/src/views/modules/productConfig/mostedit/MostList.vue

@@ -0,0 +1,19 @@
+<template>
+  <div>
+
+   
+     ffffffffff
+	  
+
+    </div>
+   
+
+  
+</template>
+
+<script>
+
+</script>
+<style>
+
+</style>