From 03ee550527f34882a3cd161b08e33acda1aa06f4 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期三, 20 三月 2024 15:39:37 +0800
Subject: [PATCH] 将Mysql升级到8.0，修改application.xml
---
web/src/views/modules/basicInfo/XhProductModel.vue | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 35a464b..b1b8929 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -8,7 +8,7 @@
</el-col>
<el-col :span="19">
<div class="mod-basicInfo-xhProductModel}">
- <zt-table-wraper ref="tableObj" query-url="/basicInfo/XhProductModel/page"
+ <zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/XhProductModel/page"
delete-url="/basicInfo/XhProductModel/ "
:paging='false'
v-slot="{ table }">
@@ -28,22 +28,9 @@
>
<el-table-column prop="name" label="鍚嶇О"/>
<zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
- <el-table-column prop="operationalStatus" label="杩愯鐘舵�佸浘" align="center">
+ <el-table-column prop="operatImg" label="杩愯鍥剧墖" align="center">
<template v-slot="{ row }">
- <el-image v-if="row.operationalStatus" :src="getPath(row.operationalStatus)"
- style="height: 50px;width: 50px"></el-image>
- </template>
- </el-table-column>
- <el-table-column prop="standbyState" label="寰呮満鐘舵�佸浘" align="center">
- <template v-slot="{ row }">
- <el-image v-if="row.standbyState" :src="getPath(row.standbyState)"
- style="height: 50px;width: 50px"></el-image>
- </template>
- </el-table-column>
- <el-table-column prop="faultState" label="鏁呴殰鐘舵�佸浘" align="center">
- <template v-slot="{ row }">
- <el-image v-if="row.faultState" :src="getPath(row.faultState)"
- style="height: 50px;width: 50px"></el-image>
+ <el-image v-if="row.operatImg" :src="url+row.operatImg" style="height: 50px;width: 50px"></el-image>
</template>
</el-table-column>
<el-table-column prop="sort" label="鎺掑簭"/>
@@ -63,13 +50,15 @@
import AddOrUpdate from './XhProductModel-AddOrUpdate'
import SelectTyModel from './SelectTyModel'
import ProductModelTree from "./ProductModelTree";
+ import Cookies from "js-cookie";
export default {
data() {
return {
+ url: `${window.SITE_CONFIG['apiURL']}/sysPictureBase/getProductImg?token=${Cookies.get('token')}&id=`,
+ productType: '',
dataForm: {
name: '',
- productType: '',
type:'',
pid: '',
srcId:'',
@@ -83,11 +72,12 @@
},
methods: {
add() {
- if (this.dataForm.type !== '4') {
+ this.dataForm.type=this.productType
+ if (this.dataForm.type !== '3') {
console.log(1111)
console.log(this.dataForm.type,'add() {')
this.dataForm.type = this.dataForm.type - 1
- } else if (this.dataForm.type === '4') {
+ } else if (this.dataForm.type === '3') {
console.log(2222)
console.log(this.dataForm.type,'add() {')
this.dataForm.type = this.dataForm.type - 2
@@ -111,6 +101,7 @@
console.log(data)
this.dataForm.pid = data.id
this.dataForm.type = data.productType
+ this.productType = data.productType
this.$refs.tableObj.query()
}
}
--
Gitblit v1.9.1