projects/mes-test #133
@ -41,6 +41,7 @@
|
||||
"url": "https://github.com/YunaiV/ruoyi-vue-pro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@antv/x6": "^2.15.3",
|
||||
"@babel/parser": "7.18.4",
|
||||
"@riophae/vue-treeselect": "0.4.0",
|
||||
"axios": "0.27.2",
|
||||
@ -70,6 +71,7 @@
|
||||
"screenfull": "5.0.2",
|
||||
"sortablejs": "1.10.2",
|
||||
"throttle-debounce": "2.1.0",
|
||||
"uuid": "^9.0.1",
|
||||
"video.js": "^8.5.2",
|
||||
"vue": "2.7.14",
|
||||
"vue-count-to": "1.0.13",
|
||||
|
||||
@ -3,7 +3,7 @@ import request from '@/utils/request'
|
||||
// 创建设备
|
||||
export function createEquipment(data) {
|
||||
return request({
|
||||
url: '/base/equipment/create',
|
||||
url: '/base/core-equipment/create',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
@ -12,7 +12,7 @@ export function createEquipment(data) {
|
||||
// 更新设备
|
||||
export function updateEquipment(data) {
|
||||
return request({
|
||||
url: '/base/equipment/update',
|
||||
url: '/base/core-equipment/update',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
@ -21,7 +21,7 @@ export function updateEquipment(data) {
|
||||
// 删除设备
|
||||
export function deleteEquipment(id) {
|
||||
return request({
|
||||
url: '/base/equipment/delete?id=' + id,
|
||||
url: '/base/core-equipment/delete?id=' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@ -29,7 +29,7 @@ export function deleteEquipment(id) {
|
||||
// 获得设备
|
||||
export function getEquipment(id) {
|
||||
return request({
|
||||
url: '/base/equipment/get?id=' + id,
|
||||
url: '/base/core-equipment/get?id=' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
@ -37,7 +37,7 @@ export function getEquipment(id) {
|
||||
// 获得设备分页
|
||||
export function getEquipmentPage(query) {
|
||||
return request({
|
||||
url: '/base/equipment/page',
|
||||
url: '/base/core-equipment/page',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
@ -46,7 +46,7 @@ export function getEquipmentPage(query) {
|
||||
// 导出设备 Excel
|
||||
export function exportEquipmentExcel(query) {
|
||||
return request({
|
||||
url: '/base/equipment/export-excel',
|
||||
url: '/base/core-equipment/export-excel',
|
||||
method: 'get',
|
||||
params: query,
|
||||
responseType: 'blob'
|
||||
@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) {
|
||||
// 获得所有设备列表
|
||||
export function getEquipmentAll() {
|
||||
return request({
|
||||
url: '/base/equipment/listAll',
|
||||
url: '/base/core-equipment/listAll',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@ import request from '@/utils/request'
|
||||
// 创建设备类型
|
||||
export function createEquipmentType(data) {
|
||||
return request({
|
||||
url: '/base/equipment-type/create',
|
||||
url: '/base/core-equipment-type/create',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
@ -12,7 +12,7 @@ export function createEquipmentType(data) {
|
||||
// 更新设备类型
|
||||
export function updateEquipmentType(data) {
|
||||
return request({
|
||||
url: '/base/equipment-type/update',
|
||||
url: '/base/core-equipment-type/update',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
@ -21,7 +21,7 @@ export function updateEquipmentType(data) {
|
||||
// 删除设备类型
|
||||
export function deleteEquipmentType(id) {
|
||||
return request({
|
||||
url: '/base/equipment-type/delete?id=' + id,
|
||||
url: '/base/core-equipment-type/delete?id=' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@ -29,7 +29,7 @@ export function deleteEquipmentType(id) {
|
||||
// 获得设备类型
|
||||
export function getEquipmentType(id) {
|
||||
return request({
|
||||
url: '/base/equipment-type/get?id=' + id,
|
||||
url: '/base/core-equipment-type/get?id=' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
@ -37,7 +37,7 @@ export function getEquipmentType(id) {
|
||||
// 获得设备类型分页
|
||||
export function getEquipmentTypePage(query) {
|
||||
return request({
|
||||
url: '/base/equipment-type/page',
|
||||
url: '/base/core-equipment-type/page',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
@ -46,7 +46,7 @@ export function getEquipmentTypePage(query) {
|
||||
// 导出设备类型 Excel
|
||||
export function exportEquipmentTypeExcel(query) {
|
||||
return request({
|
||||
url: '/base/equipment-type/export-excel',
|
||||
url: '/base/core-equipment-type/export-excel',
|
||||
method: 'get',
|
||||
params: query,
|
||||
responseType: 'blob'
|
||||
|
||||
14
src/assets/icons/svg/icon-upload.svg
Normal file
14
src/assets/icons/svg/icon-upload.svg
Normal file
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>上传</title>
|
||||
<g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.65">
|
||||
<g id="上传_Resources/Button" transform="translate(-12.000000, -9.000000)">
|
||||
<g id="上传" transform="translate(12.000000, 9.000000)">
|
||||
<g id="upload" transform="translate(0.875000, 0.875000)" fill="currentColor" fill-rule="nonzero">
|
||||
<path d="M5.80371094,0.138085937 C5.8953125,0.046484375 6.01699219,0 6.13867188,0 C6.26035156,0 6.38066406,0.046484375 6.47363281,0.138085937 L8.60371094,2.26953125 C8.78828125,2.45410156 8.78828125,2.75351562 8.60371094,2.93808594 C8.51484375,3.02695312 8.39589844,3.07617188 8.27011719,3.07617188 C8.14433594,3.07617188 8.02539062,3.02695312 7.93652344,2.93808594 L6.61171875,1.61328125 L6.61171875,9.51289062 C6.61171875,9.77402344 6.39980469,9.9859375 6.13867188,9.9859375 C5.87753906,9.9859375 5.665625,9.77402344 5.665625,9.51289062 L5.665625,1.61328125 L4.34082031,2.93808594 C4.15625,3.12265625 3.85683594,3.12265625 3.67363281,2.93808594 C3.4890625,2.75351562 3.4890625,2.45410156 3.67226563,2.26953125 L5.80371094,0.138085937 Z M11.7769531,7.88046875 C11.5158203,7.88046875 11.3039063,8.09238281 11.3039063,8.35351563 L11.3039063,11.025 C11.3039063,11.1794922 11.178125,11.3066406 11.0222656,11.3066406 L1.22636719,11.3066406 C1.071875,11.3066406 0.944726562,11.1808594 0.944726562,11.025 L0.944726562,8.35214844 C0.944726562,8.09101563 0.7328125,7.87910156 0.471679688,7.87910156 C0.210546875,7.87910156 0,8.09238281 0,8.35214844 L0,11.3996094 C0,11.8685547 0.381445313,12.2486328 0.849023437,12.2486328 L11.4009766,12.2486328 C11.8699219,12.2486328 12.25,11.8671875 12.25,11.3996094 L12.25,8.35214844 C12.25,8.09238281 12.0380859,7.88046875 11.7769531,7.88046875 Z" id="Shape"></path>
|
||||
</g>
|
||||
<rect id="Rectangle-49" x="0" y="0" width="14" height="14"></rect>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.1 KiB |
@ -83,6 +83,9 @@
|
||||
:on-success="handleUploadSuccess"
|
||||
v-bind="col.bind">
|
||||
<el-button size="mini" :disabled="col.bind?.disabled || false">
|
||||
<svg-icon
|
||||
icon-class="icon-upload"
|
||||
style="color: inherit"></svg-icon>
|
||||
上传文件
|
||||
</el-button>
|
||||
<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
|
||||
@ -94,6 +97,7 @@
|
||||
class="file"
|
||||
v-for="file in form[col.prop] || []"
|
||||
:file="file"
|
||||
:key="file.fileUrl"
|
||||
@delete="handleDeleteFile(file)" />
|
||||
</div>
|
||||
</el-form-item>
|
||||
@ -105,6 +109,7 @@
|
||||
<script>
|
||||
import { getAccessToken } from '@/utils/auth';
|
||||
import tupleImg from '@/assets/images/tuple.png';
|
||||
import cache from '@/utils/cache';
|
||||
|
||||
/**
|
||||
* 找到最长的label
|
||||
@ -132,7 +137,6 @@ const uploadedFile = {
|
||||
},
|
||||
methods: {
|
||||
handleDelete() {
|
||||
console.log('emit delete event')
|
||||
this.$emit('delete', this.file);
|
||||
},
|
||||
},
|
||||
@ -187,6 +191,10 @@ export default {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
hasFiles: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
labelPosition: {
|
||||
type: String,
|
||||
default: 'right',
|
||||
@ -219,7 +227,6 @@ export default {
|
||||
watch: {
|
||||
rows: {
|
||||
handler() {
|
||||
console.log('watch triggered!');
|
||||
this.$nextTick(() => {
|
||||
this.handleOptions('watch');
|
||||
});
|
||||
@ -230,6 +237,9 @@ export default {
|
||||
dataForm: {
|
||||
handler(val) {
|
||||
this.form = JSON.parse(JSON.stringify(val));
|
||||
if (this.hasFiles) {
|
||||
this.form.files = this.form.files ?? [];
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
immediate: true,
|
||||
@ -308,6 +318,11 @@ export default {
|
||||
'list' in response.data
|
||||
? response.data.list
|
||||
: response.data;
|
||||
|
||||
if (opt.cache) {
|
||||
cache.store(opt.cache, list);
|
||||
}
|
||||
|
||||
this.$set(
|
||||
this.optionListOf,
|
||||
opt.prop,
|
||||
@ -367,7 +382,9 @@ export default {
|
||||
},
|
||||
|
||||
handleDeleteFile(file) {
|
||||
this.form.files = this.form.files.filter(item => item.fileUrl != file.fileUrl);
|
||||
this.form.files = this.form.files.filter(
|
||||
(item) => item.fileUrl != file.fileUrl
|
||||
);
|
||||
this.$emit('update', this.form);
|
||||
},
|
||||
},
|
||||
|
||||
@ -28,10 +28,37 @@ export default {
|
||||
// tableBtn: [], // 占位
|
||||
// searchBarFormConfig: [], // 占位
|
||||
// // 弹窗表单配置
|
||||
// dialogFormConfig: [], // 占位
|
||||
// dialogFormConfig: [], //
|
||||
updateUrl: '',
|
||||
addUrl: '',
|
||||
pageUrl: '',
|
||||
form: {}
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
// utils
|
||||
http(url, method, payload) {
|
||||
return this.$axios({
|
||||
url,
|
||||
method,
|
||||
params: method === 'get' ? payload : null,
|
||||
data: method !== 'get' ? payload : null,
|
||||
})
|
||||
},
|
||||
put(payload) {
|
||||
return this.http(this.updateUrl, 'put', payload);
|
||||
},
|
||||
post(payload) {
|
||||
return this.http(this.addUrl, 'post', payload);
|
||||
},
|
||||
recv(payload) {
|
||||
return this.http(this.pageUrl, 'get', payload);
|
||||
},
|
||||
info(payload) {
|
||||
return this.http(this.infoUrl, 'get', payload);
|
||||
},
|
||||
|
||||
|
||||
// 过滤后端传回的详情数据
|
||||
filterData(data, keys) {
|
||||
const obj = {};
|
||||
|
||||
53
src/utils/cache.js
Normal file
53
src/utils/cache.js
Normal file
@ -0,0 +1,53 @@
|
||||
let timers = [];
|
||||
|
||||
export default {
|
||||
|
||||
exists(key) {
|
||||
const _ = localStorage.getItem('stored_keys');
|
||||
return _ ? _.split(',')?.indexOf(key) != -1 : false;
|
||||
},
|
||||
|
||||
store(key, value, duration = null) {
|
||||
if (!localStorage.getItem('stored_keys')) localStorage.setItem('stored_keys', key);
|
||||
else localStorage.setItem('stored_keys', localStorage.getItem('stored_keys') + ',' + key);
|
||||
|
||||
localStorage.setItem(key, JSON.stringify(value));
|
||||
console.log('store duration', duration)
|
||||
if (duration) {
|
||||
if (timers[key]) clearTimeout(timers[key]);
|
||||
timers[key] = setTimeout(() => {
|
||||
console.log("clear cache", key)
|
||||
this.clear([key]);
|
||||
}, duration * 1000);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {*} key
|
||||
* @param {*} cb
|
||||
* @param {*} param2 force 强制更新，调用cb
|
||||
* @returns
|
||||
*/
|
||||
async getList(key, cb = null, { force = false, duration = null } = {}) {
|
||||
if (this.exists(key) && !force) {
|
||||
return JSON.parse(localStorage.getItem(key))
|
||||
} else {
|
||||
const list = await cb();
|
||||
this.store(key, list, duration);
|
||||
return list;
|
||||
}
|
||||
},
|
||||
|
||||
clear(keys) {
|
||||
if (keys && keys.length) {
|
||||
let stored_keys = localStorage.getItem('stored_keys').split(',');
|
||||
keys.forEach((key) => {
|
||||
stored_keys = stored_keys.filter((item) => item != key);
|
||||
});
|
||||
localStorage.setItem('stored_keys', stored_keys);
|
||||
return;
|
||||
}
|
||||
localStorage.removeItem('stored_keys');
|
||||
},
|
||||
}
|
||||
@ -438,3 +438,7 @@ export function toCamelCase(str, upperCaseFirst) {
|
||||
|
||||
return str;
|
||||
}
|
||||
|
||||
export function IdToName(targetId, source, prop = 'name') {
|
||||
return source.find(item => item.id === targetId)?.[prop]
|
||||
}
|
||||
@ -219,7 +219,7 @@ export default {
|
||||
{
|
||||
select: true,
|
||||
label: '设备',
|
||||
url: '/base/equipment/page?pageNo=1&pageSize=100',
|
||||
url: '/base/core-equipment/page?pageNo=1&pageSize=100',
|
||||
prop: 'equipmentId',
|
||||
bind: {
|
||||
filterable: true,
|
||||
@ -278,7 +278,7 @@ export default {
|
||||
input: true,
|
||||
label: '设备分组编码',
|
||||
prop: 'code',
|
||||
// url: '/base/equipment/getCode',
|
||||
// url: '/base/core-equipment/getCode',
|
||||
},
|
||||
],
|
||||
],
|
||||
|
||||
@ -191,7 +191,7 @@ export default {
|
||||
// 获取设备列表
|
||||
async getEquipmentList() {
|
||||
const response = await this.$axios(
|
||||
'/base/equipment/page?pageNo=1&pageSize=100'
|
||||
'/base/core-equipment/page?pageNo=1&pageSize=100'
|
||||
);
|
||||
this.equipmentList = response.data.list.map((item) => ({
|
||||
label: item.name,
|
||||
|
||||
@ -192,7 +192,7 @@ export default {
|
||||
{
|
||||
select: true,
|
||||
label: '设备',
|
||||
url: '/base/equipment/page?pageNo=1&pageSize=100',
|
||||
url: '/base/core-equipment/page?pageNo=1&pageSize=100',
|
||||
prop: 'equipmentId',
|
||||
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||
},
|
||||
|
||||
@ -192,7 +192,7 @@ export default {
|
||||
input: true,
|
||||
label: '设备分组编码',
|
||||
prop: 'code',
|
||||
// url: '/base/equipment/getCode',
|
||||
// url: '/base/core-equipment/getCode',
|
||||
}
|
||||
]
|
||||
],
|
||||
|
||||
@ -247,7 +247,7 @@ export default {
|
||||
select: true,
|
||||
label: '设备',
|
||||
prop: 'equipmentId',
|
||||
url: '/base/equipment/page?pageNo=1&pageSize=99',
|
||||
url: '/base/core-equipment/page?pageNo=1&pageSize=99',
|
||||
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||
bind: {
|
||||
filterable: true,
|
||||
@ -283,7 +283,7 @@ export default {
|
||||
input: true,
|
||||
label: '关联表名',
|
||||
prop: 'plcTableName',
|
||||
// url: '/base/equipment/getCode',
|
||||
// url: '/base/core-equipment/getCode',
|
||||
},
|
||||
],
|
||||
],
|
||||
@ -320,7 +320,7 @@ export default {
|
||||
methods: {
|
||||
async getEquipmentOptions() {
|
||||
const res = await this.$axios({
|
||||
url: '/base/equipment/listAll',
|
||||
url: '/base/core-equipment/listAll',
|
||||
method: 'get',
|
||||
});
|
||||
return res.data;
|
||||
|
||||
@ -18,7 +18,13 @@
|
||||
预览
|
||||
</div> -->
|
||||
</section>
|
||||
<section class="file-area">
|
||||
<section
|
||||
class="file-area"
|
||||
:style="{
|
||||
height: expand ? 'auto' : isPicMode ? '180px' : '152px',
|
||||
gap: isPicMode ? '0 24px' : '24px',
|
||||
gridAutoRows: isPicMode ? '180px' : '152px',
|
||||
}">
|
||||
<el-upload
|
||||
class="equipment-upload"
|
||||
:disabled="disabled"
|
||||
@ -56,7 +62,6 @@
|
||||
v-for="(file, index) in files"
|
||||
:key="file.fileName"
|
||||
:style="{
|
||||
display: index > 3 && !expand ? 'none' : 'block',
|
||||
background: isPicMode
|
||||
? `url(${file.fileUrl}) no-repeat`
|
||||
: `url(${defaultBg}) no-repeat`,
|
||||
@ -226,7 +231,7 @@ export default {
|
||||
clearTimeout(this.updateTimer);
|
||||
}
|
||||
this.updateTimer = setTimeout(() => {
|
||||
console.log('[AssetsUpload] 更新上传列表');
|
||||
// console.log('[AssetsUpload] 更新上传列表');
|
||||
this.emitFilelist();
|
||||
clearTimeout(this.updateTimer);
|
||||
this.updateTimer = null;
|
||||
@ -314,7 +319,6 @@ export default {
|
||||
}
|
||||
|
||||
:deep(.equipment-upload) {
|
||||
background: #ccc4;
|
||||
.el-upload-dragger {
|
||||
width: 188px;
|
||||
height: 128px;
|
||||
@ -346,6 +350,10 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.equipment-upload {
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.file-list {
|
||||
padding: 12px;
|
||||
border: 1px solid #ccc;
|
||||
@ -354,13 +362,14 @@ export default {
|
||||
// custom
|
||||
.file-area {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(5, 188px);
|
||||
grid-auto-rows: 128px;
|
||||
gap: 24px 18px;
|
||||
place-content: center;
|
||||
grid-template-columns: repeat(auto-fill, 188px);
|
||||
grid-auto-rows: 152px;
|
||||
gap: 48px 24px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.file-list__item {
|
||||
height: 128px;
|
||||
background-color: #fff;
|
||||
border: 1px dashed #d9d9d9;
|
||||
border-radius: 6px;
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
<!--
|
||||
filename: EquipmentAssets.vue
|
||||
author: liubin
|
||||
date: 2023-08-22 11:11:18
|
||||
description: 设备资产
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="equipment-assets"></div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "EquipmentAssets",
|
||||
components: {},
|
||||
props: {},
|
||||
data() {
|
||||
return {}
|
||||
},
|
||||
computed: {},
|
||||
methods: {},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.equipment-assets {
|
||||
background: #f1f1f1;
|
||||
padding: 12px;
|
||||
min-height: 128px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
</style>
|
||||
@ -283,7 +283,7 @@ export default {
|
||||
async getEqTypeList() {
|
||||
this.formLoading = true;
|
||||
const { code, data } = await this.$axios(
|
||||
'/base/equipment-type/page?pageNo=1&pageSize=100'
|
||||
'/base/core-equipment-type/page?pageNo=1&pageSize=100'
|
||||
);
|
||||
// debugger;
|
||||
if (code == 0) {
|
||||
|
||||
@ -1,111 +0,0 @@
|
||||
<!--
|
||||
filename: EquipmentPics.vue
|
||||
author: liubin
|
||||
date: 2023-08-18 16:29:39
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="equipment-pics">
|
||||
<div v-for="(url, idx) in images" :key="url">
|
||||
<img :src="url" :alt="url" />
|
||||
<figure class="big-img" :style="inlineStyle">
|
||||
<img :src="url" :alt="url" />
|
||||
<figcaption>{{ desc[idx] }}</figcaption>
|
||||
</figure>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'EquipmentPics',
|
||||
components: {},
|
||||
props: {
|
||||
inlineStyle: {
|
||||
type: Object,
|
||||
default: () => ({}),
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
desc: [
|
||||
'车间设备 - 1',
|
||||
'车间设备 - 2',
|
||||
'车间设备 - 3',
|
||||
'车间设备 - 4',
|
||||
'车间设备 - 5',
|
||||
'车间设备 - 6',
|
||||
'车间设备 - 7',
|
||||
'车间设备 - 8',
|
||||
'车间设备 - 9',
|
||||
'车间设备 - 10',
|
||||
'车间设备 - 11',
|
||||
'车间设备 - 12',
|
||||
],
|
||||
images: Array(10)
|
||||
.fill(1)
|
||||
.map((_, index) => require(`../assets/eq${index + 1}.jpg`)),
|
||||
};
|
||||
},
|
||||
methods: {},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.equipment-pics {
|
||||
// background: #cfcfcf;
|
||||
padding: 12px;
|
||||
// margin: 8px;
|
||||
display: flex;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
.equipment-pics > div {
|
||||
height: 100px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.equipment-pics > div:not(:last-child) {
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
.equipment-pics > div > img {
|
||||
height: 95%;
|
||||
}
|
||||
|
||||
.equipment-pics > div > figure {
|
||||
display: none;
|
||||
position: fixed;
|
||||
// inset: 0;
|
||||
// margin: auto;
|
||||
top: 0;
|
||||
right: 0;
|
||||
// width: 640px;
|
||||
// height: 480px;
|
||||
background: #000;
|
||||
overflow: hidden;
|
||||
padding: 8px 8px 0;
|
||||
}
|
||||
|
||||
.equipment-pics > div:hover > figure {
|
||||
margin: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.equipment-pics > div > figure > img {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.equipment-pics > div > figure > figcaption {
|
||||
height: 24px;
|
||||
margin-top: 8px;
|
||||
font-size: 18px;
|
||||
line-height: 1;
|
||||
color: #fff;
|
||||
}
|
||||
</style>
|
||||
@ -60,9 +60,9 @@
|
||||
name: '基本信息',
|
||||
key: 'base',
|
||||
rows: computedRows,
|
||||
url: '/base/equipment/get',
|
||||
urlUpdate: '/base/equipment/update',
|
||||
urlCreate: '/base/equipment/create',
|
||||
url: '/base/core-equipment/get',
|
||||
urlUpdate: '/base/core-equipment/update',
|
||||
urlCreate: '/base/core-equipment/create',
|
||||
queryParams: { id: form.id },
|
||||
},
|
||||
{
|
||||
@ -105,9 +105,6 @@
|
||||
<script>
|
||||
import moment from 'moment';
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
import { getAccessToken } from '@/utils/auth';
|
||||
import EquipmentPics from './components/EquipmentPics';
|
||||
import EquipmentAssets from './components/EquipmentAssets';
|
||||
import EquipmentDrawer from './components/EquipmentDrawer';
|
||||
|
||||
import {
|
||||
@ -132,6 +129,12 @@ export default {
|
||||
return {
|
||||
searchBarKeys: ['name', 'code'],
|
||||
tableBtn: [
|
||||
this.$auth.hasPermi(`base:equipment:update`)
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '详情',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermi('base:equipment:update')
|
||||
? {
|
||||
type: 'edit',
|
||||
@ -144,12 +147,6 @@ export default {
|
||||
btnName: '删除',
|
||||
}
|
||||
: undefined,
|
||||
this.$auth.hasPermi(`base:equipment:update`)
|
||||
? {
|
||||
type: 'detail',
|
||||
btnName: '详情',
|
||||
}
|
||||
: undefined,
|
||||
].filter((v) => v),
|
||||
tableProps: [
|
||||
{
|
||||
@ -213,6 +210,13 @@ export default {
|
||||
{
|
||||
type: 'separate',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
plain: true,
|
||||
color: 'primary',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment:create') ? 'button' : '',
|
||||
btnName: '新增',
|
||||
@ -220,12 +224,6 @@ export default {
|
||||
plain: true,
|
||||
color: 'success',
|
||||
},
|
||||
{
|
||||
type: this.$auth.hasPermi('base:equipment:export') ? 'button' : '',
|
||||
btnName: '导出',
|
||||
name: 'export',
|
||||
color: 'warning',
|
||||
},
|
||||
],
|
||||
rows: [
|
||||
[
|
||||
@ -242,7 +240,7 @@ export default {
|
||||
input: true,
|
||||
label: '设备编码',
|
||||
prop: 'code',
|
||||
url: '/base/equipment/getCode',
|
||||
url: '/base/core-equipment/getCode',
|
||||
},
|
||||
{
|
||||
input: true,
|
||||
@ -269,7 +267,7 @@ export default {
|
||||
select: true,
|
||||
label: '设备类型',
|
||||
prop: 'equipmentTypeId',
|
||||
url: '/base/equipment-type/page?pageNo=1&pageSize=100',
|
||||
url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
|
||||
bind: {
|
||||
filterable: true,
|
||||
},
|
||||
|
||||
@ -37,7 +37,12 @@
|
||||
@close="cancel"
|
||||
@cancel="cancel"
|
||||
@confirm="submitForm">
|
||||
<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
|
||||
<DialogForm
|
||||
v-if="open"
|
||||
ref="form"
|
||||
v-model="form"
|
||||
:has-files="true"
|
||||
:rows="rows" />
|
||||
</base-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -139,7 +144,7 @@ export default {
|
||||
input: true,
|
||||
label: '设备类型编码',
|
||||
prop: 'code',
|
||||
url: '/base/equipment-type/getCode',
|
||||
url: '/base/core-equipment-type/getCode',
|
||||
},
|
||||
],
|
||||
[
|
||||
@ -147,7 +152,7 @@ export default {
|
||||
select: true,
|
||||
label: '父类',
|
||||
prop: 'parentId',
|
||||
url: '/base/equipment-type/page?pageNo=1&pageSize=100',
|
||||
url: '/base/core-equipment-type/page?pageNo=1&pageSize=100',
|
||||
},
|
||||
{},
|
||||
],
|
||||
@ -207,8 +212,6 @@ export default {
|
||||
name: undefined,
|
||||
parentId: undefined,
|
||||
remark: undefined,
|
||||
fileNames: [],
|
||||
fileUrls: [],
|
||||
};
|
||||
this.resetForm('form');
|
||||
},
|
||||
|
||||
@ -416,7 +416,7 @@ export default {
|
||||
/** 准备设备数据 */
|
||||
async initEquipment() {
|
||||
const { code, data } = await this.$axios({
|
||||
url: '/base/equipment/listAll',
|
||||
url: '/base/core-equipment/listAll',
|
||||
method: 'get',
|
||||
});
|
||||
if (code == 0) {
|
||||
|
||||
@ -223,7 +223,7 @@ export default {
|
||||
/** 准备设备数据 */
|
||||
async initEquipment() {
|
||||
const { code, data } = await this.$axios({
|
||||
url: '/base/equipment/listAll',
|
||||
url: '/base/core-equipment/listAll',
|
||||
method: 'get',
|
||||
});
|
||||
if (code == 0) {
|
||||
|
||||
367
src/views/extend/processFlow/index.vue
Normal file
367
src/views/extend/processFlow/index.vue
Normal file
@ -0,0 +1,367 @@
|
||||
<!--
|
||||
filename: index.vue
|
||||
author: liubin
|
||||
date: 2023-10-19 10:03:42
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- 搜索工作栏 -->
|
||||
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
||||
|
||||
<section class="process-flow">
|
||||
<el-button class="process-item__add-btn" @click="handleAdd">
|
||||
+ 新增工艺
|
||||
</el-button>
|
||||
<ProcessItem
|
||||
v-for="item in list"
|
||||
:key="item.id"
|
||||
:id="item.id"
|
||||
:name="item.name"
|
||||
:line="item.lineName"
|
||||
:desc="item.remark"
|
||||
:isActive="item.enabled"
|
||||
@edit="handleUpdate" />
|
||||
</section>
|
||||
|
||||
<base-dialog
|
||||
:dialogTitle="title"
|
||||
:dialogVisible="open"
|
||||
@close="cancel"
|
||||
@cancel="cancel"
|
||||
width="45%"
|
||||
@confirm="submitForm">
|
||||
<DialogForm
|
||||
v-if="open"
|
||||
key="index-dialog-form"
|
||||
ref="form"
|
||||
v-model="form"
|
||||
:rows="rows" />
|
||||
</base-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import basicPageMixin from '@/mixins/lb/basicPageMixin';
|
||||
// import cache from '@/utils/cache';
|
||||
|
||||
const ProcessItem = {
|
||||
name: 'ProcessItem',
|
||||
components: {},
|
||||
props: ['id', 'name', 'line', 'desc', 'isActive'],
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
computed: {},
|
||||
methods: {
|
||||
handleEdit() {
|
||||
this.$emit('edit', this.id);
|
||||
},
|
||||
handleViewDetail(e) {
|
||||
this.$router.push({
|
||||
name: 'ProcessFlowView',
|
||||
params: {
|
||||
id: this.id,
|
||||
},
|
||||
});
|
||||
},
|
||||
},
|
||||
render: function (h) {
|
||||
return (
|
||||
<div
|
||||
class={'process-item' + (this.isActive ? ' active' : '')}
|
||||
style="display: flex; flex-direction: column; position: relative;">
|
||||
<div
|
||||
class="process-item__content"
|
||||
style="flex: 1; display: flex; align-items: center; cursor: pointer;"
|
||||
title="点击查看详细工序列表"
|
||||
onClick={this.handleViewDetail}>
|
||||
{this.isActive ? (
|
||||
<span style="display: inline-block; width: 10px; height: 10px; border-radius: 100%; background: #0ebe3a; position: absolute; top: 20px; right: 20px;" />
|
||||
) : (
|
||||
''
|
||||
)}
|
||||
<svg-icon
|
||||
icon-class="tree-table"
|
||||
style="margin-left: 12px; width: 48px; height: 48px; color: #0858ff33"
|
||||
/>
|
||||
<div
|
||||
class="info"
|
||||
style="margin-left: 12px; display: flex; flex-direction: column;">
|
||||
<h2 style="margin: 20px 0 0; font-weight: 600; font-size: 18px; ">
|
||||
{this.name}
|
||||
</h2>
|
||||
<h3 style="margin: 0; font-weight: 400; font-size: 14px; line-height: 2; color: #888;">
|
||||
{this.line || '/'}
|
||||
</h3>
|
||||
<p style="margin: 0; text-overflow: ellipse; white-space: nowrap; font-weight: 400; font-size: 14px; line-height: 1.25; color: #888;">
|
||||
{this.desc}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="process-item__footer"
|
||||
style="background: #f7f9fa; border-top: 1px solid #0001;">
|
||||
<el-row gutter={20}>
|
||||
<el-col
|
||||
span={8}
|
||||
style="text-align: center; border-right: 1px solid #0001">
|
||||
<el-button
|
||||
type="text"
|
||||
style="color: #0007; line-height: 1.75"
|
||||
onClick={this.handleEdit}>
|
||||
编辑
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col
|
||||
span={8}
|
||||
style="text-align: center; border-right: 1px solid #0001">
|
||||
<el-button type="text" style="color: #0007; line-height: 1.75">
|
||||
复制
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col span={8} style="text-align: center;">
|
||||
<el-button type="text" style="color: #0007; line-height: 1.75">
|
||||
删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
};
|
||||
|
||||
export default {
|
||||
name: 'ProcessFlow',
|
||||
components: { ProcessItem },
|
||||
mixins: [basicPageMixin],
|
||||
props: {},
|
||||
data() {
|
||||
return {
|
||||
updateUrl: '/extend/process-flow/update',
|
||||
addUrl: '/extend/process-flow/create',
|
||||
pageUrl: '/extend/process-flow/page',
|
||||
infoUrl: '/extend/process-flow/get',
|
||||
searchBarKeys: ['name', 'code', 'lineId', 'productId'],
|
||||
searchBarFormConfig: [
|
||||
{
|
||||
label: '工艺流程列表',
|
||||
},
|
||||
],
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
code: null,
|
||||
name: null,
|
||||
productId: null,
|
||||
lineId: null,
|
||||
},
|
||||
lineList: null,
|
||||
list: [],
|
||||
rows: [
|
||||
[
|
||||
{
|
||||
input: true,
|
||||
label: '工艺名称',
|
||||
prop: 'name',
|
||||
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||
// bind: {
|
||||
// disabled: this.editMode == 'detail', // some condition, like detail mode...
|
||||
// }
|
||||
},
|
||||
{
|
||||
input: true,
|
||||
label: '工艺编码',
|
||||
prop: 'code',
|
||||
// url: '/base/core-equipment/getCode',
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
select: true,
|
||||
label: '产线',
|
||||
prop: 'lineId',
|
||||
// cache: 'processFlow::lineList',
|
||||
url: '/base/core-production-line/listAll',
|
||||
bind: {
|
||||
filterable: true,
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
switch: true,
|
||||
label: '是否启用',
|
||||
prop: 'enabled',
|
||||
bind: {
|
||||
'active-value': 1,
|
||||
'inactive-value': 0,
|
||||
},
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
textarea: true,
|
||||
label: '功能描述',
|
||||
prop: 'remark',
|
||||
},
|
||||
],
|
||||
],
|
||||
form: {
|
||||
id: null,
|
||||
code: null,
|
||||
name: null,
|
||||
productId: null,
|
||||
lineId: null,
|
||||
enabled: 1,
|
||||
remark: null,
|
||||
externalCode: null,
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
mounted() {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
code: null,
|
||||
name: null,
|
||||
productId: null,
|
||||
lineId: null,
|
||||
enabled: 1,
|
||||
remark: null,
|
||||
externalCode: null,
|
||||
};
|
||||
this.resetForm('form');
|
||||
},
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.showUploadComponents = false;
|
||||
this.title = '添加工艺';
|
||||
},
|
||||
async handleUpdate(id) {
|
||||
this.reset();
|
||||
const { data } = await this.info({ id });
|
||||
this.form = data;
|
||||
this.open = true;
|
||||
this.title = '修改工艺';
|
||||
},
|
||||
submitForm() {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
// 修改的提交
|
||||
if (this.form.id != null) {
|
||||
this.put(this.form).then((response) => {
|
||||
this.$modal.msgSuccess('修改成功');
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
return;
|
||||
}
|
||||
// 添加的提交
|
||||
this.post(this.form).then((response) => {
|
||||
this.$modal.msgSuccess('新增成功');
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
async getList() {
|
||||
this.loading = true;
|
||||
const { code, data } = await this.recv(this.queryParams);
|
||||
if (code == 0) {
|
||||
this.list = data.list;
|
||||
this.total = data.total;
|
||||
this.loading = false;
|
||||
return;
|
||||
}
|
||||
this.loading = false;
|
||||
},
|
||||
|
||||
// async getList() {
|
||||
// this.loading = true;
|
||||
// const { code, data } = await this.recv(this.queryParams);
|
||||
// if (code == 0) {
|
||||
// const list = [];
|
||||
// for (const item of data.list) {
|
||||
// const newItem = await this.itemAttachName(item);
|
||||
// list.push(newItem);
|
||||
// }
|
||||
// this.list = list;
|
||||
// this.total = data.total;
|
||||
// this.loading = false;
|
||||
// return;
|
||||
// }
|
||||
// this.loading = false;
|
||||
// },
|
||||
|
||||
// async itemAttachName(item) {
|
||||
// if (!this.lineList) {
|
||||
// this.lineList = await cache.getList(
|
||||
// 'processFlow::lineList',
|
||||
// async () => {
|
||||
// const { code, data } = await this.$axios(
|
||||
// '/base/core-production-line/listAll'
|
||||
// );
|
||||
// if (code == 0) {
|
||||
// return data;
|
||||
// }
|
||||
// }
|
||||
// );
|
||||
// }
|
||||
// return {
|
||||
// ...item,
|
||||
// lineName: this.lineList.find((line) => line.id == item.lineId)?.name,
|
||||
// };
|
||||
// },
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.process-flow {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
|
||||
grid-auto-rows: 200px;
|
||||
gap: 24px;
|
||||
}
|
||||
|
||||
.process-item__add-btn {
|
||||
display: grid;
|
||||
border: 1px solid #ccc;
|
||||
font-size: 20px;
|
||||
color: #ccc;
|
||||
border-style: dashed;
|
||||
border-radius: 6px;
|
||||
place-items: center;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s ease-in;
|
||||
|
||||
&:hover {
|
||||
color: #555;
|
||||
border-color: #555;
|
||||
}
|
||||
}
|
||||
|
||||
.process-item {
|
||||
border-radius: 4px;
|
||||
box-shadow: 0 0 6px 1px #ccc;
|
||||
overflow: hidden;
|
||||
|
||||
// &.active {
|
||||
// box-shadow: 0 0 6px 1px #18c8bf66;
|
||||
// }
|
||||
}
|
||||
</style>
|
||||
138
src/views/extend/processFlowView/components/ProcessBomList.vue
Normal file
138
src/views/extend/processFlowView/components/ProcessBomList.vue
Normal file
@ -0,0 +1,138 @@
|
||||
<!--
|
||||
filename: ProcessBomList.vue
|
||||
author: liubin
|
||||
date: 2023-10-20 15:00:58
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<section class="process-bom">
|
||||
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
||||
|
||||
<div class="btns" style="
|
||||
text-align: right;
|
||||
position: absolute;
|
||||
top: 20px;
|
||||
right: 20px;
|
||||
display: flex;
|
||||
">
|
||||
<el-button type="primary" plain :disabled="currentDet == null" class="btn-create" icon="el-icon-plus">
|
||||
分配设备
|
||||
</el-button>
|
||||
<el-input icon="el-icon-search" placeholder="搜索" v-model="searchText" style="margin-left: 20px">
|
||||
<i slot="prefix" class="el-input__icon el-icon-search"></i>
|
||||
</el-input>
|
||||
</div>
|
||||
|
||||
<!-- 列表 -->
|
||||
<base-table :table-props="tableProps" :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-data="list"
|
||||
@emitFun="handleEmitFun">
|
||||
<method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" :method-list="tableBtn"
|
||||
@clickBtn="handleTableBtnClick" />
|
||||
</base-table>
|
||||
|
||||
<!-- 分页组件 -->
|
||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
|
||||
@pagination="getList" />
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'ProcessBom',
|
||||
components: {},
|
||||
props: {
|
||||
currentDet: {
|
||||
type: Object,
|
||||
default: null
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
searchBarFormConfig: [{ label: '工序下设备' }],
|
||||
tableProps: [
|
||||
// {
|
||||
// prop: 'createTime',
|
||||
// label: '添加时间',
|
||||
// fixed: true,
|
||||
// width: 180,
|
||||
// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
|
||||
// },
|
||||
{ prop: 'name', label: '设备名称' },
|
||||
{ prop: 'code', label: '物料BOM' },
|
||||
{ prop: 'remark', label: '参数BOM' },
|
||||
],
|
||||
list: [],
|
||||
total: 0,
|
||||
tableBtn: [],
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
searchText: ''
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
currentDet: {
|
||||
handler(val) {
|
||||
if (val != null) {
|
||||
this.getList(val);
|
||||
} else {
|
||||
this.clearList();
|
||||
}
|
||||
},
|
||||
immediate: true,
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
handleEmitFun() { },
|
||||
handleTableBtnClick() { },
|
||||
put(payload) {
|
||||
return this.http(this.updateUrl, 'put', payload);
|
||||
},
|
||||
post(payload) {
|
||||
return this.http(this.addUrl, 'post', payload);
|
||||
},
|
||||
recv(payload) {
|
||||
return this.http(this.pageUrl, 'get', payload);
|
||||
},
|
||||
info(payload) {
|
||||
return this.http(this.infoUrl, 'get', payload);
|
||||
},
|
||||
http(url, method, payload) {
|
||||
return this.$axios({
|
||||
url,
|
||||
method,
|
||||
params: method === 'get' ? payload : null,
|
||||
data: method !== 'get' ? payload : null,
|
||||
})
|
||||
},
|
||||
|
||||
getList({ detId, detName, detDesc, flowId, sectionName } = {}) {
|
||||
console.log('get list')
|
||||
|
||||
},
|
||||
getList() {
|
||||
this.list = [
|
||||
{ name: '1', code: 'bomg-1', remark: 'Tochter' },
|
||||
{ name: '2', code: 'bomg-2', remark: 'Bruder' },
|
||||
{ name: '3', code: 'bomg-3', remark: 'Kalt' },
|
||||
]
|
||||
},
|
||||
clearList() {
|
||||
this.list = [];
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.process-bom {
|
||||
position: relative;
|
||||
flex: 1;
|
||||
padding: 12px 20px;
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
}
|
||||
</style>
|
||||
474
src/views/extend/processFlowView/components/ProcessDetail.vue
Normal file
474
src/views/extend/processFlowView/components/ProcessDetail.vue
Normal file
@ -0,0 +1,474 @@
|
||||
<!--
|
||||
filename: ProcessGraph.vue
|
||||
author: liubin
|
||||
date: 2023-10-20 15:00:58
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<section class="process-graph">
|
||||
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
||||
|
||||
<div class="btns" style="text-align: right; position: absolute; top: 20px; right: 20px">
|
||||
<el-button type="warning" @click="undo" plain v-if="allowUndo" :disabled="!allowUndo" icon="el-icon-back">
|
||||
撤销
|
||||
</el-button>
|
||||
<el-button type="warning" @click="redo" plain v-if="allowRedo" :disabled="!allowRedo">
|
||||
下一步
|
||||
<i class="el-icon-right el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-button class="btn-refresh" @click="handleUpdateLayout" icon="el-icon-refresh">
|
||||
刷新布局</el-button>
|
||||
<el-button type="primary" plain class="btn-create" icon="el-icon-plus" @click="handleAdd">
|
||||
新建工序
|
||||
</el-button>
|
||||
<el-button class="btn-edit" :disabled="currentDet == null" @click="handleEdit">编辑</el-button>
|
||||
</div>
|
||||
|
||||
<div class="process-graph__panel" ref="panel"></div>
|
||||
|
||||
<base-dialog :dialogTitle="title" :dialogVisible="open" width="35%" @close="cancel" @cancel="cancel"
|
||||
@confirm="submitForm">
|
||||
<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
|
||||
</base-dialog>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { Graph } from '@antv/x6';
|
||||
import ProcessNode, { createProcessNode, CACHE_NAME, getSectionFrom } from './ProcessNode';
|
||||
import DialogForm from '@/components/DialogForm';
|
||||
// import { IdToName } from '@/utils'
|
||||
|
||||
Graph.registerNode('process-node', ProcessNode);
|
||||
|
||||
export default {
|
||||
name: 'ProcessGraph',
|
||||
components: { DialogForm },
|
||||
props: {},
|
||||
inject: ['getFlowId'],
|
||||
data() {
|
||||
return {
|
||||
allowRedo: false,
|
||||
allowUndo: false,
|
||||
graph: null,
|
||||
searchBarFormConfig: [{ label: '工序列表' }],
|
||||
title: '',
|
||||
open: false,
|
||||
form: {
|
||||
name: '', // 工序名称
|
||||
sectionId: '', // 工段id
|
||||
remark: '', // 描述
|
||||
},
|
||||
rows: [
|
||||
[
|
||||
{
|
||||
input: true,
|
||||
label: '工序名称',
|
||||
prop: 'name',
|
||||
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
select: true,
|
||||
label: '工段',
|
||||
prop: 'sectionId',
|
||||
url: '/base/core-workshop-section/listAll',
|
||||
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
|
||||
bind: {
|
||||
filterable: true,
|
||||
},
|
||||
cache: CACHE_NAME
|
||||
},
|
||||
],
|
||||
[
|
||||
{
|
||||
textarea: true,
|
||||
label: '工序说明',
|
||||
prop: 'remark',
|
||||
},
|
||||
],
|
||||
],
|
||||
updateUrl: '/extend/process-flow-det/update',
|
||||
deleteUrl: '/extend/process-flow-det/delete',
|
||||
addUrl: '/extend/process-flow-det/create',
|
||||
// pageUrl: '/extend/process-flow-det/get',
|
||||
infoUrl: '/extend/process-flow-view/getByFlowId',
|
||||
layout: {
|
||||
id: null,
|
||||
flowId: null,
|
||||
content: '',
|
||||
createTime: null
|
||||
},
|
||||
currentDet: null,
|
||||
currentNode: null
|
||||
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
'form.sectionId': {
|
||||
handler(id) {
|
||||
},
|
||||
immediate: false,
|
||||
},
|
||||
currentDet: {
|
||||
handler(val) {
|
||||
this.$emit('det-selected', val)
|
||||
},
|
||||
deep: true,
|
||||
immediate: true
|
||||
}
|
||||
},
|
||||
activated() {
|
||||
this.loadLayout().then(json => {
|
||||
this.initGraph(json)
|
||||
})
|
||||
},
|
||||
deactivated() {
|
||||
this.graph.dispose();
|
||||
this.$nextTick(() => {
|
||||
this.resetLayout();
|
||||
this.graph = null;
|
||||
})
|
||||
},
|
||||
computed: {},
|
||||
methods: {
|
||||
|
||||
initGraph(json) {
|
||||
const graph = new Graph({
|
||||
container: this.$refs.panel,
|
||||
grid: {
|
||||
size: 10,
|
||||
visible: true,
|
||||
},
|
||||
history: true,
|
||||
selecting: {
|
||||
className: 'my-select'
|
||||
},
|
||||
connecting: {
|
||||
snap: true,
|
||||
allowBlank: false,
|
||||
allowLoop: false,
|
||||
allowNode: false,
|
||||
allowPort: true,
|
||||
allowEdge: false,
|
||||
},
|
||||
panning: true,
|
||||
// scroller: {
|
||||
// enabled: true,
|
||||
// pannable: true,
|
||||
// cursor: '',
|
||||
// width: 800,
|
||||
// height: 200
|
||||
// },
|
||||
mousewheel: {
|
||||
enabled: true,
|
||||
modifiers: ['ctrl', 'meta']
|
||||
}
|
||||
});
|
||||
|
||||
graph.fromJSON(json)
|
||||
this.graph = graph;
|
||||
this.$nextTick(() => {
|
||||
this.registerGraphEvents();
|
||||
})
|
||||
},
|
||||
|
||||
registerGraphEvents() {
|
||||
const reset = () => {
|
||||
const nodes = this.graph.getNodes();
|
||||
const edges = this.graph.getEdges();
|
||||
this.currentDet = null;
|
||||
this.currentNode = null;
|
||||
|
||||
nodes.forEach(node => {
|
||||
node.attr('container/stroke', '#ccc');
|
||||
});
|
||||
edges.forEach(edge => {
|
||||
edge.attr('line/stroke', '#ccc')
|
||||
})
|
||||
}
|
||||
|
||||
this.graph.on('node:click', ({ e, x, y, node, view }) => {
|
||||
reset();
|
||||
node.attr('container/stroke', '#0b58ff');
|
||||
const { detId, detName, detDesc, processId, sectionId, sectionName } = node.attrs;
|
||||
this.currentDet = {}
|
||||
this.$set(this.currentDet, 'detId', detId.text)
|
||||
this.$set(this.currentDet, 'sectionId', sectionId.text)
|
||||
this.$set(this.currentDet, 'detName', detName.text)
|
||||
this.$set(this.currentDet, 'detDesc', detDesc.text)
|
||||
this.$set(this.currentDet, 'flowId', processId.text)
|
||||
this.$set(this.currentDet, 'sectionName', sectionName.text)
|
||||
this.currentNode = node
|
||||
});
|
||||
this.graph.on('edge:click', ({ e, x, y, edge, view }) => {
|
||||
// console.log('edge clicked!', edge)
|
||||
reset();
|
||||
edge.attr('line/stroke', '#0b58ff')
|
||||
});
|
||||
this.graph.on('blank:click', ({ e, x, y }) => {
|
||||
reset();
|
||||
});
|
||||
this.graph.on('node:mouseenter', ({ node }) => {
|
||||
node.addTools({
|
||||
name: 'button-remove',
|
||||
args: {
|
||||
x: '100%',
|
||||
y: 0,
|
||||
offset: { x: 0, y: 0 },
|
||||
onClick: ({ e, cell, view }) => {
|
||||
this.$confirm(
|
||||
'确定删除这个工序吗?',
|
||||
'提示',
|
||||
{
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}
|
||||
).then(() => {
|
||||
view.cell.remove()
|
||||
}).catch(err => {
|
||||
return;
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
this.graph.on('node:mouseleave', ({ node }) => {
|
||||
node.removeTools();
|
||||
})
|
||||
},
|
||||
|
||||
resetLayout() {
|
||||
this.layout = {
|
||||
id: null,
|
||||
flowId: null,
|
||||
content: '',
|
||||
createTime: null
|
||||
}
|
||||
},
|
||||
|
||||
async loadLayout() {
|
||||
const flowId = this.$route.params.id;
|
||||
if (!flowId) return { cells: [] }
|
||||
const { code, data } = await this.info({ id: flowId });
|
||||
if (code == 0) {
|
||||
if (data) {
|
||||
this.layout = data;
|
||||
return JSON.parse(data?.content) || { cells: [] };
|
||||
}
|
||||
return { cells: [] };
|
||||
}
|
||||
this.resetLayout();
|
||||
return Promise.reject(this.infoUrl + ' 接口出错!');
|
||||
},
|
||||
|
||||
handleToJson() { },
|
||||
|
||||
handleLoadJson() { },
|
||||
|
||||
handleDumpJson() {
|
||||
if (this.graph) {
|
||||
console.log(JSON.stringify(this.graph.toJSON(), null, 2));
|
||||
}
|
||||
},
|
||||
|
||||
async handleUpdateLayout() {
|
||||
this.layout.content = JSON.stringify(this.graph.toJSON());
|
||||
let code, data;
|
||||
console.table([this.layout, this.$route.params.id])
|
||||
// 手动刷新布局
|
||||
if (this.layout.id) {
|
||||
({ code, data } = await this.http('/extend/process-flow-view/update', 'put', this.layout));
|
||||
} else {
|
||||
this.layout.flowId = this.$route.params.id;
|
||||
({ code, data } = await this.http('/extend/process-flow-view/create', 'post', this.layout));
|
||||
}
|
||||
|
||||
if (code == 0) {
|
||||
this.$modal.msgSuccess('布局已刷新!')
|
||||
}
|
||||
},
|
||||
|
||||
reset() {
|
||||
this.form = {
|
||||
name: '', // 工序名称
|
||||
sectionId: '', // 工段id
|
||||
remark: '', // 描述
|
||||
};
|
||||
this.resetForm('form');
|
||||
},
|
||||
|
||||
/** 取消按钮 */
|
||||
cancel() {
|
||||
this.open = false;
|
||||
this.reset();
|
||||
},
|
||||
|
||||
handleAdd() {
|
||||
this.reset();
|
||||
this.open = true;
|
||||
this.title = '添加工序';
|
||||
},
|
||||
|
||||
handleEdit() {
|
||||
this.form.name = this.currentDet.detName;
|
||||
this.form.sectionId = this.currentDet.sectionId;
|
||||
this.form.remark = this.currentDet.detDesc;
|
||||
this.form.id = this.currentDet.detId;
|
||||
this.title = '编辑工序';
|
||||
this.$nextTick(() => {
|
||||
this.open = true;
|
||||
})
|
||||
},
|
||||
|
||||
async handleDelete(id) {
|
||||
const { code, data } = await this.delete({ id });
|
||||
if (code == 0) {
|
||||
this.$msgSuccess('成功删除一个工序!');
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
},
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs['form'].validate((valid) => {
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
// 修改的提交
|
||||
if (this.form.id != null) {
|
||||
this.updateProcess()
|
||||
.then((form) => {
|
||||
const { name, sectionId, remark } = form;
|
||||
getSectionFrom(sectionId).then(sectionName => {
|
||||
// 修改当前node的信息
|
||||
this.currentNode.setAttrs({
|
||||
detName: { text: name },
|
||||
sectionId: { text: sectionId },
|
||||
sectionName: { text: sectionName },
|
||||
detDesc: { text: remark }
|
||||
})
|
||||
})
|
||||
})
|
||||
.catch(err => { });
|
||||
return;
|
||||
}
|
||||
|
||||
this.createProcess()
|
||||
.then(({ id, name, sectionId, remark, flowId }) => {
|
||||
if (!id) return null;
|
||||
return createProcessNode({
|
||||
flowId: flowId,
|
||||
name, sectionId, remark,
|
||||
id,
|
||||
})
|
||||
}).then(node => {
|
||||
if (!node) {
|
||||
this.$modal.msgError('创建节点失败');
|
||||
return;
|
||||
};
|
||||
this.graph.addNode(node);
|
||||
}).catch(err => {
|
||||
return;
|
||||
});
|
||||
|
||||
});
|
||||
},
|
||||
|
||||
updateProcess() {
|
||||
const flowId = this.getFlowId();
|
||||
if (!flowId) {
|
||||
this.$modal.msgError('工艺ID不能为空');
|
||||
return Promise.reject('工艺ID不能为空');
|
||||
}
|
||||
return this.put({ flowId, ...this.form })
|
||||
.then(({ code, data }) => {
|
||||
if (code == 0) {
|
||||
this.$modal.msgSuccess('修改成功');
|
||||
} else {
|
||||
this.$modal.msgError('修改失败');
|
||||
}
|
||||
const formCopy = { ...this.form }
|
||||
this.open = false;
|
||||
return formCopy;
|
||||
});
|
||||
},
|
||||
|
||||
createProcess() {
|
||||
// const flowId = this.$route.params.id;
|
||||
const flowId = this.getFlowId(); // it also works
|
||||
if (!flowId) {
|
||||
this.$modal.msgError('工艺ID不能为空');
|
||||
return Promise.reject('工艺ID不能为空');
|
||||
}
|
||||
console.log('create process', this.form)
|
||||
// 添加的提交
|
||||
return this.post({ flowId, ...this.form }).then(
|
||||
({ code, data }) => {
|
||||
this.$modal.msgSuccess('新增成功');
|
||||
this.open = false;
|
||||
// this.getList();
|
||||
return {
|
||||
id: data, // 服务器返回的新建的工段id
|
||||
...this.form, // 保存一份 this.form 副本，当 open->false 时 this.form 里的信息就清空了
|
||||
flowId
|
||||
};
|
||||
}
|
||||
).catch(err => {
|
||||
this.$msgError(err)
|
||||
});
|
||||
},
|
||||
|
||||
put(payload) {
|
||||
return this.http(this.updateUrl, 'put', payload);
|
||||
},
|
||||
post(payload) {
|
||||
return this.http(this.addUrl, 'post', payload);
|
||||
},
|
||||
recv(payload) {
|
||||
return this.http(this.pageUrl, 'get', payload);
|
||||
},
|
||||
info(payload) {
|
||||
return this.http(this.infoUrl, 'get', payload);
|
||||
},
|
||||
delete(payload) {
|
||||
return this.http(this.deleteUrl, 'delete', payload);
|
||||
},
|
||||
http(url, method, payload) {
|
||||
return this.$axios({
|
||||
url,
|
||||
method,
|
||||
params: method === 'get' ? payload : null,
|
||||
data: method !== 'get' ? payload : null,
|
||||
})
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.process-graph {
|
||||
padding: 12px 20px 20px;
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.process-graph__panel {
|
||||
height: 300px;
|
||||
}
|
||||
</style>
|
||||
|
||||
<style>
|
||||
.x6-widget-selection-selected {
|
||||
border: 1px solid red;
|
||||
}
|
||||
|
||||
.my-select {
|
||||
border: 1px solid red;
|
||||
}
|
||||
</style>
|
||||
133
src/views/extend/processFlowView/components/ProcessInfo.vue
Normal file
133
src/views/extend/processFlowView/components/ProcessInfo.vue
Normal file
@ -0,0 +1,133 @@
|
||||
<!--
|
||||
filename: ProcessInfo.vue
|
||||
author: liubin
|
||||
date: 2023-10-20 15:00:58
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<section class="process-info">
|
||||
<SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" />
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<InfoItem label="工艺名称" :value="form.name" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<InfoItem label="产线" :value="form.lineName" />
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<InfoItem label="工艺描述" :value="form.remark" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="20" style="margin-top: 12px;">
|
||||
<el-col :span="6">
|
||||
<!-- <InfoItem label="创建人" value="xxse" /> -->
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<InfoItem label="创建时间" :value="form.createTime" />
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<!-- <InfoItem label="更新人" value="xxse" /> -->
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<!-- <InfoItem label="更新时间" value="2023-10-22 10:11:00" /> -->
|
||||
</el-col>
|
||||
</el-row>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
const InfoItem = {
|
||||
name: 'InfoItem',
|
||||
components: {},
|
||||
props: ['label', 'value'],
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
computed: {},
|
||||
methods: {},
|
||||
render: function (h) {
|
||||
return (
|
||||
<div style="display: flex; align-items: center; font-size: 14px; line-height: 1.5">
|
||||
<span style="width: 100px; text-align: left; font-weight: 700">{this.label}:</span>
|
||||
<span style="width: 200px; text-align: left; text-overflow: ellipse; white-space: nowrap">
|
||||
{this.value}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
},
|
||||
};
|
||||
|
||||
export default {
|
||||
name: 'ProcessInfo',
|
||||
components: { InfoItem },
|
||||
props: {},
|
||||
inject: ['getFlowId'],
|
||||
data() {
|
||||
return {
|
||||
infoUrl: '/extend/process-flow/get',
|
||||
searchBarFormConfig: [{ label: '工艺详情' }],
|
||||
form: {
|
||||
id: null,
|
||||
name: null,
|
||||
lineName: null,
|
||||
createTime: null,
|
||||
remark: null,
|
||||
enable: null,
|
||||
code: null
|
||||
},
|
||||
};
|
||||
},
|
||||
activated() {
|
||||
this.getInfo()
|
||||
},
|
||||
computed: {},
|
||||
methods: {
|
||||
// utils
|
||||
http(url, method, payload) {
|
||||
return this.$axios({
|
||||
url,
|
||||
method,
|
||||
params: method === 'get' ? payload : null,
|
||||
data: method !== 'get' ? payload : null,
|
||||
})
|
||||
},
|
||||
put(payload) {
|
||||
return this.http(this.updateUrl, 'put', payload);
|
||||
},
|
||||
post(payload) {
|
||||
return this.http(this.addUrl, 'post', payload);
|
||||
},
|
||||
recv(payload) {
|
||||
return this.http(this.pageUrl, 'get', payload);
|
||||
},
|
||||
info(payload) {
|
||||
return this.http(this.infoUrl, 'get', payload);
|
||||
},
|
||||
async getInfo() {
|
||||
const flowId = this.$route.params.id;
|
||||
if (!flowId) this.$router.go(-1);
|
||||
const { code, data } = await this.info({ id: flowId });
|
||||
// debugger;
|
||||
if (code == 0) {
|
||||
this.form = {
|
||||
...data
|
||||
};
|
||||
} else {
|
||||
this.$modal.msgError('工艺信息获取失败')
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.process-info {
|
||||
padding: 12px 20px 20px;
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
}
|
||||
</style>
|
||||
170
src/views/extend/processFlowView/components/ProcessNode.js
Normal file
170
src/views/extend/processFlowView/components/ProcessNode.js
Normal file
@ -0,0 +1,170 @@
|
||||
import { Node, ObjectExt, Shape } from '@antv/x6';
|
||||
import { IdToName } from '@/utils'
|
||||
import cache from '@/utils/cache'
|
||||
import axios from '@/utils/request'
|
||||
import { v4 } from 'uuid'
|
||||
|
||||
Shape.Edge.config({
|
||||
attrs: {
|
||||
line: {
|
||||
stroke: '#ccc',
|
||||
strokeWidth: 1,
|
||||
targetMarker: {
|
||||
name: 'block',
|
||||
width: 1,
|
||||
height: 1
|
||||
},
|
||||
},
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
export default class ProcessNode extends Node { }
|
||||
ProcessNode.config({
|
||||
width: 200,
|
||||
height: 100,
|
||||
markup: [
|
||||
{
|
||||
tagName: 'rect',
|
||||
selector: 'container',
|
||||
attrs: {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 200,
|
||||
height: 100,
|
||||
fill: 'transparent',
|
||||
stroke: '#ccc'
|
||||
},
|
||||
},
|
||||
{
|
||||
tagName: 'rect',
|
||||
attrs: {
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 200,
|
||||
height: 50,
|
||||
fill: '#ffffff',
|
||||
},
|
||||
},
|
||||
{
|
||||
tagName: 'rect',
|
||||
attrs: {
|
||||
x: 0,
|
||||
y: 50,
|
||||
width: 200,
|
||||
height: 50,
|
||||
fill: '#f8f8f8',
|
||||
},
|
||||
},
|
||||
{
|
||||
tagName: 'text',
|
||||
selector: 'detName',
|
||||
attrs: {
|
||||
x: 20,
|
||||
y: 30,
|
||||
},
|
||||
},
|
||||
{
|
||||
tagName: 'text',
|
||||
selector: 'sectionName',
|
||||
attrs: {
|
||||
x: 115,
|
||||
y: 30,
|
||||
},
|
||||
},
|
||||
{
|
||||
tagName: 'text',
|
||||
selector: 'detDesc',
|
||||
attrs: {
|
||||
x: 26,
|
||||
y: 80,
|
||||
fill: '#777',
|
||||
fontSize: 14,
|
||||
fill: '#1a90fc',
|
||||
},
|
||||
},
|
||||
],
|
||||
attrs: {
|
||||
line: {
|
||||
fill: 'red'
|
||||
}
|
||||
},
|
||||
ports: {
|
||||
groups: {
|
||||
in: {
|
||||
position: 'left',
|
||||
attrs: {
|
||||
circle: {
|
||||
r: 2,
|
||||
magnet: true,
|
||||
stroke: '#0b58ff',
|
||||
strokeWidth: 1,
|
||||
fill: '#0b58ff'
|
||||
}
|
||||
}
|
||||
},
|
||||
out: {
|
||||
position: 'right',
|
||||
attrs: {
|
||||
circle: {
|
||||
r: 2,
|
||||
magnet: true,
|
||||
stroke: '#0b58ff',
|
||||
strokeWidth: 1,
|
||||
fill: '#0b58ff'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
propHooks(metadata) {
|
||||
const { detId, detName, detDesc, sectionName, processId, sectionId, ...others } = metadata;
|
||||
// debugger;
|
||||
if (detName) ObjectExt.setByPath(others, 'attrs/detName/text', detName);
|
||||
if (detDesc) ObjectExt.setByPath(others, 'attrs/detDesc/text', detDesc);
|
||||
if (sectionName) ObjectExt.setByPath(others, 'attrs/sectionName/text', sectionName);
|
||||
if (detId) ObjectExt.setByPath(others, 'attrs/detId/text', detId);
|
||||
if (processId) ObjectExt.setByPath(others, 'attrs/processId/text', processId);
|
||||
if (sectionId) ObjectExt.setByPath(others, 'attrs/sectionId/text', sectionId);
|
||||
return others;
|
||||
}
|
||||
});
|
||||
|
||||
export const CACHE_NAME = 'ProcessDetail::section';
|
||||
|
||||
export async function getSectionFrom(sectionId) {
|
||||
const sectionList = await cache.getList(
|
||||
CACHE_NAME,
|
||||
async () => {
|
||||
const { code, data } = await axios(
|
||||
'/base/core-production-line/listAll'
|
||||
);
|
||||
if (code == 0) {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
);
|
||||
return IdToName(sectionId, sectionList);
|
||||
}
|
||||
|
||||
export async function createProcessNode({ flowId, id, name, sectionId, remark }) {
|
||||
const sectionName = await getSectionFrom(sectionId);
|
||||
return {
|
||||
shape: 'process-node',
|
||||
x: 0,
|
||||
y: 0,
|
||||
detName: name, // 工序名称
|
||||
sectionName, // 工段
|
||||
sectionId,
|
||||
detDesc: remark, // 工序说明
|
||||
processId: flowId, // 工艺ID
|
||||
detId: id, // 工序ID
|
||||
tools: [],
|
||||
ports: [
|
||||
{ id: v4(), group: 'in' },
|
||||
{ id: v4(), group: 'out' },
|
||||
]
|
||||
};
|
||||
}
|
||||
|
||||
export async function createEdge(src, dest) { }
|
||||
63
src/views/extend/processFlowView/index.vue
Normal file
63
src/views/extend/processFlowView/index.vue
Normal file
@ -0,0 +1,63 @@
|
||||
<!--
|
||||
filename: index.vue
|
||||
author: liubin
|
||||
date: 2023-10-18 12:25:46
|
||||
description:
|
||||
-->
|
||||
|
||||
<template>
|
||||
<div class="app-container process-flow-view">
|
||||
<ProcessInfo />
|
||||
<ProcessDetail style="margin-top: 16px" @det-selected="handleDetSelected" />
|
||||
<ProcessBomList style="margin-top: 16px" :current-det="currentDet" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import ProcessInfo from './components/ProcessInfo.vue';
|
||||
import ProcessBomList from './components/ProcessBomList.vue';
|
||||
import ProcessDetail from './components/ProcessDetail.vue';
|
||||
|
||||
export default {
|
||||
name: 'ProcessFlowView',
|
||||
components: { ProcessInfo, ProcessDetail, ProcessBomList },
|
||||
props: {},
|
||||
data() {
|
||||
return {
|
||||
flowId: null,
|
||||
currentDet: null
|
||||
};
|
||||
},
|
||||
provide() {
|
||||
const that = this;
|
||||
return {
|
||||
getFlowId() {
|
||||
return that.flowId;
|
||||
},
|
||||
};
|
||||
},
|
||||
activated() {
|
||||
console.log('activated...', this.$route.params);
|
||||
this.flowId = this.$route.params.id;
|
||||
},
|
||||
computed: {},
|
||||
methods: {
|
||||
handleDetSelected(det) {
|
||||
if (det != null) {
|
||||
this.currentDet = { ...det }
|
||||
}
|
||||
else this.currentDet = null;
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.process-flow-view {
|
||||
padding: 8px;
|
||||
flex: 1;
|
||||
background: #f2f4f9;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
</style>
|
||||
@ -117,6 +117,7 @@ export default {
|
||||
{
|
||||
_action: 'params-monitor',
|
||||
label: '操作',
|
||||
width: 56,
|
||||
subcomponent: {
|
||||
props: ['injectData'],
|
||||
render: function (h) {
|
||||
@ -124,10 +125,10 @@ export default {
|
||||
return h(
|
||||
'el-button',
|
||||
{
|
||||
class: 'iconfont icon-detail',
|
||||
props: { type: 'text' },
|
||||
on: {
|
||||
click: function () {
|
||||
console.log('inejctdata', _this.injectData);
|
||||
_this.$emit('emitData', {
|
||||
action: _this.injectData._action,
|
||||
// value: _this.injectData.id,
|
||||
@ -135,8 +136,8 @@ export default {
|
||||
});
|
||||
},
|
||||
},
|
||||
},
|
||||
'查看详情'
|
||||
}
|
||||
// '查看详情'
|
||||
);
|
||||
},
|
||||
},
|
||||
@ -215,7 +216,7 @@ export default {
|
||||
/** 根据产线获取设备 */
|
||||
async getEquipmentList(id) {
|
||||
const { data } = await this.$axios({
|
||||
url: '/base/equipment/listByLine',
|
||||
url: '/base/core-equipment/listByLine',
|
||||
method: 'get',
|
||||
params: { id },
|
||||
});
|
||||
|
||||
@ -64,6 +64,7 @@ export default {
|
||||
name: item.inspectionContent,
|
||||
type: 'bar',
|
||||
barCategoryGap: 12,
|
||||
barWidth: 20,
|
||||
data: [],
|
||||
};
|
||||
|
||||
|
||||
455
yarn.lock
455
yarn.lock
@ -19,6 +19,28 @@
|
||||
"@jridgewell/gen-mapping" "^0.3.0"
|
||||
"@jridgewell/trace-mapping" "^0.3.9"
|
||||
|
||||
"@antv/x6-common@^2.0.15":
|
||||
"integrity" "sha512-9ghYsxbT7WjQ0thqjcQwnjuBdL8DSTptEubf0DvBZOJ0wmapclXqYPOM+XYPNtC1dcKDqqxsw5mdcbcAmQ224Q=="
|
||||
"resolved" "https://registry.npmmirror.com/@antv/x6-common/-/x6-common-2.0.15.tgz"
|
||||
"version" "2.0.15"
|
||||
dependencies:
|
||||
"lodash-es" "^4.17.15"
|
||||
"utility-types" "^3.10.0"
|
||||
|
||||
"@antv/x6-geometry@^2.0.5":
|
||||
"integrity" "sha512-MId6riEQkxphBpVeTcL4ZNXL4lScyvDEPLyIafvWMcWNTGK0jgkK7N20XSzqt8ltJb0mGUso5s56mrk8ysHu2A=="
|
||||
"resolved" "https://registry.npmmirror.com/@antv/x6-geometry/-/x6-geometry-2.0.5.tgz"
|
||||
"version" "2.0.5"
|
||||
|
||||
"@antv/x6@^2.15.3":
|
||||
"integrity" "sha512-mI8Aqc/0+/ZlXguibnKovGkKy3w7UFg+CMwAq5oYdBrMEgwgvQ/Rw9tK2LOTgKAINv+5QQ9zJTY058Kv1UfeRA=="
|
||||
"resolved" "https://registry.npmmirror.com/@antv/x6/-/x6-2.15.3.tgz"
|
||||
"version" "2.15.3"
|
||||
dependencies:
|
||||
"@antv/x6-common" "^2.0.15"
|
||||
"@antv/x6-geometry" "^2.0.5"
|
||||
"utility-types" "^3.10.0"
|
||||
|
||||
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5":
|
||||
"integrity" "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ=="
|
||||
"resolved" "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz"
|
||||
@ -1979,21 +2001,16 @@
|
||||
"resolved" "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz"
|
||||
"version" "7.2.0"
|
||||
|
||||
"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^6.4.1":
|
||||
"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^7.1.1", "acorn@^7.4.0":
|
||||
"integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
|
||||
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
|
||||
"version" "7.4.1"
|
||||
|
||||
"acorn@^6.4.1":
|
||||
"integrity" "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="
|
||||
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-6.4.2.tgz"
|
||||
"version" "6.4.2"
|
||||
|
||||
"acorn@^7.1.1":
|
||||
"integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
|
||||
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
|
||||
"version" "7.4.1"
|
||||
|
||||
"acorn@^7.4.0":
|
||||
"integrity" "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
|
||||
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz"
|
||||
"version" "7.4.1"
|
||||
|
||||
"acorn@^8.8.2":
|
||||
"integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
|
||||
"resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
|
||||
@ -2014,7 +2031,7 @@
|
||||
"resolved" "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
|
||||
"version" "1.3.1"
|
||||
|
||||
"aes-decrypter@^4.0.1":
|
||||
"aes-decrypter@^4.0.1", "aes-decrypter@4.0.1":
|
||||
"integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
|
||||
"resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
|
||||
"version" "4.0.1"
|
||||
@ -2041,16 +2058,6 @@
|
||||
"global" "^4.4.0"
|
||||
"pkcs7" "^1.0.4"
|
||||
|
||||
"aes-decrypter@4.0.1":
|
||||
"integrity" "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg=="
|
||||
"resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-4.0.1.tgz"
|
||||
"version" "4.0.1"
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@videojs/vhs-utils" "^3.0.5"
|
||||
"global" "^4.4.0"
|
||||
"pkcs7" "^1.0.4"
|
||||
|
||||
"aggregate-error@^3.0.0":
|
||||
"integrity" "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="
|
||||
"resolved" "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
|
||||
@ -2089,11 +2096,6 @@
|
||||
"resolved" "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-3.2.4.tgz"
|
||||
"version" "3.2.4"
|
||||
|
||||
"ansi-colors@^4.1.1":
|
||||
"integrity" "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.3.tgz"
|
||||
"version" "4.1.3"
|
||||
|
||||
"ansi-escapes@^4.2.1", "ansi-escapes@^4.3.0":
|
||||
"integrity" "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
|
||||
@ -2131,21 +2133,28 @@
|
||||
"resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-2.2.1.tgz"
|
||||
"version" "2.2.1"
|
||||
|
||||
"ansi-styles@^3.1.0", "ansi-styles@^3.2.0", "ansi-styles@^3.2.1":
|
||||
"ansi-styles@^3.1.0":
|
||||
"integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
|
||||
"version" "3.2.1"
|
||||
dependencies:
|
||||
"color-convert" "^1.9.0"
|
||||
|
||||
"ansi-styles@^4.0.0":
|
||||
"integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
|
||||
"version" "4.3.0"
|
||||
"ansi-styles@^3.2.0":
|
||||
"integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
|
||||
"version" "3.2.1"
|
||||
dependencies:
|
||||
"color-convert" "^2.0.1"
|
||||
"color-convert" "^1.9.0"
|
||||
|
||||
"ansi-styles@^4.1.0":
|
||||
"ansi-styles@^3.2.1":
|
||||
"integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
|
||||
"version" "3.2.1"
|
||||
dependencies:
|
||||
"color-convert" "^1.9.0"
|
||||
|
||||
"ansi-styles@^4.0.0", "ansi-styles@^4.1.0":
|
||||
"integrity" "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
|
||||
"resolved" "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz"
|
||||
"version" "4.3.0"
|
||||
@ -2834,7 +2843,28 @@
|
||||
"resolved" "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz"
|
||||
"version" "3.1.2"
|
||||
|
||||
"cacache@^12.0.2", "cacache@^12.0.3":
|
||||
"cacache@^12.0.2":
|
||||
"integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
|
||||
"resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
|
||||
"version" "12.0.4"
|
||||
dependencies:
|
||||
"bluebird" "^3.5.5"
|
||||
"chownr" "^1.1.1"
|
||||
"figgy-pudding" "^3.5.1"
|
||||
"glob" "^7.1.4"
|
||||
"graceful-fs" "^4.1.15"
|
||||
"infer-owner" "^1.0.3"
|
||||
"lru-cache" "^5.1.1"
|
||||
"mississippi" "^3.0.0"
|
||||
"mkdirp" "^0.5.1"
|
||||
"move-concurrently" "^1.0.1"
|
||||
"promise-inflight" "^1.0.1"
|
||||
"rimraf" "^2.6.3"
|
||||
"ssri" "^6.0.1"
|
||||
"unique-filename" "^1.1.1"
|
||||
"y18n" "^4.0.0"
|
||||
|
||||
"cacache@^12.0.3":
|
||||
"integrity" "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="
|
||||
"resolved" "https://registry.npmmirror.com/cacache/-/cacache-12.0.4.tgz"
|
||||
"version" "12.0.4"
|
||||
@ -3327,7 +3357,14 @@
|
||||
"map-visit" "^1.0.0"
|
||||
"object-visit" "^1.0.0"
|
||||
|
||||
"color-convert@^1.9.0", "color-convert@^1.9.3":
|
||||
"color-convert@^1.9.0":
|
||||
"integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
|
||||
"resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
|
||||
"version" "1.9.3"
|
||||
dependencies:
|
||||
"color-name" "1.1.3"
|
||||
|
||||
"color-convert@^1.9.3":
|
||||
"integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
|
||||
"resolved" "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz"
|
||||
"version" "1.9.3"
|
||||
@ -3341,16 +3378,16 @@
|
||||
dependencies:
|
||||
"color-name" "~1.1.4"
|
||||
|
||||
"color-name@^1.0.0", "color-name@1.1.3":
|
||||
"integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
|
||||
"resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
|
||||
"version" "1.1.3"
|
||||
|
||||
"color-name@~1.1.4":
|
||||
"color-name@^1.0.0", "color-name@~1.1.4":
|
||||
"integrity" "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
|
||||
"resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz"
|
||||
"version" "1.1.4"
|
||||
|
||||
"color-name@1.1.3":
|
||||
"integrity" "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
|
||||
"resolved" "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz"
|
||||
"version" "1.1.3"
|
||||
|
||||
"color-string@^1.6.0":
|
||||
"integrity" "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="
|
||||
"resolved" "https://registry.npmmirror.com/color-string/-/color-string-1.9.1.tgz"
|
||||
@ -3379,7 +3416,22 @@
|
||||
dependencies:
|
||||
"delayed-stream" "~1.0.0"
|
||||
|
||||
"commander@*", "commander@^2.18.0", "commander@^2.19.0", "commander@^2.20.0":
|
||||
"commander@*", "commander@2.17.x":
|
||||
"integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
|
||||
"resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
|
||||
"version" "2.17.1"
|
||||
|
||||
"commander@^2.18.0":
|
||||
"integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
|
||||
"resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
|
||||
"version" "2.20.3"
|
||||
|
||||
"commander@^2.19.0":
|
||||
"integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
|
||||
"resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
|
||||
"version" "2.20.3"
|
||||
|
||||
"commander@^2.20.0":
|
||||
"integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
|
||||
"resolved" "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz"
|
||||
"version" "2.20.3"
|
||||
@ -3394,11 +3446,6 @@
|
||||
"resolved" "https://registry.npmmirror.com/commander/-/commander-2.19.0.tgz"
|
||||
"version" "2.19.0"
|
||||
|
||||
"commander@2.17.x":
|
||||
"integrity" "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
|
||||
"resolved" "https://registry.npmmirror.com/commander/-/commander-2.17.1.tgz"
|
||||
"version" "2.17.1"
|
||||
|
||||
"commondir@^1.0.1":
|
||||
"integrity" "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
|
||||
"resolved" "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz"
|
||||
@ -4285,7 +4332,7 @@
|
||||
"resolved" "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
|
||||
"version" "1.0.8"
|
||||
|
||||
"domutils@^1.5.1", "domutils@^1.7.0":
|
||||
"domutils@^1.5.1":
|
||||
"integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
|
||||
"resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
|
||||
"version" "1.7.0"
|
||||
@ -4293,16 +4340,15 @@
|
||||
"dom-serializer" "0"
|
||||
"domelementtype" "1"
|
||||
|
||||
"domutils@^2.5.2":
|
||||
"integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
|
||||
"resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
|
||||
"version" "2.8.0"
|
||||
"domutils@^1.7.0":
|
||||
"integrity" "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="
|
||||
"resolved" "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz"
|
||||
"version" "1.7.0"
|
||||
dependencies:
|
||||
"dom-serializer" "^1.0.1"
|
||||
"domelementtype" "^2.2.0"
|
||||
"domhandler" "^4.2.0"
|
||||
"dom-serializer" "0"
|
||||
"domelementtype" "1"
|
||||
|
||||
"domutils@^2.8.0":
|
||||
"domutils@^2.5.2", "domutils@^2.8.0":
|
||||
"integrity" "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="
|
||||
"resolved" "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz"
|
||||
"version" "2.8.0"
|
||||
@ -4486,14 +4532,6 @@
|
||||
"memory-fs" "^0.5.0"
|
||||
"tapable" "^1.0.0"
|
||||
|
||||
"enquirer@>= 2.3.0 < 3":
|
||||
"integrity" "sha512-ehu97t6FTYK2I3ZYtnp0BZ9vt0mvEL/cnHBds7Ct6jo9VX1VIkiFhOvVRWh6eblQqd7KOoICIQV+syZ3neXO/Q=="
|
||||
"resolved" "https://registry.npmmirror.com/enquirer/-/enquirer-2.4.0.tgz"
|
||||
"version" "2.4.0"
|
||||
dependencies:
|
||||
"ansi-colors" "^4.1.1"
|
||||
"strip-ansi" "^6.0.1"
|
||||
|
||||
"entities@^1.1.1":
|
||||
"integrity" "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
|
||||
"resolved" "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz"
|
||||
@ -4525,7 +4563,7 @@
|
||||
dependencies:
|
||||
"stackframe" "^1.3.4"
|
||||
|
||||
"es-abstract@^1.17.2", "es-abstract@^1.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
|
||||
"es-abstract@^1.19.0", "es-abstract@^1.20.4", "es-abstract@^1.21.2":
|
||||
"integrity" "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="
|
||||
"resolved" "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.22.1.tgz"
|
||||
"version" "1.22.1"
|
||||
@ -5131,6 +5169,11 @@
|
||||
"resolved" "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
|
||||
"version" "2.0.5"
|
||||
|
||||
"file-uri-to-path@1.0.0":
|
||||
"integrity" "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
|
||||
"resolved" "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
|
||||
"filesize@^3.6.1":
|
||||
"integrity" "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
|
||||
"resolved" "https://registry.npmmirror.com/filesize/-/filesize-3.6.1.tgz"
|
||||
@ -5473,7 +5516,14 @@
|
||||
"is-glob" "^3.1.0"
|
||||
"path-dirname" "^1.0.0"
|
||||
|
||||
"glob-parent@^5.0.0", "glob-parent@~5.1.2":
|
||||
"glob-parent@^5.0.0":
|
||||
"integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
|
||||
"resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
|
||||
"version" "5.1.2"
|
||||
dependencies:
|
||||
"is-glob" "^4.0.1"
|
||||
|
||||
"glob-parent@~5.1.2":
|
||||
"integrity" "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="
|
||||
"resolved" "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz"
|
||||
"version" "5.1.2"
|
||||
@ -5676,7 +5726,7 @@
|
||||
"resolved" "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"has-symbols@^1.0.1", "has-symbols@^1.0.2", "has-symbols@^1.0.3":
|
||||
"has-symbols@^1.0.2", "has-symbols@^1.0.3":
|
||||
"integrity" "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
|
||||
"resolved" "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz"
|
||||
"version" "1.0.3"
|
||||
@ -6315,16 +6365,7 @@
|
||||
"is-data-descriptor" "^0.1.4"
|
||||
"kind-of" "^5.0.0"
|
||||
|
||||
"is-descriptor@^1.0.0":
|
||||
"integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
|
||||
"resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
|
||||
"version" "1.0.2"
|
||||
dependencies:
|
||||
"is-accessor-descriptor" "^1.0.0"
|
||||
"is-data-descriptor" "^1.0.0"
|
||||
"kind-of" "^6.0.2"
|
||||
|
||||
"is-descriptor@^1.0.2":
|
||||
"is-descriptor@^1.0.0", "is-descriptor@^1.0.2":
|
||||
"integrity" "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
|
||||
"resolved" "https://registry.npmmirror.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
|
||||
"version" "1.0.2"
|
||||
@ -6348,6 +6389,11 @@
|
||||
"resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
|
||||
"version" "0.1.1"
|
||||
|
||||
"is-extendable@^0.1.1":
|
||||
"integrity" "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
|
||||
"resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-0.1.1.tgz"
|
||||
"version" "0.1.1"
|
||||
|
||||
"is-extendable@^1.0.1":
|
||||
"integrity" "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
|
||||
"resolved" "https://registry.npmmirror.com/is-extendable/-/is-extendable-1.0.1.tgz"
|
||||
@ -6549,7 +6595,7 @@
|
||||
dependencies:
|
||||
"is-docker" "^2.0.0"
|
||||
|
||||
"isarray@^1.0.0", "isarray@~1.0.0", "isarray@1.0.0":
|
||||
"isarray@^1.0.0":
|
||||
"integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
|
||||
"resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
@ -6559,6 +6605,16 @@
|
||||
"resolved" "https://registry.npmmirror.com/isarray/-/isarray-2.0.5.tgz"
|
||||
"version" "2.0.5"
|
||||
|
||||
"isarray@~1.0.0":
|
||||
"integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
|
||||
"resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
|
||||
"isarray@1.0.0":
|
||||
"integrity" "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
|
||||
"resolved" "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
|
||||
"isexe@^2.0.0":
|
||||
"integrity" "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
|
||||
"resolved" "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz"
|
||||
@ -6767,14 +6823,7 @@
|
||||
"resolved" "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"kind-of@^3.0.2":
|
||||
"integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
|
||||
"resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
|
||||
"version" "3.2.2"
|
||||
dependencies:
|
||||
"is-buffer" "^1.1.5"
|
||||
|
||||
"kind-of@^3.0.3":
|
||||
"kind-of@^3.0.2", "kind-of@^3.0.3":
|
||||
"integrity" "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
|
||||
"resolved" "https://registry.npmmirror.com/kind-of/-/kind-of-3.2.2.tgz"
|
||||
"version" "3.2.2"
|
||||
@ -6956,6 +7005,11 @@
|
||||
dependencies:
|
||||
"p-locate" "^4.1.0"
|
||||
|
||||
"lodash-es@^4.17.15":
|
||||
"integrity" "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
|
||||
"resolved" "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz"
|
||||
"version" "4.17.21"
|
||||
|
||||
"lodash.debounce@^4.0.8":
|
||||
"integrity" "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
|
||||
"resolved" "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
|
||||
@ -7033,7 +7087,23 @@
|
||||
"resolved" "https://registry.npmmirror.com/lower-case/-/lower-case-1.1.4.tgz"
|
||||
"version" "1.1.4"
|
||||
|
||||
"lru-cache@^4.0.1", "lru-cache@^4.1.2", "lru-cache@^4.1.5":
|
||||
"lru-cache@^4.0.1":
|
||||
"integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
|
||||
"resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
|
||||
"version" "4.1.5"
|
||||
dependencies:
|
||||
"pseudomap" "^1.0.2"
|
||||
"yallist" "^2.1.2"
|
||||
|
||||
"lru-cache@^4.1.2":
|
||||
"integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
|
||||
"resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
|
||||
"version" "4.1.5"
|
||||
dependencies:
|
||||
"pseudomap" "^1.0.2"
|
||||
"yallist" "^2.1.2"
|
||||
|
||||
"lru-cache@^4.1.5":
|
||||
"integrity" "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="
|
||||
"resolved" "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz"
|
||||
"version" "4.1.5"
|
||||
@ -7352,18 +7422,7 @@
|
||||
"component-query" "^0.0.3"
|
||||
"domify" "^1.3.1"
|
||||
|
||||
"min-dom@^3.1.0":
|
||||
"integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
|
||||
"resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
|
||||
"version" "3.2.1"
|
||||
dependencies:
|
||||
"component-event" "^0.1.4"
|
||||
"domify" "^1.3.1"
|
||||
"indexof" "0.0.1"
|
||||
"matches-selector" "^1.2.0"
|
||||
"min-dash" "^3.8.1"
|
||||
|
||||
"min-dom@^3.1.3":
|
||||
"min-dom@^3.1.0", "min-dom@^3.1.3":
|
||||
"integrity" "sha512-v6YCmnDzxk4rRJntWTUiwggLupPw/8ZSRqUq0PDaBwVZEO/wYzCH4SKVBV+KkEvf3u0XaWHly5JEosPtqRATZA=="
|
||||
"resolved" "https://registry.npmmirror.com/min-dom/-/min-dom-3.2.1.tgz"
|
||||
"version" "3.2.1"
|
||||
@ -7490,38 +7549,22 @@
|
||||
"for-in" "^1.0.2"
|
||||
"is-extendable" "^1.0.1"
|
||||
|
||||
"mkdirp@^0.5.1":
|
||||
"mkdirp@^0.5.1", "mkdirp@^0.5.3", "mkdirp@^0.5.6", "mkdirp@~0.5.1":
|
||||
"integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
|
||||
"resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
|
||||
"version" "0.5.6"
|
||||
dependencies:
|
||||
"minimist" "^1.2.6"
|
||||
|
||||
"mkdirp@^0.5.3":
|
||||
"integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
|
||||
"resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
|
||||
"version" "0.5.6"
|
||||
dependencies:
|
||||
"minimist" "^1.2.6"
|
||||
|
||||
"mkdirp@^0.5.6":
|
||||
"integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
|
||||
"resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
|
||||
"version" "0.5.6"
|
||||
dependencies:
|
||||
"minimist" "^1.2.6"
|
||||
|
||||
"mkdirp@^1.0.3", "mkdirp@^1.0.4":
|
||||
"mkdirp@^1.0.3":
|
||||
"integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
|
||||
"resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
|
||||
"version" "1.0.4"
|
||||
|
||||
"mkdirp@~0.5.1":
|
||||
"integrity" "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="
|
||||
"resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz"
|
||||
"version" "0.5.6"
|
||||
dependencies:
|
||||
"minimist" "^1.2.6"
|
||||
"mkdirp@^1.0.4":
|
||||
"integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
|
||||
"resolved" "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz"
|
||||
"version" "1.0.4"
|
||||
|
||||
"mockjs@^1.1.0":
|
||||
"integrity" "sha512-eQsKcWzIaZzEZ07NuEyO4Nw65g0hdWAyurVol1IPl1gahRwY+svqzfgfey8U8dahLwG44d6/RwEzuK52rSa/JQ=="
|
||||
@ -7924,7 +7967,7 @@
|
||||
"define-properties" "^1.1.4"
|
||||
"es-abstract" "^1.20.4"
|
||||
|
||||
"object.getownpropertydescriptors@^2.0.3", "object.getownpropertydescriptors@^2.1.0":
|
||||
"object.getownpropertydescriptors@^2.0.3":
|
||||
"integrity" "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="
|
||||
"resolved" "https://registry.npmmirror.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"
|
||||
"version" "2.1.6"
|
||||
@ -7994,14 +8037,7 @@
|
||||
dependencies:
|
||||
"mimic-fn" "^1.0.0"
|
||||
|
||||
"onetime@^5.1.0":
|
||||
"integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
|
||||
"resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
|
||||
"version" "5.1.2"
|
||||
dependencies:
|
||||
"mimic-fn" "^2.1.0"
|
||||
|
||||
"onetime@^5.1.2":
|
||||
"onetime@^5.1.0", "onetime@^5.1.2":
|
||||
"integrity" "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="
|
||||
"resolved" "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz"
|
||||
"version" "5.1.2"
|
||||
@ -8742,7 +8778,7 @@
|
||||
"source-map" "^0.5.6"
|
||||
"supports-color" "^3.2.3"
|
||||
|
||||
"postcss@^7.0.0":
|
||||
"postcss@^7.0.0", "postcss@^7.0.1", "postcss@^7.0.14", "postcss@^7.0.27", "postcss@^7.0.32", "postcss@^7.0.36", "postcss@^7.0.5", "postcss@^7.0.6", "postcss@>4 <9":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
@ -8750,63 +8786,16 @@
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^7.0.1":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
"postcss@^8.1.10":
|
||||
"integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
|
||||
"version" "8.4.27"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
"nanoid" "^3.3.6"
|
||||
"picocolors" "^1.0.0"
|
||||
"source-map-js" "^1.0.2"
|
||||
|
||||
"postcss@^7.0.14":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^7.0.27":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^7.0.32":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^7.0.36":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^7.0.5":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^7.0.6":
|
||||
"integrity" "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz"
|
||||
"version" "7.0.39"
|
||||
dependencies:
|
||||
"picocolors" "^0.2.1"
|
||||
"source-map" "^0.6.1"
|
||||
|
||||
"postcss@^8.1.10", "postcss@^8.4.14", "postcss@>4 <9":
|
||||
"postcss@^8.4.14":
|
||||
"integrity" "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ=="
|
||||
"resolved" "https://registry.npmmirror.com/postcss/-/postcss-8.4.27.tgz"
|
||||
"version" "8.4.27"
|
||||
@ -9388,7 +9377,21 @@
|
||||
"resolved" "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
|
||||
"rimraf@^2.5.4", "rimraf@^2.6.1", "rimraf@^2.6.3":
|
||||
"rimraf@^2.5.4":
|
||||
"integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
|
||||
"resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
|
||||
"version" "2.7.1"
|
||||
dependencies:
|
||||
"glob" "^7.1.3"
|
||||
|
||||
"rimraf@^2.6.1":
|
||||
"integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
|
||||
"resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
|
||||
"version" "2.7.1"
|
||||
dependencies:
|
||||
"glob" "^7.1.3"
|
||||
|
||||
"rimraf@^2.6.3":
|
||||
"integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
|
||||
"resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
|
||||
"version" "2.7.1"
|
||||
@ -9616,32 +9619,17 @@
|
||||
dependencies:
|
||||
"node-forge" "^0.10.0"
|
||||
|
||||
"semver@^5.5.0", "semver@^5.6.0", "semver@2 || 3 || 4 || 5":
|
||||
"semver@^5.5.0":
|
||||
"integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
|
||||
"version" "5.7.2"
|
||||
|
||||
"semver@^6.0.0":
|
||||
"integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
|
||||
"version" "6.3.1"
|
||||
"semver@^5.6.0":
|
||||
"integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
|
||||
"version" "5.7.2"
|
||||
|
||||
"semver@^6.1.0":
|
||||
"integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
|
||||
"version" "6.3.1"
|
||||
|
||||
"semver@^6.1.2":
|
||||
"integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
|
||||
"version" "6.3.1"
|
||||
|
||||
"semver@^6.3.0":
|
||||
"integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
|
||||
"version" "6.3.1"
|
||||
|
||||
"semver@^6.3.1":
|
||||
"semver@^6.0.0", "semver@^6.1.0", "semver@^6.1.2", "semver@^6.3.0", "semver@^6.3.1":
|
||||
"integrity" "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz"
|
||||
"version" "6.3.1"
|
||||
@ -9667,6 +9655,11 @@
|
||||
dependencies:
|
||||
"lru-cache" "^6.0.0"
|
||||
|
||||
"semver@2 || 3 || 4 || 5":
|
||||
"integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
|
||||
"resolved" "https://registry.npmmirror.com/semver/-/semver-5.7.2.tgz"
|
||||
"version" "5.7.2"
|
||||
|
||||
"send@0.18.0":
|
||||
"integrity" "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="
|
||||
"resolved" "https://registry.npmmirror.com/send/-/send-0.18.0.tgz"
|
||||
@ -10344,14 +10337,7 @@
|
||||
dependencies:
|
||||
"has-flag" "^3.0.0"
|
||||
|
||||
"supports-color@^7.0.0":
|
||||
"integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
|
||||
"resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
|
||||
"version" "7.2.0"
|
||||
dependencies:
|
||||
"has-flag" "^4.0.0"
|
||||
|
||||
"supports-color@^7.1.0":
|
||||
"supports-color@^7.0.0", "supports-color@^7.1.0":
|
||||
"integrity" "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
|
||||
"resolved" "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz"
|
||||
"version" "7.2.0"
|
||||
@ -11004,17 +10990,7 @@
|
||||
"resolved" "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
|
||||
"version" "1.0.2"
|
||||
|
||||
"util.promisify@~1.0.0":
|
||||
"integrity" "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="
|
||||
"resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.1.tgz"
|
||||
"version" "1.0.1"
|
||||
dependencies:
|
||||
"define-properties" "^1.1.3"
|
||||
"es-abstract" "^1.17.2"
|
||||
"has-symbols" "^1.0.1"
|
||||
"object.getownpropertydescriptors" "^2.1.0"
|
||||
|
||||
"util.promisify@1.0.0":
|
||||
"util.promisify@~1.0.0", "util.promisify@1.0.0":
|
||||
"integrity" "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="
|
||||
"resolved" "https://registry.npmmirror.com/util.promisify/-/util.promisify-1.0.0.tgz"
|
||||
"version" "1.0.0"
|
||||
@ -11041,6 +11017,11 @@
|
||||
"resolved" "https://registry.npmmirror.com/utila/-/utila-0.4.0.tgz"
|
||||
"version" "0.4.0"
|
||||
|
||||
"utility-types@^3.10.0":
|
||||
"integrity" "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="
|
||||
"resolved" "https://registry.npmmirror.com/utility-types/-/utility-types-3.10.0.tgz"
|
||||
"version" "3.10.0"
|
||||
|
||||
"utils-merge@1.0.1":
|
||||
"integrity" "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
|
||||
"resolved" "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz"
|
||||
@ -11063,6 +11044,11 @@
|
||||
"resolved" "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz"
|
||||
"version" "8.3.2"
|
||||
|
||||
"uuid@^9.0.1":
|
||||
"integrity" "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="
|
||||
"resolved" "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz"
|
||||
"version" "9.0.1"
|
||||
|
||||
"v8-compile-cache@^2.0.3":
|
||||
"integrity" "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
|
||||
"resolved" "https://registry.npmmirror.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
|
||||
@ -11322,7 +11308,7 @@
|
||||
dependencies:
|
||||
"deepmerge" "^4.2.2"
|
||||
|
||||
"vue-plugin-hiprint@^0.0.54-fix":
|
||||
"vue-plugin-hiprint@0.0.54-fix":
|
||||
"integrity" "sha512-WVUQdTIsxixS1VFr5nNIa0Hztrb9szJgS3z4MPUvu9gdqdu32lU3Jhux8QBTeVYrjIfNGuiNKNn5WUb+A5RK5Q=="
|
||||
"resolved" "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.54-fix.tgz"
|
||||
"version" "0.0.54-fix"
|
||||
@ -11530,7 +11516,7 @@
|
||||
"source-list-map" "^2.0.0"
|
||||
"source-map" "~0.6.1"
|
||||
|
||||
"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
|
||||
"webpack@^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.36.0 || ^5.0.0", "webpack@^4.4.0", "webpack@>=2", "webpack@>=2.0.0 <5.0.0", "webpack@>=4.0.0":
|
||||
"integrity" "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="
|
||||
"resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.46.0.tgz"
|
||||
"version" "4.46.0"
|
||||
@ -11680,7 +11666,14 @@
|
||||
dependencies:
|
||||
"mkdirp" "^0.5.1"
|
||||
|
||||
"ws@^6.0.0", "ws@^6.2.1":
|
||||
"ws@^6.0.0":
|
||||
"integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
|
||||
"resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
|
||||
"version" "6.2.2"
|
||||
dependencies:
|
||||
"async-limiter" "~1.0.0"
|
||||
|
||||
"ws@^6.2.1":
|
||||
"integrity" "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="
|
||||
"resolved" "https://registry.npmmirror.com/ws/-/ws-6.2.2.tgz"
|
||||
"version" "6.2.2"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user