Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-web into dev

.env.development

@@ -10,7 +10,8 @@ VITE_PUBLIC_PATH = /
 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题
 # 可以有多个，注意多个不能换行，否则代理将会失效
 #VITE_PROXY = [["/api","http://localhost:3000"],["/upload","http://localhost:3300/upload"]]
-VITE_PROXY=[["/api","http://47.94.165.164:9500"]]
+#VITE_PROXY=[["/api","http://47.94.165.164:9500"]]
+VITE_PROXY=[["/api","http://127.0.0.1:8090"]]
 
 # 是否删除Console.log
 VITE_DROP_CONSOLE = false

Dockerfile

@@ -15,4 +15,4 @@ VOLUME ["/etc/nginx/nginx.conf", "/usr/share/nginx/html"]
 
 CMD ["nginx","-g","daemon off;"]
 
-# docker build -t itc-web:1.0.0 .
+# docker build -t docker.ges.bjgastx.com/itc-web:1.0.0 .

src/components/pcitc/src/DataLog.vue

@@ -45,6 +45,8 @@
         if (record.operationType == 'INSERT') text='新增'
         if (record.operationType == 'UPDATE') text='修改'
         if (record.operationType == 'DELETE') text='删除'
+        if (record.operationType == 'ENABLE') text='启用'
+        if (record.operationType == 'DISABLE') text='作废'
         return text
       }
     },