diff --git a/.env.dev b/.env.dev index 15db0a04..9171993b 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-11-21 10:36:47 + # @LastEditTime: 2024-07-29 15:00:13 # @LastEditors: DY # @Description: ### @@ -13,10 +13,10 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.164:48082' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' -VUE_APP_BASE_API = 'http://192.168.1.81:48082' +# VUE_APP_BASE_API = 'http://192.168.1.81:48082' # VUE_APP_BASE_API = 'http://192.168.1.8:48082' # VUE_APP_BASE_API = 'http://192.168.4.159:48080' # VUE_APP_BASE_API = 'http://192.168.1.56:48082' diff --git a/package.json b/package.json index abeb01a6..b51a8bc6 100644 --- a/package.json +++ b/package.json @@ -48,11 +48,12 @@ "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "0.10.0", "clipboard": "2.0.8", - "code-brick-zj": "^1.0.2", + "code-brick-zj": "^1.0.5", "core-js": "^3.26.0", "crypto-js": "^4.0.0", "diagram-js": "^12.3.0", "echarts": "5.4.0", + "el-tree-transfer": "^2.4.7", "element-ui": "2.15.12", "file-saver": "^2.0.5", "fuse.js": "6.6.2", diff --git a/src/assets/images/choicepart/Produce.png b/src/assets/images/choicepart/Produce.png new file mode 100644 index 00000000..7c8a3216 Binary files /dev/null and b/src/assets/images/choicepart/Produce.png differ diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 046e334a..50ae3e74 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -125,11 +125,8 @@ export default { // 取消自动聚焦 start this.Quill?.enable(false); this.$nextTick(() => { - this.Quill?.enable(true); this.Quill?.blur(); - // if (!this.readOnly) { - // this.Quill?.enable(); - // } + this.Quill?.enable(true); }); // 如果设置了上传地址则自定义图片上传事件 if (this.type === 'url') { diff --git a/src/views/choicePart/index.vue b/src/views/choicePart/index.vue index 58bd8aed..e506cb60 100644 --- a/src/views/choicePart/index.vue +++ b/src/views/choicePart/index.vue @@ -56,214 +56,207 @@ import Navbar from './components/Navbar'; import { debounce } from '@/utils/debounce'; export default { - components: { Navbar }, - name: 'choicePart', - data() { - return { - boxReset: '', - scale: 1, - menuArr1: [ - { - name: 'Core', - title: '基础核心', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Order', - title: '订单管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Equipment', - title: '设备管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Group', - title: '班组管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Quality', - title: '质量管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Warehouse', - title: '仓库管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Energy', - title: '能源管理', - visible: false, - meta: { - title: '', - }, - }, - ], - menuArr2: [ - { - name: 'Packaging', - title: '包装管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Material', - title: '物料管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Extend', - title: '工艺管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Delivery', - title: '成品发货', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Report', - title: '报表管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'System', - title: '系统管理', - visible: false, - meta: { - title: '', - }, - }, - { - name: 'Devconfig', - title: '开发配置', - visible: false, - meta: { - title: '', - }, - }, - ], - showItem: false, - }; - }, - // computed:{ - // ...mapGetters(['sidebarRouters']) - // }, - mounted() { - this.getMsg(); - this.boxReset = debounce(() => { - this.resetSize(); - }, 300); - this.boxReset(); - window.addEventListener('resize', () => { - this.boxReset(); - }); - }, - methods: { - getMsg() { - let menuList = this.$store.state.permission.sidebarRouters; - console.log(menuList); - if (menuList.length > 0) { - for (let i = 0; i < menuList.length; i++) { - for (let k = 0; k < 7; k++) { - if (menuList[i].name === this.menuArr1[k].name) { - this.menuArr1[k].visible = true; - this.menuArr1[k].id = menuList[i].id; - this.menuArr1[k].choicepart = i; - this.menuArr1[k].children = menuList[i].children; - this.menuArr1[k].meta = menuList[i].meta; - } - } - for (let j = 0; j < 7; j++) { - if (menuList[i].name === this.menuArr2[j].name) { - this.menuArr2[j].visible = true; - this.menuArr2[j].id = menuList[i].id; - this.menuArr2[j].choicepart = i; - this.menuArr2[j].children = menuList[i].children; - this.menuArr2[j].meta = menuList[i].meta; - } - } - } - } - console.log(this.menuArr1); - console.log(this.menuArr2); - }, - handelClick(item, index) { - // this.$router.push({name: 'SystemUser'}) - this.$store.dispatch('app/setChoicepart', index); - this.toRouter(item); - // if (item.meta.unuse) { - // this.$message.warning(this.$t('暂无数据')) - // } else { - // this.toRouter(item) - // } - }, - toRouter(item) { - console.log(item); - if (item.children) { - this.toRouter(item.children[0]); - } else { - this.$router.push({ name: item.name }); - } - }, - resetSize() { - let _this = this; - _this.showItem = false; - _this.loading = true; - let choicepartBox = document.querySelector('#choicepartBox'); - let rw = parseFloat(window.innerWidth); - let rh = parseFloat(window.innerHeight); - let bw = parseFloat(choicepartBox.style.width); - let bh = parseFloat(choicepartBox.style.height); - let wx = 0.82 / (bw / rw); - let hx = 0.56 / (bh / rh); - _this.scale = wx > hx ? hx : wx; - setTimeout(_this.showItemFun, 700); - }, - showItemFun() { - this.loading = false; - this.showItem = true; - }, - }, - beforeDestroy() { - this.showItem = false; - }, -}; + components: { Navbar }, + name: 'choicePart', + data() { + return { + boxReset: '', + scale: 1, + menuArr1: [ + { + name: 'Core', + title: '基础核心', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Produce', + title: '生产管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Equipment', + title: '设备管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Group', + title: '班组管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Quality', + title: '质量管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Warehouse', + title: '仓库管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Energy', + title: '能源管理', + visible: false, + meta: { + title: '' + } + } + ], + menuArr2: [ + { + name: 'Packaging', + title: '包装管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Material', + title: '物料管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Extend', + title: '工艺管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Delivery', + title: '成品发货', + visible: false, + meta: { + title: '' + } + }, + { + name: 'Report', + title: '报表管理', + visible: false, + meta: { + title: '' + } + }, + { + name: 'System', + title: '系统管理', + visible: false, + meta: { + title: '' + } + } + ], + showItem: false + } + }, + // computed:{ + // ...mapGetters(['sidebarRouters']) + // }, + mounted() { + this.getMsg() + this.boxReset = debounce(() => { + this.resetSize() + }, 300) + this.boxReset() + window.addEventListener('resize', () => { + this.boxReset() + }) + }, + methods: { + getMsg() { + let menuList = this.$store.state.permission.sidebarRouters + console.log('sss', menuList) + console.log(menuList) + if (menuList.length > 0) { + for (let i = 0; i < menuList.length; i ++) { + for (let k = 0; k < 7; k++) { + if (menuList[i].name === this.menuArr1[k].name) { + this.menuArr1[k].visible = true + this.menuArr1[k].id = menuList[i].id + this.menuArr1[k].choicepart = i + this.menuArr1[k].children = menuList[i].children + this.menuArr1[k].meta = menuList[i].meta + } + } + for (let j = 0; j < 6; j++) { + if (menuList[i].name === this.menuArr2[j].name) { + this.menuArr2[j].visible = true + this.menuArr2[j].id = menuList[i].id + this.menuArr2[j].choicepart = i + this.menuArr2[j].children = menuList[i].children + this.menuArr2[j].meta = menuList[i].meta + } + } + } + } + console.log(this.menuArr1) + console.log(this.menuArr2) + }, + handelClick(item, index) { + // this.$router.push({name: 'SystemUser'}) + this.$store.dispatch('app/setChoicepart', index) + this.toRouter(item) + // if (item.meta.unuse) { + // this.$message.warning(this.$t('暂无数据')) + // } else { + // this.toRouter(item) + // } + }, + toRouter(item) { + console.log(item) + if (item.children) { + this.toRouter(item.children[0]) + } else { + this.$router.push({ name: item.name }) + } + }, + resetSize() { + let _this = this + _this.showItem = false + _this.loading = true + let choicepartBox = document.querySelector('#choicepartBox') + let rw = parseFloat(window.innerWidth) + let rh = parseFloat(window.innerHeight) + let bw = parseFloat(choicepartBox.style.width) + let bh = parseFloat(choicepartBox.style.height) + let wx = 0.82/(bw / rw) + let hx = 0.56/(bh / rh) + _this.scale = wx > hx ? hx : wx + setTimeout(_this.showItemFun, 700) + }, + showItemFun() { + this.loading = false + this.showItem = true + } + }, + beforeDestroy() { + this.showItem = false + } +} diff --git a/src/views/core/oldBase/lineBindProductLog/index.vue b/src/views/core/oldBase/lineBindProductLog/index.vue new file mode 100644 index 00000000..e8a1f613 --- /dev/null +++ b/src/views/core/oldBase/lineBindProductLog/index.vue @@ -0,0 +1,144 @@ + + + diff --git a/src/views/base/coreProduct/SmallTitle.vue b/src/views/core/oldBase/product/SmallTitle.vue similarity index 100% rename from src/views/base/coreProduct/SmallTitle.vue rename to src/views/core/oldBase/product/SmallTitle.vue diff --git a/src/views/core/oldBase/product/add-or-updata.vue b/src/views/core/oldBase/product/add-or-updata.vue new file mode 100644 index 00000000..eb5b51b1 --- /dev/null +++ b/src/views/core/oldBase/product/add-or-updata.vue @@ -0,0 +1,448 @@ + + + + + diff --git a/src/views/core/oldBase/product/attr-add.vue b/src/views/core/oldBase/product/attr-add.vue new file mode 100644 index 00000000..d5c46d11 --- /dev/null +++ b/src/views/core/oldBase/product/attr-add.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/src/views/core/oldBase/product/index.vue b/src/views/core/oldBase/product/index.vue new file mode 100644 index 00000000..7090b1bf --- /dev/null +++ b/src/views/core/oldBase/product/index.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/base/packagingPrintLog/unitDict.vue b/src/views/core/oldBase/product/unitDict.vue similarity index 100% rename from src/views/base/packagingPrintLog/unitDict.vue rename to src/views/core/oldBase/product/unitDict.vue diff --git a/src/views/core/oldBase/productAttr/index.vue b/src/views/core/oldBase/productAttr/index.vue new file mode 100644 index 00000000..a78e71b2 --- /dev/null +++ b/src/views/core/oldBase/productAttr/index.vue @@ -0,0 +1,228 @@ + + + diff --git a/src/views/core/oldBase/productionLine/add-or-updata.vue b/src/views/core/oldBase/productionLine/add-or-updata.vue new file mode 100644 index 00000000..32b83db5 --- /dev/null +++ b/src/views/core/oldBase/productionLine/add-or-updata.vue @@ -0,0 +1,153 @@ + + + + + + diff --git a/src/views/core/oldBase/productionLine/index.vue b/src/views/core/oldBase/productionLine/index.vue new file mode 100644 index 00000000..474bfcad --- /dev/null +++ b/src/views/core/oldBase/productionLine/index.vue @@ -0,0 +1,217 @@ + + + diff --git a/src/views/core/oldBase/productionLineRecDay/index.vue b/src/views/core/oldBase/productionLineRecDay/index.vue new file mode 100644 index 00000000..6b09138a --- /dev/null +++ b/src/views/core/oldBase/productionLineRecDay/index.vue @@ -0,0 +1,271 @@ + + + diff --git a/src/views/core/oldBase/productionLineRecSch/index.vue b/src/views/core/oldBase/productionLineRecSch/index.vue new file mode 100644 index 00000000..5801e932 --- /dev/null +++ b/src/views/core/oldBase/productionLineRecSch/index.vue @@ -0,0 +1,271 @@ + + + diff --git a/src/views/core/oldBase/workshopSection/add-or-updata.vue b/src/views/core/oldBase/workshopSection/add-or-updata.vue new file mode 100644 index 00000000..d0b5afc9 --- /dev/null +++ b/src/views/core/oldBase/workshopSection/add-or-updata.vue @@ -0,0 +1,112 @@ + + + + diff --git a/src/views/core/oldBase/workshopSection/index.vue b/src/views/core/oldBase/workshopSection/index.vue new file mode 100644 index 00000000..7bc1514f --- /dev/null +++ b/src/views/core/oldBase/workshopSection/index.vue @@ -0,0 +1,182 @@ + + + diff --git a/src/views/equipment/base/inspection/Content/index.vue b/src/views/equipment/base/inspection/Content/index.vue index e79cf7b7..ccd56a5f 100644 --- a/src/views/equipment/base/inspection/Content/index.vue +++ b/src/views/equipment/base/inspection/Content/index.vue @@ -84,10 +84,10 @@ export default { : undefined, ].filter((v) => v), tableProps: [ - { prop: 'program', label: '巡检项目' }, - { prop: 'content', label: '巡检内容' }, - { prop: 'code', label: '巡检内容编码' }, - { prop: 'remark', label: '备注' }, + { prop: 'program', label: '巡检项目', showOverflowtooltip: true }, + { prop: 'content', label: '巡检内容', minWidth: 150, showOverflowtooltip: true }, + { prop: 'code', label: '巡检内容编码', showOverflowtooltip: true }, + { prop: 'remark', label: '备注', showOverflowtooltip: true }, ], searchBarFormConfig: [ { diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue index 7649f3ee..664c4ebe 100644 --- a/src/views/equipment/base/repair/CustomDialogForm.vue +++ b/src/views/equipment/base/repair/CustomDialogForm.vue @@ -60,110 +60,112 @@ - + - - {{ '设备维修信息' }} - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + {{ '设备维修信息' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + +