ClientApps/pqs-9100_client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备类型

Browse Source
This commit is contained in:
sjl
2025-02-10 16:35:14 +08:00
parent 9689197db9
commit 15f1308557
5 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/.env.development
View File

@@ -19,6 +19,6 @@ VITE_API_URL=/api
# 开发环境跨域代理，支持配置多个 # 开发环境跨域代理，支持配置多个
VITE_PROXY=[["/api","http://192.168.1.127:18092/"]] VITE_PROXY=[["/api","http://192.168.1.124:18092/"]]
#VITE_PROXY=[["/api","http://192.168.1.125:18092/"]] #VITE_PROXY=[["/api","http://192.168.1.125:18092/"]]
# VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文 # VITE_PROXY=[["/api","http://192.168.1.138:8080/"]]张文

2
frontend/src/api/device/device/index.ts
View File

@@ -54,7 +54,7 @@ export const importCNDev = (params: Device.ReqPqDevParams) => {
} }
//根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）； //根据设备类型决定（电源、icd、模板、通道数、额定电压、额定电流）；
export const getPqDev = () => { export const getPqDev = () => {
return http.post(`/devType/list`) return http.post(`/devType/listAll`)
} }
//被检设备归档 //被检设备归档

2
frontend/src/api/device/interface/device.ts
View File

@@ -65,7 +65,7 @@ export namespace Device {
updateBy?: string| null; //更新用户 updateBy?: string| null; //更新用户
updateTime?: string| null; //更新时间 updateTime?: string| null; //更新时间
icdId: string| null; icdId: string| null;
power: string| null; power: string| null;//工作电源
preinvestmentPlan: string| null; preinvestmentPlan: string| null;
} }

2
frontend/src/views/home/components/table.vue
View File

@@ -635,8 +635,10 @@ const handleSelectionChange = (selection: any[]) => {
channelsSelection.value = selection channelsSelection.value = selection
devNum = selection.length devNum = selection.length
devChannelsNum = 0 devChannelsNum = 0
for (let i = 0; i < selection.length; i++) { for (let i = 0; i < selection.length; i++) {
devChannelsNum += selection[i].dev_Chns devChannelsNum += selection[i].dev_Chns
} }
devTestedNum = selection.filter((item) => item.checkState === 2).length devTestedNum = selection.filter((item) => item.checkState === 2).length

31
frontend/src/views/machine/device/components/devicePopup.vue
View File

@@ -67,34 +67,13 @@
</el-form-item> </el-form-item>
<el-divider >参数信息</el-divider> <el-divider >参数信息</el-divider>
<el-form-item label="通道数" prop="devChns" > <el-form-item label="通道数" prop="devChns" >
<el-select v-model="formContent.devChns" clearable placeholder="请选择设备通道数"> <el-input v-model='formContent.devChns' :disabled="true"/>
<el-option
v-for="item in dictStore.getDictData('Dev_Chns')"
:key="item.id"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="额定电压(V)" prop="devVolt" > <el-form-item label="额定电压(V)" prop="devVolt" >
<el-select v-model="formContent.devVolt" clearable placeholder="请选择额定电压"> <el-input v-model='formContent.devVolt' :disabled="true"/>
<el-option
v-for="item in dictStore.getDictData('Dev_Volt')"
:key="item.id"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="额定电流(A)" prop="devCurr" > <el-form-item label="额定电流(A)" prop="devCurr" >
<el-select v-model="formContent.devCurr" clearable placeholder="请选择额定电流"> <el-input v-model='formContent.devCurr' :disabled="true"/>
<el-option
v-for="item in dictStore.getDictData('Dev_Curr')"
:key="item.id"
:label="item.name"
:value="item.code"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label='通讯协议' prop='protocol' > <el-form-item label='通讯协议' prop='protocol' >
<el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议" > <el-select v-model="formContent.protocol" clearable placeholder="请选择通讯协议" >
@@ -171,7 +150,7 @@ import IPAddress from '@/components/IpAddress/index.vue'
import { dialogBig } from '@/utils/elementBind' import { dialogBig } from '@/utils/elementBind'
import { type Device } from '@/api/device/interface/device' import { type Device } from '@/api/device/interface/device'
import { ElMessage, type FormItemRule } from 'element-plus' import { ElMessage, type FormItemRule } from 'element-plus'
import { addPqDev, updatePqDev,getPqDev } from '@/api/device/device' import { addPqDev, updatePqDev } from '@/api/device/device'
import { computed, reactive, type Ref, ref } from 'vue' import { computed, reactive, type Ref, ref } from 'vue'
import { useDictStore } from '@/stores/modules/dict' import { useDictStore } from '@/stores/modules/dict'
import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue' import { CirclePlus, Delete, EditPen } from '@element-plus/icons-vue'
@@ -386,8 +365,6 @@ const rules = computed(() => {
// 打开弹窗，可能是新增，也可能是编辑 // 打开弹窗，可能是新增，也可能是编辑
const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => { const open = async (sign: string, data: Device.ResPqDev,currentMode: string,currentScene: string,devType:Device.ResDev[] ) => {
console.log('open', dictStore.getDictData('app_scene'))
devTypeOptions.value = devType devTypeOptions.value = devType
mode.value = currentMode mode.value = currentMode
scene.value = currentScene scene.value = currentScene