Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/desk/notice.vue

@@ -160,9 +160,8 @@ export default {
             label: "服务类型",
             type: "select",
             dicData: [
-              { label: "企业端", value: 1 },
+              { label: "后台工作人员", value: 1 },
-              { label: "个人端", value: 2 },
+              { label: "移动个人用户", value: 2 },
-              { label: "工作站", value: 3 },
             ],
             dataType: "number",
             prop: "userType",

vue.config.js

@@ -25,6 +25,7 @@ module.exports = {
       "/api": {
         // target: 'http://192.168.3.120:8000',
         target: 'http://10.165.0.173:8000',  //内网
+        // target: 'http://localhost:8000',
         ws: true,
         changeOrigin: true,
         pathRewrite: {