Merge remote-tracking branch 'origin/master'

enterprise-manager-ui/admin/src/views/news/shareDrawershow.vue

@@ -24,11 +24,37 @@
       <el-table :data="tableData.data" border style="width: 100%">
         <el-table-column type="index" width="50" label="序号">
         </el-table-column>
-        <el-table-column prop="viewName" label="浏览人员"> </el-table-column>
-        <el-table-column prop="sumViews" label="浏览次数"> </el-table-column>
+        <el-table-column label="浏览人员">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.viewName
+                ? scope.row.viewName
+                : scope.row.shareName
+                ? scope.row.shareName
+                : "--"
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="浏览次数">
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.sumViews
+                ? scope.row.sumViews
+                : scope.row.sumShares
+                ? scope.row.sumShares
+                : "--"
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="viewTime" label="最近浏览时间">
           <template slot-scope="scope">
-            <span>{{ timeFix(scope.row.viewTime) }}</span>
+            <span>{{
+              scope.row.viewTime
+                ? timeFix(scope.row.viewTime)
+                : scope.row.shareTime
+                ? timeFix(scope.row.shareTime)
+                : "--"
+            }}</span>
           </template>
         </el-table-column>
       </el-table>

enterprise-manager-ui/admin/vue.config.js

@@ -32,6 +32,14 @@ module.exports = {
         secure: false,
         cookieDomainRewrite: "localhost",
       },
+      "/basics_api": {
+        // target: "http://test.office.com:11073",
+        // target: 'http://8.136.255.30:11078',
+          target: 'http://192.168.0.98:11086',
+        changeOrigin: true,
+        secure: false,
+        cookieDomainRewrite: "localhost",
+      },
     },
   },
 };