Merge remote-tracking branch 'origin/master'

Junjie

2026-04-11 d1ac0e8f3e6b61f869c9f1cd4eea73056cf3f483

 src/main/webapp/views/tvDevice/tvDevice.html

@@ -157,6 +157,24 @@
                </div>
            </div>

            <div style="margin-bottom: 15px;">
                <el-card shadow="hover">
                    <div slot="header">
                        <span>手动异常信息</span>
                    </div>
                    <el-form label-position="top" size="small">
                        <el-form-item label="异常信息">
                            <el-input type="textarea" v-model="manualError" :rows="3"
                                placeholder="输入需要下发到设备的异常信息"></el-input>
                        </el-form-item>
                        <el-button type="primary" size="small" @click="saveManualError"
                            :loading="manualErrorSaving">保存</el-button>
                        <el-button size="small" @click="clearManualError"
                            :disabled="manualErrorSaving">清空</el-button>
                    </el-form>
                </el-card>
            </div>

            <!-- 表格区域 -->
            <div class="table-section">
                <el-table :data="tableData" border stripe @selection-change="handleSelectionChange" style="width: 100%;"
@@ -222,12 +240,9 @@
                                    <el-select v-model="installForm.taskId" placeholder="请选择已完成的打包任务"
                                        style="width: 100%;" filterable>
                                        <el-option v-for="task in completedTasks" :key="task.id"
                                            :label="task.projectName || task.taskId" :value="task.id"
                                            :label="buildTaskLabel(task)" :value="task.id"
                                            :disabled="!task.apkPath">
                                            <span>{{ task.projectName || task.repoAlias }}</span>
                                            <span style="float: right; color: #909399; font-size: 12px;">
                                                {{ task.apkPath ? '已下载' : '未下载' }}
                                            </span>
                                            <span>{{ buildTaskLabel(task) }}</span>
                                        </el-option>
                                    </el-select>
                                </el-form-item>
@@ -430,7 +445,10 @@
                screenshotImage: '',
                screenshotLoading: false,
                autoRefreshScreenshot: false,
                screenshotTimer: null
                screenshotTimer: null,

                manualError: '',
                manualErrorSaving: false
            },

            computed: {
@@ -449,12 +467,60 @@
                this.loadData();
                this.loadAllDevices();
                this.loadCompletedTasks();
                this.loadManualError();
            },

            methods: {
                // 获取请求头
                getHeaders() {
                    return { 'token': localStorage.getItem('token') };
                },
                loadManualError() {
                    $.ajax({
                        url: baseUrl + '/openapi/manualError/auth',
                        headers: this.getHeaders(),
                        method: 'GET',
                        success: (res) => {
                            if (res.code === 200) {
                                this.manualError = (res.data && res.data.manualError) ? res.data.manualError : '';
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + '/';
                            } else {
                                this.$message.error(res.msg || '加载失败');
                            }
                        },
                        error: () => {
                            this.$message.error('请求失败');
                        }
                    });
                },
                saveManualError() {
                    this.manualErrorSaving = true;
                    $.ajax({
                        url: baseUrl + '/openapi/manualError/auth',
                        headers: this.getHeaders(),
                        method: 'POST',
                        contentType: 'application/json;charset=UTF-8',
                        data: JSON.stringify({ manualError: this.manualError }),
                        success: (res) => {
                            this.manualErrorSaving = false;
                            if (res.code === 200) {
                                this.$message.success('保存成功');
                            } else if (res.code === 403) {
                                top.location.href = baseUrl + '/';
                            } else {
                                this.$message.error(res.msg || '保存失败');
                            }
                        },
                        error: () => {
                            this.manualErrorSaving = false;
                            this.$message.error('请求失败');
                        }
                    });
                },
                clearManualError() {
                    this.manualError = '';
                    this.saveManualError();
                },

                // 加载数据
@@ -951,6 +1017,14 @@
                    this.$message.error('上传失败');
                },

                buildTaskLabel(task) {
                    const name = task.projectName || task.repoAlias || task.taskId || '';
                    const time = this.formatDate(task.createdAt) || '-';
                    const id = task.id != null ? task.id : '';
                    const status = task.apkPath ? '已下载' : '未下载';
                    return `${name} | ID: ${id} | ${time} | ${status}`;
                },

                // 格式化日期
                formatDate(timestamp) {
                    if (!timestamp) return '';
@@ -968,4 +1042,4 @@
    </script>
</body>

</html>
</html>