Merge branch 'master' into b_lms2

lms/nladmin-ui/src/views/tools/storage/index.vue

@@ -65,7 +65,7 @@
           >
             <a
               slot="reference"
-              :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.realName"
+              :href="baseURLStr + '/file/' + scope.row.type + '/' + scope.row.realName"
               class="el-link--primary"
               style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
               target="_blank"
@@ -78,8 +78,8 @@
       <el-table-column prop="path" label="预览图">
         <template slot-scope="{row}">
           <el-image
-            :src=" baseApi + '/file/' + row.type + '/' + row.realName"
-            :preview-src-list="[baseApi + '/file/' + row.type + '/' + row.realName]"
+            :src=" baseURLStr + '/file/' + row.type + '/' + row.realName"
+            :preview-src-list="[baseURLStr + '/file/' + row.type + '/' + row.realName]"
             fit="contain"
             lazy
             class="el-avatar"
@@ -94,11 +94,8 @@
       <el-table-column prop="type" label="类别" />
       <el-table-column prop="size" label="大小" />
       <el-table-column prop="operate" label="操作人" />
-      <el-table-column prop="createTime" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column prop="createTime" label="创建日期" />
+      <el-table-column prop="updateTime" label="修改日期" />
     </el-table>
     <!--分页组件-->
     <pagination />
@@ -115,6 +112,7 @@ import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker'
 
+
 const defaultForm = { id: null, name: '' }
 export default {
   components: { pagination, crudOperation, rrOperation, DateRangePicker },
@@ -125,6 +123,7 @@ export default {
   data() {
     return {
       delAllLoading: false,
+      baseURLStr: window.g.prod.VUE_APP_BASE_API,
       loading: false,
       headers: { 'Authorization': getToken() },
       permission: {