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 | 47 +++++++++++++++++++----------------------------
1 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/web/src/views/modules/basicInfo/XhProductModel.vue b/web/src/views/modules/basicInfo/XhProductModel.vue
index 001de71..b1b8929 100644
--- a/web/src/views/modules/basicInfo/XhProductModel.vue
+++ b/web/src/views/modules/basicInfo/XhProductModel.vue
@@ -8,15 +8,13 @@
</el-col>
<el-col :span="19">
<div class="mod-basicInfo-xhProductModel}">
- <zt-table-wraper ref="tableObj" query-url="/basicInfo/XhProductModel/page"
- delete-url="/basicInfo/XhProductModel "
+ <zt-table-wraper ref="tableObj" defaultNotQuery="true" query-url="/basicInfo/XhProductModel/page"
+ delete-url="/basicInfo/XhProductModel/ "
+ :paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
- </el-form-item>
- <el-form-item>
- <zt-dict v-model="dataForm.nodeType" dict="product" clearable></zt-dict>
</el-form-item>
<el-form-item>
<zt-button type="query" @click="table.query()"/>
@@ -29,23 +27,10 @@
@selection-change="table.selectionChangeHandle"
>
<el-table-column prop="name" label="鍚嶇О"/>
- <zt-table-column-dict prop="nodeType" label="鑺傜偣绫诲瀷" dict="product"/>
- <el-table-column prop="operationalStatus" label="杩愯鐘舵�佸浘" align="center">
+ <zt-table-column-dict prop="productType" label="鑺傜偣绫诲瀷" dict="product"/>
+ <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="鎺掑簭"/>
@@ -65,15 +50,18 @@
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: '',
- nodeType: '',
type:'',
- id: ''
+ pid: '',
+ srcId:'',
}
}
},
@@ -84,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
@@ -97,7 +86,7 @@
this.$alert("褰撳墠鑺傜偣涓嶅彲鏂板瀛愯妭鐐癸紝璇烽噸鏂拌缃�")
return
}
- this.$refs.SelectTyModel.$refs.dialog.init(this.dataForm.type )
+ this.$refs.SelectTyModel.$refs.dialog.init(null,{type:this.dataForm.type,id:this.dataForm.pid})
},
cellStyle({column}) {
if (column.label === '鍚嶇О') {
@@ -109,8 +98,10 @@
return `${window.SITE_CONFIG['apiURL']}/sys/oss/content2?fileId=${id}`
},
onProductSelected(data) {
- this.dataForm.id = data.id
- this.dataForm.type = data.nodeType
+ 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