Merge branch 'master' of http://gog.sgsino.cn/SG/pigx-wx-ui

.gitignore

@@ -26,3 +26,4 @@ yarn-error.log*
 # Lock File
 package-lock.json
 yarn.lock
+/pigx-wx-ui.iml

default.conf

@@ -13,7 +13,7 @@ server {
     gzip_types text/plain text/xml text/css;
     gzip_vary on;
     gzip_disable "MSIE [1-6]\.(?!.*SV1)";
-    location ~* ^/(actuator|code|auth|admin|gen|daemon|tx|act|monitor|mp|job|pay) {
+    location ~* ^/(actuator|code|auth|admin|gen|daemon|tx|act|monitor|mp|job|pay|inventory) {
        proxy_pass http://192.168.20.56:9999;
        #proxy_set_header Host $http_host;
        proxy_connect_timeout 15s;

src/views/inventory/sgtimesheet/index.vue

@@ -113,15 +113,20 @@
                     align="center"
                     label="迟到总计">
             </el-table-column>
-                    <el-table-column
-                  header-align="center"
-                  align="center"
-                  label="操作">
-            <template slot-scope="scope">
-              <el-button v-if="permissions.qa_sgtimesheet_edit" type="text" size="small" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-              <el-button v-if="permissions.qa_sgtimesheet_del" type="text" size="small" icon="el-icon-delete" @click="deleteHandle(scope.row.id)">删除</el-button>
-            </template>
-          </el-table-column>
+
+         <!--
+                         <el-table-column
+                             header-align="center"
+                             align="center"
+                             label="操作">
+                       <template slot-scope="scope">
+                         <el-button v-if="permissions.qa_sgtimesheet_edit" type="text" size="small" icon="el-icon-edit" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+                         <el-button v-if="permissions.qa_sgtimesheet_del" type="text" size="small" icon="el-icon-delete" @click="deleteHandle(scope.row.id)">删除</el-button>
+                       </template>
+                     </el-table-column>
+           -->
+
+
         </el-table>
       </div>
 

vue.config.js

@@ -2,7 +2,7 @@
  * 配置参考:
  * https://cli.vuejs.org/zh/config/
  */
-const url = 'http://192.168.20.56:9999'
+const url = 'http://pigx-gateway:9999'
 module.exports = {
   lintOnSave: true,
   productionSourceMap: false,