联调程序升级

src/api/cs-system-boot/device.ts

@@ -111,3 +111,11 @@ export function onlineRegister(data: any) {
         params: data
     })
 }
+//重启设备
+export function resetFactory(data: any) {
+    return createAxios({
+        url: '/access-boot/device/resetFactory',
+        method: 'post',
+        params: data
+    })
+}

src/api/cs-system-boot/official.ts

@@ -27,3 +27,23 @@ export const removeUserDev = (data: any) => {
         data: data
     })
 }
+/**
+ * 短信配置
+ */
+export const addUserDevices = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/appMsgSet/addUserDevices',
+        method: 'post',
+        data: data
+    })
+}
+/**
+ * 短信配置
+ */
+export const queryDeviceIdsByUserId = (data: any) => {
+    return createAxios({
+        url: '/cs-system-boot/appMsgSet/queryDeviceIdsByUserId',
+        method: 'post',
+        params: data
+    })
+}

src/api/system-boot/dictTree.ts

@@ -94,3 +94,19 @@ export function codeDicTree(data: any) {
         params: data
     })
 }
+// 根据装置型号获取装置类型
+export function findByDevTypeId(data: any) {
+    return createAxios({
+        url: '/cs-device-boot/edData/queryEdDataPage',
+        method: 'post',
+        data
+    })
+}
+// 装置升级
+export function upgrade(params: any) {
+    return createAxios({
+        url: '/zl-event-boot/device/upgrade',
+        method: 'get',
+        params
+    })
+}

src/components/cockpit/exceedanceLevel/index.vue

@@ -1,25 +1,12 @@
 <template>
     <div>
         <!--指标越限程度 -->
-        <TableHeader
+        <TableHeader ref="TableHeaderRef" :showReset="false" @selectChange="selectChange" datePicker
-            ref="TableHeaderRef"
+            :timeKeyList="prop.timeKey" v-if="fullscreen"></TableHeader>
-            :showReset="false"
+        <my-echart class="tall" :options="echartList"
-            @selectChange="selectChange"
+            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }" />
-            datePicker
+        <Table ref="tableRef" @cell-click="cellClickEvent"
-            :timeKeyList="prop.timeKey"
+            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`" isGroup></Table>
-            v-if="fullscreen"
-        ></TableHeader>
-        <my-echart
-            class="tall"
-            :options="echartList"
-            :style="{ width: prop.width, height: `calc(${prop.height} / 2 )` }"
-        />
-        <Table
-            ref="tableRef"
-            @cell-click="cellClickEvent"
-            :height="`calc(${prop.height} / 2 - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"
-            isGroup
-        ></Table>
         <!-- 指标日趋势图 -->
         <HarmonicRatio‌ ref="harmonicRatio‌Ref" v-if="dialogFlag" @close="onHarmonicRatioClose" :showIndex="false" />
         <!-- <DailyTrendChart v-if="dialogTrendChart" ref="dailyTrendChartRef" @close="dialogTrendChart = false" /> -->
@@ -168,7 +155,7 @@ const tableStore: any = new TableStore({
                     {
                         type: 'bar',
                         name: '越限占比',
-                        data: tableStore.table.data.map((item: any) =>  Math.floor(item.extent * 100) / 100),
+                        data: tableStore.table.data.map((item: any) => Math.floor(item.extent * 100) / 100),
                         barMaxWidth: 30
                     }
                 ]
@@ -182,29 +169,29 @@ provide('tableRef', tableRef)
 
 provide('tableStore', tableStore)
 const codeMap = [
-  { key: '闪变', code: 'flickerOvertime' },
+    { key: '闪变', code: 'flickerOvertime' },
-  { key: '电压偏差', code: 'voltageDevOvertime' },
+    { key: '电压偏差', code: 'voltageDevOvertime' },
-  { key: '三相', code: 'ubalanceOvertime' },
+    { key: '三相', code: 'ubalanceOvertime' },
-  { key: '谐波电压', code: 'uharm' },
+    { key: '谐波电压', code: 'uharm' },
-  { key: '谐波电流', code: 'iharm' },
+    { key: '谐波电流', code: 'iharm' },
 ];
 // 点击行
 const cellClickEvent = ({ row, column }: any) => {
     dialogTrendChart.value = true
 
-    if (column.field == 'maxValue' ) {
+    if (column.field == 'maxValue') {
-        if(row.lineId==null){
+        if (row.lineId == null) {
-ElMessage.info('暂无越限监测点！')
+            ElMessage.info('暂无越限监测点！')
-        }else{
+        } else {
- nextTick(() => {
+            nextTick(() => {
-            // dailyTrendChartRef.value.open(row)
+                // dailyTrendChartRef.value.open(row)
-              dialogFlag.value = true
+                dialogFlag.value = true
-               nextTick(() => {
+                nextTick(() => {
 
-const code = codeMap.find(item => row.name.includes(item.key))?.code || '';
+                    const code = codeMap.find(item => row.name.includes(item.key))?.code || '';
-           harmonicRatio‌Ref.value.openDialog(row,code,column.title.replace(/次/g, ""))
+                    harmonicRatio‌Ref.value.openDialog(row, code, column.title.replace(/次/g, ""))
-               })
+                })
-        })
+            })
         }
 
     }
@@ -228,10 +215,10 @@ const setTime = () => {
         console.warn('获取时间失败，time 不是一个有效数组')
     }
 }
-const dialogFlag=ref(false)
+const dialogFlag = ref(false)
 // 谐波弹窗关闭时的回调
 const onHarmonicRatioClose = () => {
-     dialogFlag.value = false
+    dialogFlag.value = false
     // 重新打开指标越限详情弹窗
 
 }
@@ -256,6 +243,6 @@ watch(
     }
 )
 
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style lang="scss" scoped></style>

src/router/static.ts

@@ -36,14 +36,15 @@ export const adminBaseRoute = {
             }
         },
         {
-            // 在线补召
+            // 版本维护
-            path: '/versionMaintenance',
+            path: '/version',
-            name: 'versionMaintenance',
+            name: 'version',
-            component: () => import('@/views/govern/manage/programVersion/comp/versionMaintenance.vue'),
+            component: () => import('@/views/govern/manage/basic/version.vue'),
             meta: {
-                title: pageTitle('router.versionMaintenance')
+                title: pageTitle('router.version')
             }
         },
+        
         {
             path: 'cockpit',
             name: '项目管理',

src/utils/request.ts

@@ -76,6 +76,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     config.url == '/cs-harmonic-boot/limitRateDetailD/limitTimeProbabilityData' ||
                     config.url == '/cs-harmonic-boot/limitRateDetailD/limitProbabilityData' ||
                     config.url == '/system-boot/dictTree/queryByCode' ||
+                    config.url == '/system-boot/dictTree/queryByid' ||
                     config.url == '/system-boot/dictTree/query'
                 )
             )

src/views/govern/cloudDeviceEntry/index.vue

@@ -13,13 +13,11 @@
             <pane style="background: #fff">
                 <div class="device-manage-right">
                     <el-form :inline="true" class="demo-form-inline" style="height: 42px">
-                        <el-form-item style="position: relative; z-index: 2">
+                        <el-form-item
-                            <el-button
+                            style="position: relative; z-index: 2"
-                                icon="el-icon-Plus"
+                            v-if="!((nodeLevel == 3 || nodeLevel == 4) && connectionMethod == 'MQTT')"
-                                type="primary"
+                        >
-                                @click="add"
+                            <el-button icon="el-icon-Plus" type="primary" @click="add" v-if="nodeLevel != 4">
-                                v-if="!(nodeLevel == 3 && connectionMethod == 'MQTT') && nodeLevel != 4"
-                            >
                                 {{
                                     nodeLevel == 0
                                         ? '新增工程'
@@ -32,7 +30,12 @@
                                         : '新增监测点'
                                 }}
                             </el-button>
-                            <el-button icon="el-icon-Edit" type="primary" @click="update" v-if="nodeLevel != 0">
+                            <el-button
+                                icon="el-icon-Edit"
+                                type="primary"
+                                @click="update"
+                                v-if="!(nodeLevel == 4 && connectionMethod == 'MQTT') && nodeLevel != 0"
+                            >
                                 修改
                             </el-button>
                             <el-button icon="el-icon-Close" type="danger" @click="remove" v-if="nodeLevel != 0">
@@ -62,11 +65,11 @@
                                 修改提交
                             </el-button>
                         </el-form-item>
-                        <!-- <el-form-item style="position: relative; z-index: 2" v-else>
+                        <el-form-item style="position: relative; z-index: 2" v-else>
                             <span style="font-size: 16px; font-weight: bold; color: var(--el-color-primary)">
                                 治理设备/便携式设备不支持操作！
                             </span>
-                        </el-form-item> -->
+                        </el-form-item>
 
                         <el-form-item style="right: 300px; position: absolute; overflow: hidden">
                             <LocationInformation
@@ -439,7 +442,7 @@
                                                     "
                                                 >
                                                     <el-option
-                                                        v-for="option in  devModelOptions.filter(
+                                                        v-for="option in devModelOptions.filter(
                                                             item => item.pid == busItem.devType
                                                         )"
                                                         :key="option.id"
@@ -472,7 +475,7 @@
                                                     "
                                                 >
                                                     <el-option label="CLD" value="CLD"></el-option>
-                                                    <el-option label="MQTT" value="MQTT"></el-option>
+                                                    <!-- <el-option label="MQTT" value="MQTT"></el-option> -->
                                                 </el-select>
                                             </el-form-item>
 
@@ -492,6 +495,35 @@
                                                 />
                                             </el-form-item>
 
+                                            <el-form-item
+                                                class="form-item"
+                                                v-if="busItem.devAccessMethod == 'CLD'"
+                                                label="icd模型:"
+                                                :prop="'deviceInfoList[' + bIndex + '].idc'"
+                                            >
+                                                <el-select
+                                                    clearable
+                                                    filterable
+                                                    v-model="busItem.icd"
+                                                    placeholder="请选择icd模型"
+                                                    style="width: 100%"
+                                                    :disabled="
+                                                        !(
+                                                            (nodeLevel == 3 && pageStatus == 3) ||
+                                                            ((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
+                                                                pageStatus == 2)
+                                                        )
+                                                    "
+                                                >
+                                                    <el-option
+                                                        v-for="item in icdList"
+                                                        :key="item.id"
+                                                        :label="item.name"
+                                                        :value="item.id"
+                                                    ></el-option>
+                                                </el-select>
+                                            </el-form-item>
+
                                             <el-form-item
                                                 class="form-item"
                                                 label="合同号:"
@@ -598,6 +630,30 @@
                                                     <el-option label="停用" :value="0"></el-option>
                                                 </el-select>
                                             </el-form-item>
+                                            <el-form-item
+                                                class="form-item"
+                                                label="是否支持升级:"
+                                                v-if="busItem.devAccessMethod == 'CLD'"
+                                                :prop="'deviceInfoList[' + bIndex + '].upgrade'"
+                                            >
+                                                <el-select
+                                                    clearable
+                                                    filterable
+                                                    v-model="busItem.upgrade"
+                                                    placeholder="请选择是否支持升级"
+                                                    style="width: 100%"
+                                                    :disabled="
+                                                        !(
+                                                            (nodeLevel == 3 && pageStatus == 3) ||
+                                                            ((nodeLevel == 2 || (nodeLevel == 1 && pageStatus == 2)) &&
+                                                                pageStatus == 2)
+                                                        )
+                                                    "
+                                                >
+                                                    <el-option label="是" :value="1"></el-option>
+                                                    <el-option label="否" :value="0"></el-option>
+                                                </el-select>
+                                            </el-form-item>
                                             <!-- <el-form-item
                                                 label="接入:"
                                                 v-if="connectionMethod == 'MQTT' && busItem?.id"
@@ -1456,8 +1512,7 @@ import {
     updateEquipment,
     updateLine,
     pushLog,
-    queryPushResult,
+    queryPushResult
-    
 } from '@/api/cs-device-boot/cloudDeviceEntry'
 import { getTopoTemplate } from '@/api/cs-device-boot/topologyTemplate'
 import { getFileUrl } from '@/api/system-boot/file'
@@ -1567,6 +1622,7 @@ const logList = ref([
         label: 'ERROR'
     }
 ])
+const icdList = ref([])
 //工程
 // const engineeringParam = ref({
 //     city: '',
@@ -1597,6 +1653,8 @@ interface DeviceInfo {
     sort: number
     nodeProcess: string
     usageStatus: number
+    icd: string
+    upgrade: number
 }
 // 设备信息列表
 //const deviceInfoList = ref<DeviceInfo[]>([])
@@ -1993,7 +2051,9 @@ const add = () => {
                 cntractNo: '',
                 sort: 0,
                 nodeProcess: '',
-                usageStatus: 1
+                usageStatus: 1,
+                icd: '',
+                upgrade: 1
             })
             busBarIndex.value = (formData.value.deviceInfoList.length - 1).toString()
             // 清理监测点数据
@@ -2146,6 +2206,8 @@ const updateEquipmentFunc = (id: any) => {
         nodeId: currentDevice.nodeId,
         cntractNo: currentDevice.cntractNo,
         usageStatus: currentDevice.usageStatus,
+        icd: currentDevice.icd,
+        upgrade: currentDevice.upgrade,
         ndid: currentDevice.mac.replace(/:/g, ''),
         sort: currentDevice.sort
     }
@@ -2382,7 +2444,9 @@ const next = async () => {
                         cntractNo: '',
                         sort: 0,
                         nodeProcess: '',
-                        usageStatus: 1
+                        usageStatus: 1,
+                        icd: '',
+                        upgrade: 1
                     })
                     busBarIndex.value = (formData.value.deviceInfoList.length - 1).toString()
                     nextfalg.value = false
@@ -2825,6 +2889,8 @@ const resetAllForms = () => {
         device.nodeId = ''
         device.cntractNo = ''
         device.usageStatus = 1
+        device.icd = ''
+        device.upgrade = 1
         device.sort = 0
     })
 
@@ -2951,6 +3017,8 @@ const submitData = () => {
                         nodeId: currentDevice.nodeId,
                         cntractNo: currentDevice.cntractNo,
                         usageStatus: currentDevice.usageStatus,
+                        icd: currentDevice.icd,
+                        upgrade: currentDevice.upgrade,
                         ndid: currentDevice.mac.replace(/:/g, ''),
                         sort: currentDevice.sort
                     }
@@ -3145,7 +3213,9 @@ const handleBusBarTabsEdit = (targetName: any, action: any) => {
             cntractNo: '',
             sort: 0,
             nodeProcess: '',
-            usageStatus: 1
+            usageStatus: 1,
+            icd: '',
+            upgrade: 1
         })
         busBarIndex.value = (formData.value.deviceInfoList.length - 1).toString()
     } else if (action === 'remove') {
@@ -3318,6 +3388,13 @@ const area = async () => {
         .catch(error => {
             console.error('获取前置机数据失败:', error)
         })
+    // icd
+    queryByCode('Icd_Model').then(res => {
+        const id = res.data.id
+        queryByid(id).then(res => {
+            icdList.value = res.data
+        })
+    })
 
     queryByCode('DEV_CLD')
         .then(res => {
@@ -3385,6 +3462,7 @@ area()
     0% {
         transform: rotate(0deg);
     }
+
     100% {
         transform: rotate(360deg);
     }
@@ -3434,6 +3512,7 @@ area()
 .splitpanes.default-theme .splitpanes__pane {
     background: #fff !important;
 }
+
 .title {
     width: 300px;
     // overflow: hidden;
@@ -3441,17 +3520,24 @@ area()
     white-space: nowrap;
     font-weight: bold;
 }
+
 .titleScroll {
-    animation: scroll 7s linear infinite; /* 滚动动画 */
+    animation: scroll 7s linear infinite;
+    /* 滚动动画 */
 }
+
 @keyframes scroll {
     0% {
-        transform: translateX(100%); /* 从右侧开始 */
+        transform: translateX(100%);
+        /* 从右侧开始 */
     }
+
     100% {
-        transform: translateX(-160%); /* 滚动到左侧 */
+        transform: translateX(-160%);
+        /* 滚动到左侧 */
     }
 }
+
 .image-preview {
     height: 50px;
     margin-top: 5px;

src/views/govern/device/officialUser/index.vue

@@ -1,141 +1,159 @@
 <template>
-  <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
-    <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
+        <OfficialUserTree @node-click="selectUser" @selectUser="selectUser"></OfficialUserTree>
-    <div class="device-manage-right" :style="{ height: pageHeight.height }">
+        <div style="flex: 1" class="pt10 pr10">
-      <div class="el-descriptions__header">
+            <div class="el-descriptions__header">
-        <el-button type="primary"  icon="el-icon-Sort"  @click="getEnginnerDev">绑定工程 / 设备</el-button>
+                <div class="el-descriptions__title">工程 / 设备列表</div>
-      </div>
+                <el-button type="primary" icon="el-icon-Sort" @click="getEnginnerDev">绑定工程 / 设备</el-button>
+            </div>
 
-      <!-- 使用flex布局平均分配高度 -->
+            <!-- 使用flex布局平均分配高度 -->
-      <div class="tables-container">
+            <div class="tables-container">
-        <div class="table-wrapper">
+                <div class="table-wrapper" :style="{ height: pageHeight1.height }">
-          <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
+                    <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
-            <vxe-column field="name" title="工程名称"></vxe-column>
+                        <vxe-column field="name" title="工程名称"></vxe-column>
-            <vxe-column title="操作" width="200px">
+                        <vxe-column title="操作" width="200px">
-              <template v-slot:default="scoped">
+                            <template v-slot:default="scoped">
-                <el-button link size="small" type="danger" @click="deleteEngineering(scoped.row)">
+                                <el-button link size="small" type="danger" @click="deleteEngineering(scoped.row)">
-                  移除
+                                    移除
-                </el-button>
+                                </el-button>
-              </template>
+                            </template>
-            </vxe-column>
+                        </vxe-column>
-          </vxe-table>
+                    </vxe-table>
+                </div>
+            </div>
+        </div>
+        <!-- 短信配置 -->
+
+        <div style="width: 400px" class="pt10 pr10">
+            <div class="el-descriptions__header">
+                <div class="el-descriptions__title">短信配置</div>
+                <el-button type="primary" icon="el-icon-Select" @click="saveConfiguration">保存</el-button>
+            </div>
+
+            <!-- 使用flex布局平均分配高度 -->
+            <div :style="{ height: pageHeight1.height }" class="border">
+                <el-tree
+                    ref="treeRef"
+                    class="mt10"
+                    node-key="id"
+                    default-expand-all
+                    :data="tableData"
+                    :props="defaultProps"
+                    show-checkbox
+                >
+                    <template #default="{ node, data }">
+                        <span>{{ data.name.replace(/\([^)]*\)/, '') }}</span>
+                    </template>
+                </el-tree>
+            </div>
         </div>
 
-        <!-- 新增设备列表 -->
+        <!-- 对话框为左右布局 -->
-        <!-- <div class="device-list-section table-wrapper">
+        <el-dialog
-          <vxe-table v-bind="defaultAttribute" :data="deviceTableData" height="auto" style="width: 100%">
+            v-model.trim="dialogVisible"
-            <vxe-column field="name" title="设备名称"></vxe-column>
+            draggable
-            <vxe-column title="操作" width="200px">
+            title="绑定工程 / 设备"
-              <template v-slot:default="scoped">
+            class="cn-operate-dialog"
-                <el-button link size="small" type="danger" @click="deleteDevice(scoped.row)">
+            :close-on-click-modal="false"
-                  移除
+        >
-                </el-button>
+            <div class="dialog-content">
-              </template>
+                <!-- 工程部分 -->
-            </vxe-column>
+                <div class="dialog-section">
-          </vxe-table>
+                    <div class="section-header">
-        </div> -->
+                        <span>工程列表</span>
-      </div>
+                        <el-input
+                            maxlength="32"
+                            show-word-limit
+                            v-model.trim="filterText"
+                            placeholder="搜索工程"
+                            clearable
+                            class="search-input"
+                        >
+                            <template #prefix>
+                                <Icon name="el-icon-Search" style="font-size: 16px" />
+                            </template>
+                        </el-input>
+                    </div>
+
+                    <vxe-table
+                        ref="tableRef"
+                        v-bind="defaultAttribute"
+                        :data="tableData2.filter((item: any) => {
+            return item.name.includes(filterText)
+          })"
+                        height="400px"
+                        style="width: 100%"
+                    >
+                        <vxe-column type="checkbox" width="60"></vxe-column>
+                        <vxe-column field="name" title="工程名称"></vxe-column>
+                    </vxe-table>
+                </div>
+
+                <!-- 设备部分 -->
+                <div class="dialog-section">
+                    <div class="section-header">
+                        <span>设备列表</span>
+                        <el-input
+                            maxlength="32"
+                            show-word-limit
+                            v-model.trim="deviceFilterText"
+                            placeholder="搜索设备"
+                            clearable
+                            class="search-input"
+                        >
+                            <template #prefix>
+                                <Icon name="el-icon-Search" style="font-size: 16px" />
+                            </template>
+                        </el-input>
+                    </div>
+
+                    <vxe-table
+                        ref="deviceTableRef"
+                        v-bind="defaultAttribute"
+                        :data="deviceTableData2.filter((item: any) => {
+            return item.name.includes(deviceFilterText)
+          })"
+                        height="400px"
+                        style="width: 100%"
+                    >
+                        <vxe-column type="checkbox" width="60"></vxe-column>
+                        <vxe-column field="name" title="便携式设备名称"></vxe-column>
+                    </vxe-table>
+                </div>
+            </div>
+
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="addData">确 定</el-button>
+                </span>
+            </template>
+        </el-dialog>
     </div>
-    
-    <!-- 对话框为左右布局 -->
-    <el-dialog 
-      v-model.trim="dialogVisible" 
-      draggable
-      title="绑定工程 / 设备" 
-      class="cn-operate-dialog" 
-      :close-on-click-modal="false"
-      
-    >
-      <div class="dialog-content">
-        <!-- 工程部分 -->
-        <div class="dialog-section">
-          <div class="section-header">
-            <span>工程列表</span>
-            <el-input 
-              maxlength="32" 
-              show-word-limit 
-              v-model.trim="filterText" 
-              placeholder="搜索工程" 
-              clearable 
-              class="search-input"
-            >
-              <template #prefix>
-                <Icon name="el-icon-Search" style="font-size: 16px" />
-              </template>
-            </el-input>
-          </div>
-          
-          <vxe-table 
-            ref="tableRef" 
-            v-bind="defaultAttribute" 
-            :data="tableData2.filter((item: any) => {
-              return item.name.includes(filterText)
-            })" 
-            height="400px" 
-            style="width: 100%"
-          >
-            <vxe-column type="checkbox" width="60"></vxe-column>
-            <vxe-column field="name" title="工程名称"></vxe-column>
-          </vxe-table>
-        </div>
-        
-        <!-- 设备部分 -->
-        <div class="dialog-section">
-          <div class="section-header">
-            <span>设备列表</span>
-            <el-input 
-              maxlength="32" 
-              show-word-limit 
-              v-model.trim="deviceFilterText" 
-              placeholder="搜索设备" 
-              clearable 
-              class="search-input"
-            >
-              <template #prefix>
-                <Icon name="el-icon-Search" style="font-size: 16px" />
-              </template>
-            </el-input>
-          </div>
-          
-          <vxe-table 
-            ref="deviceTableRef" 
-            v-bind="defaultAttribute" 
-            :data="deviceTableData2.filter((item: any) => {
-              return item.name.includes(deviceFilterText)
-            })" 
-            height="400px" 
-            style="width: 100%"
-          >
-            <vxe-column type="checkbox" width="60"></vxe-column>
-            <vxe-column field="name" title="便携式设备名称"></vxe-column>
-          </vxe-table>
-        </div>
-      </div>
-
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="addData">确 定</el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </div>
 </template>
 
 <script setup lang="ts">
 defineOptions({
-  name: 'govern/officialUser/index'
+    name: 'govern/officialUser/index'
 })
 
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import OfficialUserTree from '@/components/tree/govern/officialUserTree.vue'
 import { mainHeight } from '@/utils/layout'
-import {  queryRunPortableDevByUseId ,queryUnlinkEngineeringByUseId} from '@/api/cs-device-boot/user'
+import { queryRunPortableDevByUseId, queryUnlinkEngineeringByUseId } from '@/api/cs-device-boot/user'
-import { add, removeUserDev, queryDevByUseId } from '@/api/cs-system-boot/official'
+import {
+    add,
+    removeUserDev,
+    queryDevByUseId,
+    addUserDevices,
+    queryDeviceIdsByUserId
+} from '@/api/cs-system-boot/official'
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 const pageHeight = mainHeight(60)
+const pageHeight1 = mainHeight(125)
 const loading = ref(true)
 
 const user: any = ref({})
@@ -148,185 +166,221 @@ const filterText = ref('') // 工程搜索文本
 const deviceFilterText = ref('') // 设备搜索文本
 const tableRef = ref()
 const deviceTableRef = ref() // 设备表格引用
-
+const defaultProps = {
+    children: 'devList',
+    label: 'name'
+}
 const selectUser = (e: any) => {
-  user.value = e
+    user.value = e
-  loading.value = true
+    loading.value = true
 
-    queryDevByUseId({ userId: e.id }).then((engineeringRes) => {
+    queryDevByUseId({ userId: e.id })
-        loading.value = false
+        .then(engineeringRes => {
-        tableData.value = engineeringRes.data.engineeringList || []
+            loading.value = false
-        deviceTableData.value =  engineeringRes.data.portableDevList || []
+
-  }).catch(() => {
+            tableData.value = engineeringRes.data.engineeringList || []
-        loading.value = false
+            deviceTableData.value = engineeringRes.data.portableDevList || []
-  })
+            queryDeviceIdsByUserId({
+                userId: user.value.id
+            }).then(res => {
+                treeRef.value!.setCheckedKeys(res.data, false)
+            })
+        })
+        .catch(() => {
+            loading.value = false
+        })
 }
 
 const getEnginnerDev = () => {
-  filterText.value = ''
+    filterText.value = ''
-  deviceFilterText.value = ''
+    deviceFilterText.value = ''
 
-  // 同时获取工程和设备数据
+    // 同时获取工程和设备数据
-  Promise.all([
+    Promise.all([
-    queryUnlinkEngineeringByUseId({ userId: user.value.id }),
+        queryUnlinkEngineeringByUseId({ userId: user.value.id }),
-    queryRunPortableDevByUseId({ userId: user.value.id })
+        queryRunPortableDevByUseId({ userId: user.value.id })
-  ]).then(([engineeringRes, deviceRes]) => {
+    ]).then(([engineeringRes, deviceRes]) => {
-    tableData2.value = engineeringRes.data || []
+        tableData2.value = engineeringRes.data || []
-    deviceTableData2.value = deviceRes.data || []
+        deviceTableData2.value = deviceRes.data || []
-    dialogVisible.value = true
+        dialogVisible.value = true
-    
+
-    setTimeout(() => {
+        setTimeout(() => {
-      tableRef.value?.clearCheckboxRow()
+            tableRef.value?.clearCheckboxRow()
-      deviceTableRef.value?.clearCheckboxRow()
+            deviceTableRef.value?.clearCheckboxRow()
-    }, 0)
+        }, 0)
-  })
+    })
 }
 
 const deleteEngineering = (row: any) => {
-  ElMessageBox.confirm('是否移出该工程?', '请确认', {
+    ElMessageBox.confirm('是否移出该工程?', '请确认', {
-    confirmButtonText: '确认',
+        confirmButtonText: '确认',
-    cancelButtonText: '取消',
+        cancelButtonText: '取消',
-    type: 'warning'
+        type: 'warning'
-  }).then(() => {
+    }).then(() => {
-    // 只移除工程，设备列表为空
+        // 只移除工程，设备列表为空
-    const form = {
+        const form = {
-      engineeringList: [row.id],  // 要移除的工程ID
+            engineeringList: [row.id], // 要移除的工程ID
-      portableDevList: [],               // 设备列表为空
+            portableDevList: [], // 设备列表为空
-      userId: user.value.id
+            userId: user.value.id
-    }
+        }
-    
+
-    removeUserDev(form).then((res: any) => {
+        removeUserDev(form).then((res: any) => {
-      ElMessage.success(res.message)
+            ElMessage.success(res.message)
-      selectUser(user.value)
+            selectUser(user.value)
+        })
     })
-  })
 }
 
 // 删除设备方法
 const deleteDevice = (row: any) => {
     console.log('删除设备', row)
-  ElMessageBox.confirm('是否移出该设备?', '请确认', {
+    ElMessageBox.confirm('是否移出该设备?', '请确认', {
-    confirmButtonText: '确认',
+        confirmButtonText: '确认',
-    cancelButtonText: '取消',
+        cancelButtonText: '取消',
-    type: 'warning'
+        type: 'warning'
-  }).then(() => {
+    }).then(() => {
-    // 只移除设备，工程列表为空
+        // 只移除设备，工程列表为空
-    const form = {
+        const form = {
-      engineeringList: [],               // 工程列表为空
+            engineeringList: [], // 工程列表为空
-      portableDevList: [row.id],   // 要移除的设备ID
+            portableDevList: [row.id], // 要移除的设备ID
-      userId: user.value.id
+            userId: user.value.id
-    }
+        }
-    
+
-    removeUserDev(form).then((res: any) => {
+        removeUserDev(form).then((res: any) => {
-      ElMessage.success(res.message)
+            ElMessage.success(res.message)
-      selectUser(user.value)
+            selectUser(user.value)
+        })
     })
-  })
 }
 
 const addData = () => {
-  const selectedEngineers = tableRef.value.getCheckboxRecords()
+    const selectedEngineers = tableRef.value.getCheckboxRecords()
-  const selectedDevices = deviceTableRef.value.getCheckboxRecords()
+    const selectedDevices = deviceTableRef.value.getCheckboxRecords()
-  
+
-  // 如果没有选择任何项，则提示
+    // 如果没有选择任何项，则提示
-  if (selectedEngineers.length === 0 && selectedDevices.length === 0) {
+    if (selectedEngineers.length === 0 && selectedDevices.length === 0) {
-    ElMessage.warning('请至少选择一项工程或设备')
+        ElMessage.warning('请至少选择一项工程或设备')
-    return
+        return
-  }
+    }
-  
+
-  // 构造请求参数对象
+    // 构造请求参数对象
-  const form = {
+    const form = {
-    engineeringList: [] as any[],
+        engineeringList: [] as any[],
-    portableDevList: [] as any[],
+        portableDevList: [] as any[],
-    userId: user.value.id
+        userId: user.value.id
-  }
+    }
-  
+
-//   // 处理已有的工程数据
+    //   // 处理已有的工程数据
-//   tableData.value.forEach((item: any) => {
+    //   tableData.value.forEach((item: any) => {
-//     form.engineeringList.push(item.id)
+    //     form.engineeringList.push(item.id)
-//   })
+    //   })
-  
+
-//   // 处理已有的设备数据
+    //   // 处理已有的设备数据
-//   deviceTableData.value.forEach((item: any) => {
+    //   deviceTableData.value.forEach((item: any) => {
-//     form.portableDevList.push(item.id)
+    //     form.portableDevList.push(item.id)
-//   })
+    //   })
-  
+
-  // 添加新选择的工程
+    // 添加新选择的工程
-  selectedEngineers.forEach((item: any) => {
+    selectedEngineers.forEach((item: any) => {
-    form.engineeringList.push( item.id)
+        form.engineeringList.push(item.id)
-  })
+    })
-  
+
-  // 添加新选择的设备
+    // 添加新选择的设备
-  selectedDevices.forEach((item: any) => {
+    selectedDevices.forEach((item: any) => {
-    form.portableDevList.push(item.id)
+        form.portableDevList.push(item.id)
-  })
+    })
-  
+
-  // 发送请求
+    // 发送请求
-  add(form).then((res: any) => {
+    add(form).then((res: any) => {
-    ElMessage.success(res.message)
+        ElMessage.success(res.message)
-    selectUser(user.value)
+        selectUser(user.value)
-    dialogVisible.value = false
+        dialogVisible.value = false
-  })
+    })
+}
+const treeRef = ref()
+// 保存短信配置
+const saveConfiguration = () => {
+    // treeRef.value!.getCheckedNodes(false, false)
+    let deviceIds = treeRef
+        .value!.getCheckedNodes(false, false)
+        .filter((item: any) => item.devList == null)
+        .map((item: any) => item.id)
+    if (deviceIds.length == 0) {
+        return ElMessage.warning('请选择设备!')
+    }
+    addUserDevices({
+        deviceIds: deviceIds,
+        userId: user.value.id
+    }).then((res: any) => {
+        return ElMessage.success('短信配置成功!')
+    })
 }
 </script>
 
 <style lang="scss" scoped>
 .device-manage {
-  display: flex;
-
-  &-right {
-    overflow: hidden;
-    flex: 1;
-    padding: 10px 10px 10px 0;
     display: flex;
-    flex-direction: column;
 
-    .el-descriptions__header {
+    &-right {
-      height: 27px;
+        overflow: hidden;
-      display: flex;
-      justify-content: flex-end; /* 靠右显示 */
-      align-items: center;
-    }
-
-    .tables-container {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-
-      .table-wrapper {
         flex: 1;
-        min-height: 0;
+        padding: 10px 10px 10px 0;
+        display: flex;
+        flex-direction: column;
 
-        &:first-child {
+        .el-descriptions__header {
-          // margin-bottom: 10px;
+            // height: 27px;
+            display: flex;
+            justify-content: flex-end;
+            /* 靠右显示 */
+            align-items: center;
+        }
+
+        .tables-container {
+            flex: 1;
+            display: flex;
+            flex-direction: column;
+
+            .table-wrapper {
+                flex: 1;
+                min-height: 0;
+
+                &:first-child {
+                    // margin-bottom: 10px;
+                }
+            }
         }
-      }
     }
-  }
+}
+:deep(.el-descriptions__header) {
+    margin-bottom: 10px !important;
 }
 
 .dialog-content {
-  display: flex;
+    display: flex;
-  gap: 20px;
+    gap: 20px;
-  
+
-  .dialog-section {
+    .dialog-section {
-    flex: 1;
+        flex: 1;
-    
+
-    .section-header {
+        .section-header {
-      display: flex;
+            display: flex;
-      justify-content: space-between;
+            justify-content: space-between;
-      align-items: center;
+            align-items: center;
-      margin-bottom: 10px;
+            margin-bottom: 10px;
-      
+
-      span {
+            span {
-        font-weight: bold;
+                font-weight: bold;
-        font-size: 16px;
+                font-size: 16px;
-      }
+            }
-      
+
-      .search-input {
+            .search-input {
-        width: 200px;
+                width: 200px;
-      }
+            }
+        }
     }
-  }
 }
-</style>
+.border {
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/views/govern/manage/basic/popupVersion.vue

@@ -1,24 +1,12 @@
 <template>
-    <el-dialog
+    <el-dialog draggable class="cn-operate-dialog" width="800px" v-model.trim="dialogVisible" :title="title"
-        class="cn-operate-dialog"
+        @close="emit('closePopup')">
-        width="800px"
-        v-model.trim="dialogVisible"
-        :title="title"
-        @close="emit('closePopup')"
-    >
         <el-form class="form-two" :model="form" label-width="100px" ref="formRef" :rules="rules">
             <el-form-item label="设备类型:" prop="type">
-                <!-- <el-select v-model.trim="form.type" filterable placeholder="请选择" @change="typeChange">
+
-                    <el-option v-for="item in TypeOptions" :key="item.id" :label="item.name"
-                        :value="item.id"></el-option>
-                </el-select> -->
                 <el-select v-model.trim="form.type" placeholder="请选择设备类型" @change="formDevTypeChange" clearable>
-                    <el-option
+                    <el-option v-for="item in devTypeOptions" :key="item.value" :label="item.label"
-                        v-for="item in devTypeOptions"
+                        :value="item.value"></el-option>
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="设备型号:" prop="devType">
@@ -26,90 +14,42 @@
                     <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
                         :value="item.id"></el-option>
                 </el-select> -->
-                <el-select
+                <el-select v-model.trim="form.devType" filterable placeholder="请选择设备型号" clearable
-                    v-model.trim="form.devType"
+                    @change="devTypeChange">
-                    filterable
+                    <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
-                    placeholder="请选择设备型号"
+                        :value="item.value"></el-option>
-                    clearable
-                    @change="devTypeChange"
-                >
-                    <el-option
-                        v-for="item in formDevModelOptionsFilter"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="版本号:" prop="versionNo">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.versionNo" autocomplete="off"
-                    maxlength="32"
+                    placeholder="请输入版本号"></el-input>
-                    show-word-limit
-                    v-model.trim="form.versionNo"
-                    autocomplete="off"
-                    placeholder="请输入版本号"
-                ></el-input>
             </el-form-item>
             <el-form-item label="版本类型:" prop="versionType">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.versionType" autocomplete="off"
-                    maxlength="32"
+                    placeholder="填写特殊类型(不填默认通用类型)"></el-input>
-                    show-word-limit
-                    v-model.trim="form.versionType"
-                    autocomplete="off"
-                    placeholder="填写特殊类型(不填默认通用类型)"
-                ></el-input>
             </el-form-item>
             <el-form-item label="协议版本:" prop="versionAgreement">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.versionAgreement" autocomplete="off"
-                    maxlength="32"
+                    placeholder="请输入协议版本"></el-input>
-                    show-word-limit
-                    v-model.trim="form.versionAgreement"
-                    autocomplete="off"
-                    placeholder="请输入协议版本"
-                ></el-input>
             </el-form-item>
             <el-form-item label="版本日期:" prop="versionDate">
-                <el-date-picker
+                <el-date-picker v-model.trim="form.versionDate" type="date" value-format="YYYY-MM-DD"
-                    v-model.trim="form.versionDate"
+                    placeholder="选择日期时间" style="width: 100%"></el-date-picker>
-                    type="date"
-                    value-format="YYYY-MM-DD"
-                    placeholder="选择日期时间"
-                    style="width: 100%"
-                ></el-date-picker>
             </el-form-item>
 
-            <el-form-item label="CRC校验:" prop="crcInfo">
+            <el-form-item label="CRC校验:" prop="crc">
-                <el-input
+                <el-input maxlength="32" show-word-limit v-model.trim="form.crc" autocomplete="off"
-                    maxlength="32"
+                    placeholder="请输入CRC校验"></el-input>
-                    show-word-limit
-                    v-model.trim="form.crcInfo"
-                    autocomplete="off"
-                    placeholder="请输入CRC校验"
-                ></el-input>
             </el-form-item>
         </el-form>
         <el-form :model="form" label-width="100px" class="mt10 form-one">
             <el-form-item label="描述:" prop="description">
-                <el-input
+                <el-input maxlength="300" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" show-word-limit
-                    maxlength="300"
+                    v-model.trim="form.description" autocomplete="off" placeholder="请输入描述"></el-input>
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    type="textarea"
-                    show-word-limit
-                    v-model.trim="form.description"
-                    autocomplete="off"
-                    placeholder="请输入描述"
-                ></el-input>
             </el-form-item>
             <el-form-item label="升级文件:" prop="file">
-                <el-upload
+                <el-upload :limit="1" accept=".bin" :auto-upload="false" :on-change="fileChange" :on-exceed="fileExceed"
-                    :limit="1"
+                    :on-remove="fileRemove" :file-list="fileList">
-                    accept=".bin"
-                    :auto-upload="false"
-                    :on-change="fileChange"
-                    :on-exceed="fileExceed"
-                    :on-remove="fileRemove"
-                    :file-list="fileList"
-                >
                     <el-button type="primary">点击上传</el-button>
                 </el-upload>
             </el-form-item>
@@ -146,7 +86,7 @@ const form = reactive<any>({
     versionAgreement: null,
     versionNo: null,
     versionType: null,
-    crcInfo: null,
+    crc: null,
     description: null,
     versionDate: null,
     type: null,
@@ -161,7 +101,7 @@ const rules = {
     versionAgreement: [{ required: true, message: '请输入协议版本', trigger: 'blur' }],
     versionDate: [{ required: true, message: '请输入版本日期', trigger: 'blur' }],
     description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-    crcInfo: [{ required: true, message: '请输入CRC校验', trigger: 'blur' }],
+    crc: [{ required: true, message: '请输入CRC校验', trigger: 'blur' }],
     file: [{ required: true, message: '请输入升级文件', trigger: 'blur' }]
 }
 const typeChange = () => {
@@ -176,7 +116,7 @@ const devTypeChange = (e: any) => {
     // console.log(e)
     form.devTypeName = formDevModelOptionsFilter.value.filter((item: any) => item.value == e)[0].label
 }
-queryByCode('Device_Type').then(res => {
+queryByCode('Device_Type').then(async res => {
     const id = res.data.id
     queryCsDictTree(id).then(res => {
         devTypeOptions.value = res.data.map((item: any) => {
@@ -203,6 +143,14 @@ queryByCode('Device_Type').then(res => {
     })
     // tableStore.index()
 })
+queryByCode('Direct_Connected_Device').then(res => {
+    queryCsDictTree(res.data.id).then(res => {
+        TypeOptions.value = res.data
+    })
+    queryByid(res.data.id).then(res => {
+        DevTypeAllOptions.value = res.data
+    })
+})
 const formDevModelOptionsFilter = computed(() => {
     return devModelOptions.value.filter((item: any) => {
         if (form.type) {
@@ -246,7 +194,7 @@ const formDevTypeChange = (e: any) => {
 }
 const dialogVisible = ref(false)
 const title = ref('新增版本')
-const open = (text: string, data?: anyObj) => {
+const open = async (text: string, data?: anyObj) => {
     title.value = text
     dialogVisible.value = true
     if (data) {
@@ -264,14 +212,7 @@ const open = (text: string, data?: anyObj) => {
             form[key] = null
         }
     }
-    queryByCode('Direct_Connected_Device').then(res => {
+
-        queryCsDictTree(res.data.id).then(res => {
-            TypeOptions.value = res.data
-        })
-        queryByid(res.data.id).then(res => {
-            DevTypeAllOptions.value = res.data
-        })
-    })
 }
 const submit = () => {
     // console.log(formRef)

src/views/govern/manage/basic/version.vue

@@ -3,18 +3,16 @@
         <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
             <template #select>
                 <el-form-item label="设备型号:">
-                    <el-select v-model.trim="tableStore.table.params.devType" filterable placeholder="请选择设备型号" clearable>
+                    <el-select v-model.trim="tableStore.table.params.devType" filterable placeholder="请选择设备型号"
-                        <el-option
+                        clearable>
-                            v-for="item in DevTypeOptions"
+                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
-                            :key="item.id"
+                            :value="item.id"></el-option>
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
             <template #operation>
                 <el-button :icon="Plus" type="primary" @click="addMenu" class="ml10">新增版本</el-button>
+                <el-button :icon="Back" @click="go(-1)">返回</el-button>
             </template>
         </TableHeader>
         <Table ref="tableRef" />
@@ -27,13 +25,15 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { delCsDictData } from '@/api/system-boot/csDictData'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
 import PopupVersion from '@/views/govern/manage/basic/popupVersion.vue'
-import { Plus } from '@element-plus/icons-vue'
+import { Plus, Back } from '@element-plus/icons-vue'
 import { auditEdData } from '@/api/cs-device-boot/edData'
+import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
 import { getFileUrl, downLoadFile } from '@/api/cs-system-boot/manage'
+import { useRouter } from 'vue-router'
 defineOptions({
     name: 'govern/manage/basic/version'
 })
@@ -42,12 +42,12 @@ const dictData = useDictData()
 const showPopup = ref(false)
 const DevTypeOptions = ref()
 const tableHeaderRef = ref()
-
+const { push, go } = useRouter()
 const tableStore = new TableStore({
     url: '/cs-device-boot/edData/queryEdDataPage',
     method: 'POST',
     column: [
-         {
+        {
             field: 'index',
             title: '序号',
             width: '80',
@@ -55,28 +55,74 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备型号', field: 'devTypeName' ,minWidth: '100'},
+        { title: '设备型号', field: 'devTypeName', minWidth: '100' },
-        { title: '版本号', field: 'versionNo' ,minWidth: '100'},
+        { title: '版本号', field: 'versionNo', minWidth: '100' },
-        { title: '协议版本', field: 'versionAgreement' ,minWidth: '100'},
+        { title: '协议版本', field: 'versionAgreement', minWidth: '100' },
-        { title: '版本日期', field: 'versionDate' ,minWidth: '100'},
+        { title: '版本日期', field: 'versionDate', minWidth: '100' },
-        { title: '归档日期', field: 'updateTime',minWidth: '150' },
+        { title: '归档日期', field: 'updateTime', minWidth: '150' },
-        { title: '描述', field: 'description',minWidth: '200' },
+        { title: '描述', field: 'description', minWidth: '200' },
+        // {
+        //     title: '状态',
+        //     field: 'status',
+        //     render: 'tag',
+        //     minWidth: '80',
+        //     custom: {
+        //         0: 'danger',
+        //         1: 'success'
+        //     },
+        //     replaceValue: {
+        //         0: '禁用',
+        //         1: '启用'
+        //     }
+        // },
         {
-            title: '状态',
+            title: '使用状态',
+            render: 'switch',
+            width: 100,
             field: 'status',
-            render: 'tag',
+            activeText: '启用',
-            minWidth: '80',
+            inactiveText: '禁用',
-            custom: {
+            inactiveValue: '0',
-                0: 'error',
+            activeValue: '1',
-                1: 'success'
+            onChangeField: (row: any, value: any) => {
-            },
+                // console.log("🚀 ~ row:", row)
-            replaceValue: {
+                ElMessageBox.prompt('二次校验密码确认', '', {
-                0: '禁用',
+                    confirmButtonText: '确认',
-                1: '启用'
+                    cancelButtonText: '取消',
+                    customClass: 'customInput',
+                    inputType: 'text',
+                    beforeClose: (action, instance, done) => {
+                        if (action === 'confirm') {
+                            if (instance.inputValue == null) {
+                                return ElMessage.warning('请输入密码')
+                            } else if (instance.inputValue?.length > 32) {
+                                return ElMessage.warning(
+                                    '密码长度不能超过32位,当前密码长度为' + instance.inputValue.length
+                                )
+                            } else {
+                                done()
+                            }
+                        } else {
+                            done()
+                        }
+                    }
+                }).then(({ value }) => {
+                    passwordConfirm(value).then(res => {
+                        auditEdData({
+                            id: row.id,
+                            status: row.status == 0 ? 1 : 0
+                        }).then((res: any) => {
+                            ElMessage.success(row.status == 0 ? '启用成功!' : '禁用成功!')
+                            tableStore.index()
+                        })
+
+                    })
+                })
             }
         },
         {
-            title: '操作', fixed: 'right',
+            title: '操作',
+            fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
@@ -104,50 +150,7 @@ const tableStore = new TableStore({
                         }, 100)
                     }
                 },
-                {
+
-                    name: 'edit',
-                    title: '启用',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status == 1
-                    },
-                    click: row => {
-                        auditEdData({
-                            id: row.id,
-                            status: 1
-                        }).then((res: any) => {
-                            ElMessage.success('启用成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'del',
-                    title: '禁用',
-                    type: 'danger',
-                    icon: 'el-icon-SwitchButton',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定禁用吗？'
-                    },
-                    disabled: row => {
-                        return row.status == 0
-                    },
-                    click: row => {
-                        auditEdData({
-                            id: row.id,
-                            status: 0
-                        }).then((res: any) => {
-                            ElMessage.success('禁用成功')
-                            tableStore.index()
-                        })
-                    }
-                }
             ]
         }
     ],
@@ -177,7 +180,6 @@ queryByCode('Device_Type').then(res => {
 // 下载报告
 const downloadTheReport = (name: string) => {
     getFileUrl(name).then((res: any) => {
-  
         downLoadFile(res.data).then(res => {
             let blob = new Blob([res], {
                 type: 'application/octet-stream'
@@ -209,3 +211,10 @@ const closePopup = () => {
     showPopup.value = false
 }
 </script>
+<style lang="scss">
+.customInput {
+    .el-input__inner {
+        -webkit-text-security: disc !important;
+    }
+}
+</style>

src/views/govern/manage/factory.vue

@@ -3,12 +3,8 @@
         <TableHeader>
             <template v-slot:select>
                 <el-form-item label="关键字筛选">
-                    <el-input
+                    <el-input v-model.trim="tableStore.table.params.searchValue" style="width: 200px" clearable
-                        v-model.trim="tableStore.table.params.searchValue"
+                        placeholder="请输入设备名称/网络设备ID" />
-                        style="width: 200px"
-                        clearable
-                        placeholder="请输入设备名称/网络设备ID"
-                    />
                 </el-form-item>
                 <!-- <el-form-item label="流程阶段">
                     <el-select v-model.trim="tableStore.table.params.process" clearable placeholder="请选择状态">
@@ -18,11 +14,7 @@
                     </el-select>
                 </el-form-item> -->
                 <el-form-item label="物联状态">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.connectStatus" clearable placeholder="请选择物联状态">
-                        v-model.trim="tableStore.table.params.connectStatus"
-                        clearable
-                        placeholder="请选择物联状态"
-                    >
                         <el-option label="已连接" :value="1"></el-option>
                         <el-option label="未连接" :value="0"></el-option>
                     </el-select>
@@ -85,77 +77,40 @@
                 <el-button type="primary" @click="downLoadFile1" class="ml10" icon="el-icon-Download">
                     模版下载
                 </el-button>
-                <el-upload
+                <el-upload style="display: inline-block" action="" accept=".xlsx" class="upload-demo"
-                    style="display: inline-block"
+                    :show-file-list="false" :auto-upload="false" :on-change="bulkImport">
-                    action=""
-                    accept=".xlsx"
-                    class="upload-demo"
-                    :show-file-list="false"
-                    :auto-upload="false"
-                    :on-change="bulkImport"
-                >
                     <el-button type="primary" class="ml10" icon="el-icon-Tickets">批量导入</el-button>
                 </el-upload>
                 <el-button type="primary" class="ml10" @click="add" icon="el-icon-Plus">新增设备</el-button>
-                <el-button
+                <el-button type="primary" class="ml10" icon="el-icon-Download" @click="downLoadQrCode"
-                    type="primary"
+                    :disabled="!showQrCode">
-                    class="ml10"
-                    icon="el-icon-Download"
-                    @click="downLoadQrCode"
-                    :disabled="!showQrCode"
-                >
                     批量下载二维码
                 </el-button>
             </template>
         </TableHeader>
         <Table ref="tableRef" :checkbox-config="checkboxConfig" :key="tableKey" @sort-change="handleSortChange"></Table>
 
-        <el-dialog
+        <el-dialog :title="dialogTitle" v-model.trim="dialogFormVisible" :close-on-click-modal="false"
-            :title="dialogTitle"
+            :before-close="resetForm" draggable width="800px">
-            v-model.trim="dialogFormVisible"
-            :close-on-click-modal="false"
-            :before-close="resetForm"
-            draggable
-            width="800px"
-        >
             <el-form :model="form" label-width="auto" :rules="rules" ref="ruleFormRef" class="form-two">
                 <el-form-item label="设备名称:" prop="name">
-                    <el-input
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" autocomplete="off" clearable
-                        maxlength="32"
+                        placeholder="请输入（项目名称+设备名称）"></el-input>
-                        show-word-limit
-                        v-model.trim="form.name"
-                        autocomplete="off"
-                        clearable
-                        placeholder="请输入（项目名称+设备名称）"
-                    ></el-input>
                 </el-form-item>
                 <el-form-item label="网络设备ID:" prop="ndid" class="top">
-                    <el-input
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.ndid" autocomplete="off"
-                        maxlength="32"
+                        placeholder="请输入"></el-input>
-                        show-word-limit
-                        v-model.trim="form.ndid"
-                        autocomplete="off"
-                        placeholder="请输入"
-                    ></el-input>
                 </el-form-item>
                 <el-form-item label="设备类型:" prop="devType" class="top">
                     <el-select v-model.trim="form.devType" placeholder="请选择" @change="formDevTypeChange" clearable>
-                        <el-option
+                        <el-option v-for="item in formDevTypeOptions" :key="item.value" :label="item.label || item.name"
-                            v-for="item in formDevTypeOptions"
+                            :value="item.value || item.id"></el-option>
-                            :key="item.value"
-                            :label="item.label || item.name"
-                            :value="item.value || item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="设备型号:" prop="devModel" class="top">
                     <el-select v-model.trim="form.devModel" filterable placeholder="请选择" clearable>
-                        <el-option
+                        <el-option v-for="item in formDevModelOptionsFilter" :key="item.value" :label="item.label"
-                            v-for="item in formDevModelOptionsFilter"
+                            :value="item.value"></el-option>
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="通讯协议:" prop="devAccessMethod" class="top">
@@ -165,13 +120,8 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="关联项目:" class="top">
-                    <el-cascader
+                    <el-cascader v-model.trim="form.association" filterable :options="engineeringList" :props="props"
-                        v-model.trim="form.association"
+                        clearable />
-                        filterable
-                        :options="engineeringList"
-                        :props="props"
-                        clearable
-                    />
                 </el-form-item>
                 <el-form-item label="排序:" class="top" prop="sort">
                     <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
@@ -219,7 +169,8 @@ import {
     portableDeviceAccess,
     getExcelTemplate,
     engineeringProject,
-    onlineRegister
+    onlineRegister,
+    resetFactory
 } from '@/api/cs-system-boot/device'
 import html2canvas from 'html2canvas'
 import { fullUrl } from '@/utils/common'
@@ -769,6 +720,22 @@ const tableStore = new TableStore({
                         form.id = row.id
                     }
                 },
+                {
+                    name: 'edit',
+                    title: '重启',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        resetFactory({
+                            nDid: row.ndid
+                        }).then(res => {
+                            ElMessage.success('重启成功!')
+                            tableStore.onTableAction('search', {})
+                        })
+                    }
+                },
                 {
                     name: 'del',
                     title: '删除',
@@ -787,7 +754,7 @@ const tableStore = new TableStore({
                                     tableStore.onTableAction('search', {})
                                 })
                             })
-                            .catch(e => {})
+                            .catch(e => { })
                     }
                 }
             ]
@@ -1018,10 +985,10 @@ onMounted(() => {
         })
     })
 
-    setTimeout(() => {}, 100)
+    setTimeout(() => { }, 100)
 })
 
-const addMenu = () => {}
+const addMenu = () => { }
 </script>
 <style lang="scss" scoped>
 .qrcode-label {

src/views/govern/manage/programVersion/comp/deviceLog.vue

@@ -0,0 +1,88 @@
+<template>
+    <el-dialog v-model="dialogVisible" :title="title" width="800" :close-on-click-modal="false"
+        :before-close="handleClose">
+
+        <!-- 表格区域 -->
+        <div class="table-area" :style="layout1">
+            <vxe-table v-bind="defaultAttribute" :data="tableData" v-loading="loading" height="auto">
+                <vxe-column type="seq" title="序号" width="80" align="center" />
+                <vxe-column field="version" title="版本" min-width="120" align="center" />
+                <vxe-column field="result" title="升级结果" width="120" align="center">
+                    <template #default="{ row }">
+                        <el-tag :type="getResultTagType(row.result)" size="small">
+                            {{ getResultText(row.result) }}
+                        </el-tag>
+                    </template>
+                </vxe-column>
+                <vxe-column field="upgradeTime" title="升级时间" width="180" align="center" />
+                <vxe-column field="upgradeUser" title="升级人" width="120" align="center" />
+            </vxe-table>
+        </div>
+
+
+    </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { ElMessage } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+const layout1 = mainHeight(100, 2)
+// 弹框显示控制
+const dialogVisible = ref(false)
+
+// 表格数据
+const tableData = ref([])
+
+// 加载状态
+const loading = ref(false)
+const title = ref('升级日志')
+// 升级结果标签类型映射
+const getResultTagType = (result) => {
+    const map = {
+        success: 'success',
+        fail: 'danger',
+        processing: 'warning'
+    }
+    return map[result] || 'info'
+}
+
+// 升级结果文本映射
+const getResultText = (result) => {
+    const map = {
+        success: '成功',
+        fail: '失败',
+        processing: '进行中'
+    }
+    return map[result] || result
+}
+
+// 打开弹框
+const open = (row) => {
+     title.value = `${row.name}_升级日志`
+    dialogVisible.value = true
+   
+}
+
+// 加载表格数据
+const loadTableData = async (deviceId) => {
+    loading.value = true
+
+}
+
+// 关闭弹框
+const handleClose = () => {
+    dialogVisible.value = false
+    // 重置数据
+    tableData.value = []
+}
+
+// 暴露方法给父组件
+defineExpose({
+    open
+})
+
+</script>
+
+<style scoped></style>

src/views/govern/manage/programVersion/comp/form.vue

@@ -1,157 +0,0 @@
-<template>
-    <el-dialog class="cn-operate-dialog" width="600px" v-model.trim="dialogVisible" :title="title">
-        <el-form :model="form" class="form-one" label-width="auto" ref="formRef" :rules="rules">
-            <el-form-item label="版本号" prop="substationName">
-                <el-input v-model.trim="form.substationName" placeholder="请输入版本号"></el-input>
-            </el-form-item>
-            <el-form-item label="协议版本" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入协议版本"></el-input>
-            </el-form-item>
-            <el-form-item label="版本日期" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入版本日期"></el-input>
-            </el-form-item>
-            <el-form-item label="设备系列" prop="loadType">
-                <el-select v-model.trim="form.loadType" filterable clearable placeholder="请选择设备系列">
-                    <el-option
-                        v-for="item in DataTypeSelect"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="版本类型" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入版本类型"></el-input>
-            </el-form-item>
-            <el-form-item label="描述" prop="name">
-                <el-input
-                    maxlength="32"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    type="textarea"
-                    show-word-limit
-                    v-model.trim="form.remark"
-                    placeholder="请输入描述"
-                ></el-input>
-            </el-form-item>
-            <el-form-item label="上传升级文件" prop="name">
-                <el-upload
-                    :limit="1"
-                    accept=".bin"
-                    :auto-upload="false"
-                    :on-change="fileChange"
-                    :on-exceed="fileExceed"
-                    :on-remove="fileRemove"
-                    :file-list="fileList"
-                >
-                    <el-button type="primary">点击上传</el-button>
-                </el-upload>
-            </el-form-item>
-            <el-form-item label="CRC校验" prop="name">
-                <el-input v-model.trim="form.name" placeholder="请输入版本日期"></el-input>
-            </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>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import { queryByCode, queryCsDictTree } from '@/api/system-boot/dictTree'
-import { saveUser, updateUser } from '@/api/cs-device-boot/sensitiveLoadMange'
-import { useDictData } from '@/stores/dictData'
-
-const TypeOptions = ref()
-
-const dictData = useDictData()
-const DataTypeSelect = dictData.getBasicData('Interference_Source')
-
-const tableStore = inject('tableStore') as TableStore
-const fileList: any = ref([])
-const formRef = ref()
-const form = reactive<any>({
-    loadType: [],
-    substationName: null,
-    installedCapacity: null,
-    name: null,
-    userAgreementCapacity: null,
-    id: null,
-    sort: 100
-})
-const rules = {
-    substationName: [{ required: true, message: '请输入所属厂站名称', trigger: 'blur' }],
-    name: [{ required: true, message: '请输入敏感用户名称', trigger: 'blur' }],
-    loadType: [{ required: true, message: '请输入请选择敏感负荷类型', trigger: 'blur' }],
-    installedCapacity: [{ required: true, message: '请输入用户协议容量', trigger: 'blur' }],
-    userAgreementCapacity: [{ required: true, message: '请输入装机容量', trigger: 'blur' }],
-    sort: [{ required: true, message: '请输入排序', trigger: 'blur' }]
-}
-
-const dialogVisible = ref(false)
-const title = ref('新增')
-const open = (text: string, data?: anyObj) => {
-    formRef.value?.resetFields()
-    title.value = text
-    dialogVisible.value = true
-    if (data) {
-        for (let key in form) {
-            form[key] = data[key]
-        }
-    } else {
-        for (let key in form) {
-            form[key] = null
-            form.sort = 100
-        }
-    }
-}
-const fileRemove = (e: any) => {
-    form.file = null
-    fileList.value = []
-}
-const fileChange = (e: any) => {
-    if (!beforeUpload(e.raw)) return
-    form.file = e.raw
-    fileList.value = [e.raw]
-}
-const fileExceed = (e: any) => {
-    ElMessage.error('只能上传一个文件')
-}
-// 处理上传前检查
-const beforeUpload = (file: any) => {
-    const isWord = file.name.endsWith('.bin')
-
-    if (!isWord) {
-        ElMessage.error('请上传(.bin)格式文件!')
-        fileList.value = []
-        return false
-    }
-
-    // 校验通过后允许上传，交由 http-request 处理
-    return true
-}
-
-const submit = () => {
-    formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            if (form.id) {
-                await updateUser(form)
-            } else {
-                await saveUser(form)
-            }
-            ElMessage.success('操作成功')
-            tableStore.index()
-            dialogVisible.value = false
-        }
-    })
-}
-
-defineExpose({ open })
-</script>

src/views/govern/manage/programVersion/comp/upgrade.vue

@@ -0,0 +1,114 @@
+<template>
+    <el-dialog draggable width="500px" v-model.trim="dialogVisible" :title="title">
+        <el-form :model="form" class="form-one" label-width="auto" ref="formRef" :rules="rules">
+            <el-form-item label="版本:" prop="edDataId">
+                <el-select v-model.trim="form.edDataId" placeholder="请选择版本" @change="selectChange">
+                    <el-option v-for="item in devList" :disabled="version == item.versionNo"
+                        :label="`${item.devTypeName}_${item.versionNo}_${item.versionAgreement}_${item.versionDate}`"
+                        :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="描述:">
+                <el-input v-model.trim="versionDesc" disabled type="textarea" :rows="3"></el-input>
+            </el-form-item>
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit" :loading="loading">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, inject, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { findByDevTypeId, upgrade } from '@/api/system-boot/dictTree'
+const formRef = ref()
+const dialogVisible = ref(false)
+const title = ref('程序版本')
+const devList: any = ref([])
+const versionDesc = ref('')
+const version = ref('')
+// 表单数据（新增了版本类型、版本描述字段）
+const form = reactive<any>({
+    devId: [],
+    edDataId: '' // 新增：下拉选择版本
+})
+const loading = ref(false)
+// 校验规则（新增两个字段的必填校验）
+const rules = {
+    // 新增校验
+    edDataId: [{ required: true, message: '请选择版本', trigger: 'change' }]
+}
+
+// 打开弹窗
+const open = (data: any) => {
+
+    loading.value = false
+    version.value = data.version
+    form.devId = []
+    form.edDataId = ''
+    versionDesc.value = ''
+
+    getFindByDev(data.devModel)
+    formRef.value?.resetFields()
+    dialogVisible.value = true
+    form.devId = data.id
+}
+// 获取版本
+const getFindByDev = (devModel: string) => {
+    findByDevTypeId({
+        devType: devModel, //'45afe3ad9970785090cd7da27f489c37',
+        pageNum: 1,
+        pageSize: 10000
+    }).then((res: any) => {
+        devList.value = res.data.records
+        if (devList.value.length == 0) {
+            ElMessage.warning('该设备没有可升级的版本!')
+            return
+        } else if (devList.value.length == 1 && devList.value[0].versionNo == version.value) {
+            ElMessage.warning('该设备没有可升级的版本!')
+        }
+
+    })
+}
+// 提交
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            try {
+                ElMessage.info('升级中，请稍等...')
+                loading.value = true
+                upgrade({
+                    devId: form.devId.join(),
+                    edDataId: form.edDataId
+                })
+                    .then(res => {
+                        ElMessage.success('升级成功')
+                        loading.value = false
+                        dialogVisible.value = false
+                    })
+                    .catch(error => {
+                        loading.value = false
+                    })
+            } catch (error) {
+                loading.value = false
+                ElMessage.error('升级失败')
+            }
+        }
+    })
+}
+const selectChange = e => {
+    devList.value.forEach(item => {
+        if (item.id === e) {
+            versionDesc.value = item.description
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/govern/manage/programVersion/comp/versionMaintenance.vue

@@ -1,171 +0,0 @@
-<template>
-    <div class="default-main">
-        <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
-            <template #select>
-                <el-form-item label="关键字筛选">
-                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输入关键字" />
-                </el-form-item>
-
-                <el-form-item label="设备系列">
-                    <el-select
-                        v-model.trim="tableStore.table.params.devType"
-                        filterable
-                        placeholder="请选择设备系列"
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in DevTypeOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button :icon="Plus" type="primary" @click="add">新增</el-button>
-                <el-button :icon="Back" @click="go(-1)">返回</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <!-- 新增 -->
-        <Form ref="formRef" />
-    </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 { ElMessage } from 'element-plus'
-import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
-import { useDictData } from '@/stores/dictData'
-import { Plus, EditPen } from '@element-plus/icons-vue'
-import { useRouter } from 'vue-router'
-import { Back, Setting, Search } from '@element-plus/icons-vue'
-import Form from './form.vue'
-defineOptions({
-    name: 'govern/manage/programVersion'
-})
-const dictData = useDictData()
-const DevTypeOptions = ref()
-const tableHeaderRef = ref()
-const { push, go } = useRouter()
-const formRef = ref()
-const tableStore = new TableStore({
-    url: '/cs-device-boot/edData/queryEdDataPage',
-    method: 'POST',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '设备系列', field: 'devTypeName', minWidth: '100' },
-        { title: '版本号', field: 'versionNo', minWidth: '100' },
-        { title: '协议版本', field: 'versionAgreement', minWidth: '100' },
-        { title: '版本日期', field: 'versionDate', minWidth: '100' },
-        { title: '修改人员', field: 'versionDate', minWidth: '100' },
-        { title: '修改日期', field: 'versionDate', minWidth: '100' },
-
-        { title: '描述', field: 'versionDate', minWidth: '100' },
-        { title: '版本类型', field: 'versionDate', minWidth: '100' },
-
-        {
-            title: '状态',
-            render: 'switch',
-            width: 100,
-            field: 'usageStatus',
-            activeText: '启用',
-            inactiveText: '停用',
-            inactiveValue: '0',
-            activeValue: '1',
-            onChangeField: (row: any, value: any) => {
-                // console.log("🚀 ~ row:", row)
-                // ElMessageBox.prompt('二次校验密码确认', '', {
-                //     confirmButtonText: '确认',
-                //     cancelButtonText: '取消',
-                //     customClass: 'customInput',
-                //     inputType: 'text',
-                //     beforeClose: (action, instance, done) => {
-                //         if (action === 'confirm') {
-                //             if (instance.inputValue == null) {
-                //                 return ElMessage.warning('请输入密码')
-                //             } else if (instance.inputValue?.length > 32) {
-                //                 return ElMessage.warning(
-                //                     '密码长度不能超过32位,当前密码长度为' + instance.inputValue.length
-                //                 )
-                //             } else {
-                //                 done()
-                //             }
-                //         } else {
-                //             done()
-                //         }
-                //     }
-                // }).then(({ value }) => {
-                //     passwordConfirm(value).then(res => {
-                //         editEquipmentDelivery({
-                //             ...row,
-                //             status: row.status == 5 ? 1 : row.status == 6 ? 2 : row.status,
-                //             usageStatus: row.usageStatus == 1 ? 0 : 1
-                //         }).then(res => {
-                //             ElMessage.success(row.usageStatus == 1 ? '设备停用成功！' : '设备启用成功！')
-                //             tableStore.index()
-                //         })
-                //     })
-                // })
-            }
-        },
-
-        {
-            title: '操作',
-            fixed: 'right',
-            align: 'center',
-            width: '120',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '修改',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton'
-                },
-                {
-                    name: 'productSetting',
-                    title: '删除',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton'
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {}
-})
-queryByCode('Device_Type').then(res => {
-    const id = res.data.id
-    queryByid(id).then(res1 => {
-        res1.data.map((item: any, index: any) => {
-            if (item.pid == id) {
-                res1.data.splice(index, 1)
-            }
-        })
-
-        DevTypeOptions.value = res1.data
-    })
-})
-
-tableStore.table.params.devType = ''
-provide('tableStore', tableStore)
-
-const add = () => {
-    formRef.value.open('新增版本')
-}
-onMounted(() => {
-    tableHeaderRef.value.onComSearch()
-})
-</script>

src/views/govern/manage/programVersion/index.vue

@@ -1,77 +1,47 @@
 <template>
     <div class="default-main">
-        <TableHeader ref="tableHeaderRef" :showReset="false" showExport>
+        <TableHeader ref="tableHeaderRef" showExport>
             <template #select>
                 <el-form-item label="关键字筛选">
-                    <el-input v-model="tableStore.table.params.keywords" clearable placeholder="请输入关键字" />
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入设备名称"
+                        style="width:200px" />
                 </el-form-item>
                 <el-form-item label="通讯状态">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.connectStatus" filterable placeholder="请选择通讯状态"
-                        v-model.trim="tableStore.table.params.devType"
+                        clearable>
-                        filterable
+                        <el-option label="中断" :value="0"></el-option>
-                        placeholder="请选择通讯状态"
+                        <el-option label="正常" :value="1"></el-option>
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in DevTypeOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="设备型号">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.devModel" filterable placeholder="请选择设备型号"
-                        v-model.trim="tableStore.table.params.devType"
+                        clearable>
-                        filterable
+                        <el-option v-for="item in DevTypeOptions" :key="item.id" :label="item.name"
-                        placeholder="请选择设备型号"
+                            :value="item.id"></el-option>
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in DevTypeOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备系列">
+                <el-form-item label="icd模型">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.icd" filterable placeholder="请选择设备系列" clearable>
-                        v-model.trim="tableStore.table.params.devType"
+                        <el-option v-for="item in icdList" :key="item.id" :label="item.name"
-                        filterable
+                            :value="item.id"></el-option>
-                        placeholder="请选择设备系列"
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in DevTypeOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="升级设备筛选">
-                    <el-select
+                    <el-select v-model.trim="tableStore.table.params.upgrade" filterable placeholder="请选择升级设备筛选"
-                        v-model.trim="tableStore.table.params.devType"
+                        clearable>
-                        filterable
+                        <el-option label="可升级" :value="1"></el-option>
-                        placeholder="请选择升级设备筛选"
+                        <el-option label="不可升级" :value="0"></el-option>
-                        clearable
-                    >
-                        <el-option
-                            v-for="item in DevTypeOptions"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
-                        ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
             <template #operation>
-                <el-button :icon="EditPen" type="primary" class="ml10" @click="maintenance">终端版本维护</el-button>
+                <el-button :icon="Document" type="primary" class="ml10" @click="maintenance">版本维护</el-button>
-                <el-button :icon="Share" type="primary" class="ml10">批量升级</el-button>
+                <!-- <el-button :icon="Share" type="primary" class="ml10" @click="upgradeVersion">批量升级</el-button> -->
             </template>
         </TableHeader>
-        <Table ref="tableRef" />
+        <Table :checkbox-config="checkboxConfig" ref="tableRef" />
+        <upgrade ref="upgradeRef" />
+        <deviceLog ref="deviceLogRef" />
     </div>
 </template>
 <script setup lang="ts">
@@ -82,20 +52,25 @@ import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage } from 'element-plus'
 import { queryByCode, queryByid } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
-import { Share, EditPen } from '@element-plus/icons-vue'
+import { Share, Document } from '@element-plus/icons-vue'
 import { useRouter } from 'vue-router'
+import upgrade from './comp/upgrade.vue'
+import deviceLog from './comp/deviceLog.vue'
 defineOptions({
     name: 'govern/manage/programVersion'
 })
+const upgradeRef = ref()
+const deviceLogRef = ref()
 const dictData = useDictData()
 const DevTypeOptions = ref()
+const icdList = ref()
 const tableHeaderRef = ref()
 const { push, options, currentRoute } = useRouter()
 const tableStore = new TableStore({
-    url: '/cs-device-boot/edData/queryEdDataPage',
+    url: '/cs-device-boot/EquipmentDelivery/version/page',
     method: 'POST',
     column: [
-        { type: 'checkbox', width: '60' },
+        // { type: 'checkbox', width: '60', },
         {
             field: 'index',
             title: '序号',
@@ -104,36 +79,35 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { title: '设备名称', field: 'devTypeName', minWidth: '100' },
+        { title: '设备名称', field: 'name', minWidth: '150' },
-        { title: '版本号', field: 'versionNo', minWidth: '100' },
+        { title: '版本号', field: 'version', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '协议版本', field: 'versionAgreement', minWidth: '100' },
+        { title: '协议版本', field: 'protocolVersion', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '版本日期', field: 'versionDate', minWidth: '100' },
+        { title: '版本日期', field: 'versionDate', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '设备系列', field: 'versionDate', minWidth: '100' },
+        { title: '设备型号', field: 'devModelName', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '设备型号', field: 'versionDate', minWidth: '100' },
+        { title: 'icd模型', field: 'icd', minWidth: '120', formatter: (row: any) => { return icdList.value.filter(item => item.id == row.cellValue)[0]?.name || '/' } },
-        { title: '供电公司', field: 'versionDate', minWidth: '100' },
+        { title: '所属工程', field: 'associatedEngineering', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
-        { title: '变电站', field: 'versionDate', minWidth: '100' },
+        { title: '所属项目', field: 'associatedProject', minWidth: '120', formatter: (row: any) => { return row.cellValue || '/' } },
         {
             title: '状态',
-            field: 'status',
+            field: 'runStatus',
             render: 'tag',
             minWidth: '80',
             custom: {
-                0: 'error',
+                1: 'danger',
-                1: 'success'
+                2: 'success'
             },
             replaceValue: {
-                0: '禁用',
+                1: '离线',
-                1: '启用'
+                2: '在线'
             }
         },
-        { title: '更新时间', field: 'versionDate', minWidth: '100' },
+        { title: '更新时间', field: 'updateTime', minWidth: '150', formatter: (row: any) => { return row.cellValue || '/' } ,sortable: true},
-        { title: '修改人员', field: 'versionDate', minWidth: '100' },
+        { title: '修改人员', field: 'updateByName', minWidth: '100', formatter: (row: any) => { return row.cellValue || '/' } },
-
         {
             title: '操作',
             fixed: 'right',
             align: 'center',
-            width: '120',
+            width: '130',
             render: 'buttons',
             buttons: [
                 {
@@ -141,43 +115,103 @@ const tableStore = new TableStore({
                     title: '升级',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
-                    render: 'basicButton'
+                    disabled: (row: any) => {
+                        return row.upgrade == 0
+                    },
+                    render: 'basicButton',
+                    click: (row: any) => {
+                        upgradeRef.value.open({
+                            id: [row.id],
+                            devModel: row.devModel,
+                            version:row.version
+
+                        })
+                    }
                 },
                 {
                     name: 'productSetting',
-                    title: '升级日志',
+                    title: '日志',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
-                    render: 'basicButton'
+                    render: 'basicButton',
+                    click: (row: any) => {
+                        deviceLogRef.value.open(row)
+                    }
                 }
             ]
         }
     ],
-    loadCallback: () => {}
+    loadCallback: () => { }
 })
-queryByCode('Device_Type').then(res => {
+const checkboxConfig = reactive({
-    const id = res.data.id
+    checkMethod: ({ row }) => {
-    queryByid(id).then(res1 => {
+        return row.upgrade == 1
-        res1.data.map((item: any, index: any) => {
+    }
-            if (item.pid == id) {
+})
-                res1.data.splice(index, 1)
+const getQuery = async () => {
-            }
+    queryByCode('Device_Type').then(res => {
-        })
+        const id = res.data.id
+        queryByid(id).then(res => {
+            res.data.map((item: any, index: any) => {
+                if (item.pid == id) {
+                    res.data.splice(index, 1)
+                }
+            })
 
-        DevTypeOptions.value = res1.data
+            DevTypeOptions.value = res.data
+        })
     })
-})
+    queryByCode('Icd_Model').then(res => {
+        const id = res.data.id
+        queryByid(id).then(res => {
+            icdList.value = res.data
+        })
+    })
+
+}
+
+// 禁止点击
+
+// 升级版本
+const upgradeVersion = () => {
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择需要升级的设备!')
+        return
+    }
+    // 获取第一个设备的 devModel
+    const firstDevModel = tableStore.table.selection[0].devModel
+
+    // 检查是否所有设备的 devModel 都相同
+    const allSame = tableStore.table.selection.every(device => device.devModel === firstDevModel)
+
+    if (!allSame) {
+        return ElMessage.warning('请选择相同设备型号的设备进行批量升级!')
+    }
+
+    upgradeRef.value.open(
+        {
+            id: tableStore.table.selection.map(item => item.id),
+            devModel: firstDevModel
+
+        }
+    )
+}
 // 版本维护
 const maintenance = () => {
     push({
         // path: '/versionMaintenance'
-        path: '/govern/manage/basic/version'
+        path: '/version'
     })
 }
 
-tableStore.table.params.devType = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.connectStatus = ''
+tableStore.table.params.devModel = ''
+tableStore.table.params.icd = ''
+tableStore.table.params.upgrade = ''
 provide('tableStore', tableStore)
 onMounted(() => {
+    getQuery()
     tableHeaderRef.value.onComSearch()
 })
 </script>

src/views/setting/dictionary/tree/index.vue

@@ -26,6 +26,7 @@ const tableStore = new TableStore({
     showPage:false,
     url: '/system-boot/dictTree/queryTree',
     method: 'GET',
+    publicHeight: 60,
     column: [
         { title: '字典名称', field: 'name', treeNode: true, align: 'left' },
         // { title: '排序', field: 'sort',width:'80'  },

src/views/setting/dictionary/version/index.vue

@@ -14,13 +14,13 @@
         <Table ref="tableRef">
             <template v-slot:columns>
                 <vxe-column
-                    field="AndroidPath"
+                    field="androidPath"
                     title="Android路径"
                     width="250px"
                     v-if="tableStore.table.params.versionType == 'APP'"
                 ></vxe-column>
                 <vxe-column
-                    field="IOSPath"
+                    field="iosPath"
                     title="IOS路径"
                     width="250px"
                     v-if="tableStore.table.params.versionType == 'APP'"
@@ -58,11 +58,11 @@
                         <el-option label="app" value="APP" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="Android路径:" prop="AndroidPath" v-if="form.versionType == 'APP'">
+                <el-form-item label="Android路径:" prop="androidPath" v-if="form.versionType == 'APP'">
-                    <el-input v-model.trim="form.AndroidPath" placeholder="请输入Android路径" />
+                    <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-form-item label="IOS路径:" prop="iosPath" v-if="form.versionType == 'APP'">
-                    <el-input v-model.trim="form.IOSPath" placeholder="请输入IOS路径" />
+                    <el-input v-model.trim="form.iosPath" placeholder="请输入IOS路径" />
                 </el-form-item>
             </el-form>
 
@@ -90,13 +90,13 @@ const form = ref({
     content: '',
     versionType: '',
     sev: '',
-    AndroidPath: '',
+    androidPath: '',
-    IOSPath: ''
+    iosPath: ''
 })
 const rules = {
     appVersion: [{ required: true, message: '请输入版本号', trigger: 'blur' }],
-    AndroidPath: [{ required: true, message: '请输入Android路径', trigger: 'blur' }],
+    androidPath: [{ required: true, message: '请输入Android路径', trigger: 'blur' }],
-    IOSPath: [{ required: true, message: '请输入IOS路径', trigger: 'blur' }]
+    iosPath: [{ required: true, message: '请输入IOS路径', trigger: 'blur' }]
 }
 const formRef = ref()
 const tableStore = new TableStore({
@@ -156,6 +156,8 @@ const addMenu = async () => {
     dialogVisible.value = true
     form.value.appVersion = tableStore.table.data[0].versionName || ''
     form.value.content = ''
+    form.value.iosPath = ''
+    form.value.androidPath = ''
     form.value.sev = tableStore.table.data[0].sev || 0
     form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
 }

vite.config.ts

@@ -27,7 +27,7 @@ export default defineConfig({
                 // target: 'http://192.168.1.122:10215', //gfh
                 // target: 'http://192.168.1.127:10215', //cdf
                 // target: 'http://192.168.1.125:10215',
-                target: 'http://192.168.1.103:10215',
+                target: 'http://192.168.2.124:10215',
                 // target: 'https://pqmcn.com:8092/api', //治理
                 // target:'http://www.zhilitest.com:8089/api',
                 changeOrigin: true,