YangZhiJie 1 рік тому
батько
коміт
871ef791e5
3 змінених файлів з 28 додано та 34 видалено
  1. 7 5
      package.json
  2. 9 17
      src/main.js
  3. 12 12
      webpack.dev.js

+ 7 - 5
package.json

@@ -4,8 +4,10 @@
   "version": "1.2.45",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
+    "ins": "npm install --registry=http://wuzhixin.vip:4873 -force",
     "dev": "cross-env webpack serve --config ./webpack.dev.js",
-    "build": "cross-env NODE_ENV=production webpack --mode=production --config ./webpack.prod.js --progress"
+    "build": "cross-env NODE_ENV=production webpack --mode=production --config ./webpack.prod.js --progress",
+    "pub": "npm publish --registry http://wuzhixin.vip:4873/"
   },
   "files": [
     "package.json",
@@ -15,9 +17,9 @@
     "ant-design-vue": "^4.2.1",
     "axios": "^0.19.2",
     "click-outside-vue3": "^4.0.1",
-    "client-base-v4": "4.0.76",
-    "client-dic-v3": "^3.0.34",
-    "client-eam-v3": "^3.0.78",
+    "client-base-v4": "4.0.77",
+    "client-dic-v3": "^3.0.36",
+    "client-eam-v3": "^3.0.81",
     "client-role-v3": "^3.0.24",
     "client-sensor-v3": "^1.0.2",
     "client-wms-v3": "^3.1.1",
@@ -25,7 +27,7 @@
     "dingtalk-jsapi": "^2.8.33",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
-    "pc-component-v3": "1.0.86",
+    "pc-component-v3": "1.0.87-t2",
     "qrcode": "^1.5.3",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "^0.1.0-beta.10",

+ 9 - 17
src/main.js

@@ -11,12 +11,14 @@ import { createApp, defineAsyncComponent } from 'vue';
 import Antd from 'ant-design-vue';
 // import 'ant-design-vue/dist/antd.css';
 import 'ant-design-vue/dist/reset.css';
+window.Antd = Antd;
 
 import { createRouter, createWebHashHistory } from 'vue-router';
 import { createStore } from 'vuex';
 
-import * as PcClientComponent from 'pc-component-v3';
+import * as PcComponentV3 from 'pc-component-v3';
 import 'pc-component-v3/dist/pc-component-v3.css';
+window.PcComponentV3 = PcComponentV3;
 
 import VTooltip from 'v-tooltip';
 import 'v-tooltip/dist/v-tooltip.css';
@@ -43,7 +45,7 @@ import { store } from './store.js';
 import { i18n } from './lang.js';
 import { router } from './routes/index.js';
 
-import { App, Common, PushMessage } from 'client-base-v4/dist/client-base-v4.js';
+import { App, Common, PushMessage, CurdWindowModal } from 'client-base-v4/dist/client-base-v4.js';
 import { Notify } from 'pc-component-v3/dist/pc-component-v3.js';
 window.Common = Common;
 window.Notify = Notify;
@@ -53,20 +55,6 @@ import * as AntDesignIconsVue from '@ant-design/icons-vue';
 window.AntDesignIconsVue = AntDesignIconsVue;
 
 
-const menuColor = {
-  logoWidth: 150, // logo宽度
-  mainColor: '#2a3f54', // 菜单栏主题色 
-  secondLevelColor: 'linear-gradient(#334556, #2c4257), #2a3f54', // 二级菜单颜色
-  threeLevelColor: '#495d70', // 三级菜单悬浮颜色
-  searchInputColor: '#1c3e4b', // 菜单搜索框颜色
-}
-// const menuColor = {
-//   logoWidth: 150,
-//   mainColor: '#277fd0',
-//   secondLevelColor: '#2e8ee7',
-//   threeLevelColor: '#6db0ee',
-//   searchInputColor: '#1673c0',
-// }
 
 const app = createApp(App);
 app.use(Antd);
@@ -74,10 +62,14 @@ app.use(i18n);
 app.use(router);
 app.use(VTooltip);
 app.use(store);
-app.use(PcClientComponent);
+app.use(PcComponentV3);
 app.use(router);
 app.mount('#app');
 
+// 全局注册组件, CURD窗口模态框编辑器
+app.component('CurdWindowModal', CurdWindowModal);
+
+
 window.app = app;
 
 

+ 12 - 12
webpack.dev.js

@@ -60,71 +60,71 @@ module.exports = WebpackMerge.merge(baseConfig, {
     
     proxy: {
       '/api': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/static': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/content': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/dashboard': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/assets': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/mock': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/authApi': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Dictionary': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/Files': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: false,
         changeOrigin: true,
         secure:true,
       },
       '/WebSocket': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: true,
         changeOrigin: true,
       },
       '/TrainVideo': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: true,
         changeOrigin: true,
       },
       '/gateway-api': {
-        target: 'http://127.0.0.1:83/',
+        target: 'http://127.0.0.1:10023/',
         ws: true,
         changeOrigin: true,
         secure:true,