update ui

.env.dev

@@ -12,10 +12,7 @@ ENV = 'development'
 VUE_APP_TITLE = 产线监控系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.1.49:48080'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
-# VUE_APP_BASE_API = 'http://192.168.1.8:48080'
-VUE_APP_BASE_API = 'http://192.168.0.33:48080'
-# VUE_APP_BASE_API = 'http://192.168.1.188:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/base/equipment.js

@@ -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'
   })
 }

src/api/base/equipmentType.js

@@ -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'

src/assets/icons/svg/icon-upload.svg

@@ -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>

src/components/DialogForm/index.vue

@@ -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>
@@ -132,7 +136,6 @@ const uploadedFile = {
 	},
 	methods: {
 		handleDelete() {
-			console.log('emit delete event')
 			this.$emit('delete', this.file);
 		},
 	},
@@ -219,7 +222,6 @@ export default {
 	watch: {
 		rows: {
 			handler() {
-				console.log('watch triggered!');
 				this.$nextTick(() => {
 					this.handleOptions('watch');
 				});
@@ -230,6 +232,7 @@ export default {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
+				this.form.files = this.form.files ?? [];
 			},
 			deep: true,
 			immediate: true,
@@ -367,7 +370,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);
 		},
 	},

src/router/index.js

@@ -72,15 +72,15 @@ export const constantRoutes = [
   {
     path: '/',
     component: Layout,
-    redirect: 'core/base/factory',
+    // redirect: 'core/base/factory',
-    // children: [{
+    children: [{
-    //   path: 'index',
+      path: 'index',
-    //   redirect: 'core/base/factory',
+      // redirect: 'core/base/factory',
-    //   component: (resolve) => require(['@/views/index'], resolve),
+      component: (resolve) => require(['@/views/index'], resolve),
-    //   name: '首页',
+      name: '首页',
-    //   meta: { title: '首页', icon: 'dashboard', affix: true }
+      meta: { title: '首页', icon: 'dashboard', affix: true }
-    // }
+    }
-    // ]
+    ]
   },
   {
     path: '/user',

src/views/base/equipmentBindGroup/index.vue

@@ -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',
 					},
 				],
 			],

src/views/base/equipmentBindSection/dialogForm.vue

@@ -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,

src/views/base/equipmentBindSection/index.vue

@@ -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' }],
 					},

src/views/base/equipmentGroup/index.vue

@@ -192,7 +192,7 @@ export default {
 						input: true,
 						label: '设备分组编码',
 						prop: 'code',
-						// url: '/base/equipment/getCode',
+						// url: '/base/core-equipment/getCode',
 					}
 				]
 			],

src/views/base/equipmentPlcConnect/index.vue

@@ -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;

src/views/core/base/equipment/components/AssetsUpload.vue

@@ -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-template-columns: repeat(auto-fill, 188px);
-	grid-auto-rows: 128px;
+	grid-auto-rows: 152px;
-	gap: 24px 18px;
+	gap: 48px 24px;
-	place-content: center;
+	overflow: hidden;
 }
 
 .file-list__item {
+	height: 128px;
 	background-color: #fff;
 	border: 1px dashed #d9d9d9;
 	border-radius: 6px;

src/views/core/base/equipment/components/EquipmentAssets.vue

@@ -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>

src/views/core/base/equipment/components/EquipmentInfoForm.vue

@@ -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) {

src/views/core/base/equipment/components/EquipmentPics.vue

@@ -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>

src/views/core/base/equipment/index.vue

@@ -60,9 +60,9 @@
 					name: '基本信息',
 					key: 'base',
 					rows: computedRows,
-					url: '/base/equipment/get',
+					url: '/base/core-equipment/get',
-					urlUpdate: '/base/equipment/update',
+					urlUpdate: '/base/core-equipment/update',
-					urlCreate: '/base/equipment/create',
+					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,
 						},

src/views/core/base/equipmentType/index.vue

@@ -139,7 +139,7 @@ export default {
 						input: true,
 						label: '设备类型编码',
 						prop: 'code',
-						url: '/base/equipment-type/getCode',
+						url: '/base/core-equipment-type/getCode',
 					},
 				],
 				[
@@ -147,7 +147,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 +207,6 @@ export default {
 				name: undefined,
 				parentId: undefined,
 				remark: undefined,
-				fileNames: [],
-				fileUrls: [],
 			};
 			this.resetForm('form');
 		},

src/views/equipment/timing-diagram/output/index.vue

@@ -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) {

src/views/equipment/timing-diagram/status/index.vue

@@ -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) {

src/views/monitoring/equipmentStatusAndParams/index.vue

@@ -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 },
 			});

src/views/quality/monitoring/qualityStatistics/graphPage.vue

@@ -64,6 +64,7 @@ export default {
 				name: item.inspectionContent,
 				type: 'bar',
 				barCategoryGap: 12,
+				barWidth: 20,
 				data: [],
 			};