From c8a42948de18d8b8d6a60200aa13986124e1f3c8 Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Mon, 20 Apr 2026 09:28:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/cloudDeviceEntry/index.vue   |   2 +-
 .../setting/dictionary/version/index.vue      | 285 ++++++++++--------
 2 files changed, 163 insertions(+), 124 deletions(-)

diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index 6224ea3..9744bfb 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -1382,7 +1382,7 @@
 
         <el-dialog
             v-model="resultDialogVisible"
-            title="治理下发结果"
+            title="台账下发结果"
             width="700px"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
diff --git a/src/views/setting/dictionary/version/index.vue b/src/views/setting/dictionary/version/index.vue
index 58b0590..4b053c6 100644
--- a/src/views/setting/dictionary/version/index.vue
+++ b/src/views/setting/dictionary/version/index.vue
@@ -1,123 +1,162 @@
-<template>
-    <div class="default-main">
-        <TableHeader :showReset="false">
-            <template #select>
-
-
-                <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
-                    <el-radio-button label="web" value="WEB" />
-                    <el-radio-button label="app" value="APP" />
-
-                </el-radio-group>
-            </template>
-            <template #operation>
-                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="版本号">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.appVersion" placeholder="请输入版本号" />
-                </el-form-item>
-                <el-form-item label="整改内容">
-                    <el-input maxlength="300" type="textarea" show-word-limit v-model.trim="form.content"
-                        placeholder="请输入整改内容" />
-                </el-form-item>
-                <el-form-item label="发布类型">
-
-                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
-                        <el-option label="优化" :value="0" />
-                        <el-option label="bug调整" :value="1" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="版本类型">
-
-                    <el-select v-model.trim="form.versionType" placeholder="请选择版本类型">
-                        <el-option label="web" value="WEB" />
-                        <el-option label="app" value="APP" />
-                    </el-select>
-                </el-form-item>
-            </el-form>
-
-            <template #footer>
-                <span class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="submit">确认</el-button>
-                </span>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-import { addVersion } from '@/api/systerm'
-import router from '@/router/index'
-const dialogVisible = ref(false)
-const form = ref({
-    appVersion: '',
-    content: '',
-    versionType: '',
-    sev: '',
-})
-const tableStore = new TableStore({
-    url: '/cs-system-boot/appVersion/getAllData',
-    method: 'POST',
-    showPage: false,
-    paramsPOST: true,
-    column: [
-        {
-            title: '序号', width: 80, formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '版本号', field: 'versionName', width: '150' },
-
-        { title: '创建时间', field: 'createTime', width: '220', sortable: true },
-        {
-            title: '发布类型', field: 'sev', formatter: (row,) => {
-                return row.cellValue == 0 ? '优化' : 'bug调整'
-            },
-            width: '150'
-        },
-        { title: '整改内容', field: 'content' },
-
-
-
-
-    ],
-})
-tableStore.table.params.versionType = 'WEB'
-provide('tableStore', tableStore)
-
-onMounted(async () => {
-    tableStore.index()
-    // await queryByCode('Direct_Connected_Device').then((res) => {
-    //     queryByid(res.data.id).then((res) => {
-    //         DevTypeOptions.value = res.data
-    //     })
-    // })
-    // tableStore.table.params.devType = ''
-})
-const submit = () => {
-    addVersion(form.value).then(res => {
-        ElMessage.success('新增成功')
-        tableStore.index()
-        dialogVisible.value = false
-        router.go(0)
-    })
-}
-const addMenu = () => {
-    dialogVisible.value = true
-    form.value.appVersion = tableStore.table.data[0].versionName || ''
-    form.value.content = ''
-    form.value.sev = tableStore.table.data[0].sev || 0
-    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
-}
-
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader :showReset="false">
+            <template #select>
+                <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
+                    <el-radio-button label="web" value="WEB" />
+                    <el-radio-button label="app" value="APP" />
+                </el-radio-group>
+            </template>
+            <template #operation>
+                <el-button type="primary" icon="el-icon-Plus" @click="addMenu">新增版本</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef">
+            <template v-slot:columns>
+                <vxe-column
+                    field="AndroidPath"
+                    title="Android路径"
+                    width="250px"
+                    v-if="tableStore.table.params.versionType == 'APP'"
+                ></vxe-column>
+                <vxe-column
+                    field="IOSPath"
+                    title="IOS路径"
+                    width="250px"
+                    v-if="tableStore.table.params.versionType == 'APP'"
+                ></vxe-column>
+            </template>
+        </Table>
+        <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
+            <el-form :inline="false" :model="form" ref="formRef" label-width="auto" class="form-one" :rules="rules">
+                <el-form-item label="版本号:" prop="appVersion">
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="form.appVersion"
+                        placeholder="请输入版本号"
+                    />
+                </el-form-item>
+                <el-form-item label="整改内容:">
+                    <el-input
+                        maxlength="300"
+                        type="textarea"
+                        show-word-limit
+                        v-model.trim="form.content"
+                        placeholder="请输入整改内容"
+                    />
+                </el-form-item>
+                <el-form-item label="发布类型:">
+                    <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
+                        <el-option label="优化" :value="0" />
+                        <el-option label="bug调整" :value="1" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="版本类型:">
+                    <el-select v-model.trim="form.versionType" placeholder="请选择版本类型">
+                        <el-option label="web" value="WEB" />
+                        <el-option label="app" value="APP" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="Android路径:" prop="AndroidPath" v-if="form.versionType == 'APP'">
+                    <el-input v-model.trim="form.AndroidPath" placeholder="请输入Android路径" />
+                </el-form-item>
+                <el-form-item label="IOS路径:" prop="IOSPath" v-if="form.versionType == 'APP'">
+                    <el-input v-model.trim="form.IOSPath" placeholder="请输入IOS路径" />
+                </el-form-item>
+            </el-form>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submit">确认</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import { addVersion } from '@/api/systerm'
+import router from '@/router/index'
+const dialogVisible = ref(false)
+const form = ref({
+    appVersion: '',
+    content: '',
+    versionType: '',
+    sev: '',
+    AndroidPath: '',
+    IOSPath: ''
+})
+const rules = {
+    appVersion: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
+    AndroidPath: [{ required: true, message: '请输入Android路径', trigger: 'blur' }],
+    IOSPath: [{ required: true, message: '请输入IOS路径', trigger: 'blur' }]
+}
+const formRef = ref()
+const tableStore = new TableStore({
+    url: '/cs-system-boot/appVersion/getAllData',
+    method: 'POST',
+    showPage: false,
+    paramsPOST: true,
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '版本号', field: 'versionName', width: '150' },
+        { title: '创建时间', field: 'createTime', width: '220', sortable: true },
+        {
+            title: '发布类型',
+            field: 'sev',
+            formatter: row => {
+                return row.cellValue == 0 ? '优化' : 'bug调整'
+            },
+            width: '150'
+        },
+        { title: '整改内容', field: 'content' }
+    ],
+    beforeSearchFun: () => {
+        // console.log("🚀 ~ tableStore.table.params:", tableStore.table)
+        // if (tableStore.table.params.versionType == 'APP') {
+        // }
+    }
+})
+tableStore.table.params.versionType = 'WEB'
+provide('tableStore', tableStore)
+
+onMounted(async () => {
+    tableStore.index()
+    // await queryByCode('Direct_Connected_Device').then((res) => {
+    //     queryByid(res.data.id).then((res) => {
+    //         DevTypeOptions.value = res.data
+    //     })
+    // })
+    // tableStore.table.params.devType = ''
+})
+const submit = async () => {
+    await formRef.value.validate()
+    console.log(123)
+    addVersion(form.value).then(res => {
+        ElMessage.success('新增成功')
+        tableStore.index()
+        dialogVisible.value = false
+        router.go(0)
+    })
+}
+const addMenu = async () => {
+    dialogVisible.value = true
+    form.value.appVersion = tableStore.table.data[0].versionName || ''
+    form.value.content = ''
+    form.value.sev = tableStore.table.data[0].sev || 0
+    form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
+}
+</script>