Browse Source

新增错误查看页面

pull/154/head
wangxy 3 years ago
parent
commit
969c1af959
7 changed files with 249 additions and 156 deletions
  1. BIN
      src/assets/img/look_error.png
  2. +43
    -99
      src/components/queryComponent/index.vue
  3. +72
    -0
      src/components/queryComponent/lookError.vue
  4. +6
    -0
      src/router/plan.js
  5. +108
    -0
      src/views/plan/workbench/lookError/index.vue
  6. +15
    -52
      src/views/system/oneimport/addOrEdit.vue
  7. +5
    -5
      src/views/system/oneimport/index.vue

BIN
src/assets/img/look_error.png View File

Before After
Width: 24  |  Height: 24  |  Size: 1.6 KiB

+ 43
- 99
src/components/queryComponent/index.vue View File

@ -1,6 +1,15 @@
<template>
<div v-if="isShowComponent" class="handle-right-fixed clearfix">
<img v-if="isShowAddButton && permissions()['bulkimport']" @click="handleUpload" src="../../assets/img/import.png" alt="" title="批量导入">
<!-- <img
v-if="isShowAddButton"
@click="handleSeeError"
src="../../assets/img/look_error.png" alt="" title="查看错误"> -->
<img
v-if="isShowAddButton && permissions()['bulkimport']"
@click="handleUpload"
src="../../assets/img/import.png"
alt=""
title="批量导入">
<el-popover
placement="left"
:width="400"
@ -11,33 +20,11 @@
<img :src="notalReadyPic" alt="" title="检索条件">
</template>
<div class="predict-search-container">
<!-- <el-select v-if="isShowAddButton"
v-model="valid"
style="width: 300px;margin-bottom:10px;"
placeholder="请选择是否有效" >
<el-option
v-for="item in validArrray"
:key="item['value']"
:label="item['label']"
:value="item['value']">
</el-option>
</el-select> -->
<div v-if="isShowAddButton" style="height: 40px;">
<span style="margin-right:10px;">是否有效</span>
<el-radio v-model="valid" label="true">有效</el-radio>
<el-radio v-model="valid" label="false">无效</el-radio>
</div>
<!-- <el-select v-if="isShowAddButton"
v-model="status"
style="width: 300px;margin-bottom:10px;"
placeholder="请选择是否发布" >
<el-option
v-for="item in releaseArrray"
:key="item['value']"
:label="item['label']"
:value="item['value']">
</el-option>
</el-select> -->
<div v-if="isShowAddButton" style="height: 40px;">
<span style="margin-right:10px;">是否发布</span>
<el-radio v-model="status" label="0">未发布</el-radio>
@ -62,63 +49,34 @@
</div>
</div>
</el-popover>
<!-- <el-dropdown v-if="isDropdown" trigger="click" @visible-change="handleCommand">
<span class="el-dropdown-link">
<img :src="notalReadyPic" alt="" title="检索条件">
</span>
<template #dropdown>
<div class="predict-search-container">
<el-select v-if="isShowAddButton"
v-model="valid"
style="width: 150px;margin-right:10px;"
placeholder="请选择是否有效" >
<el-option
v-for="item in validArrray"
:key="item['value']"
:label="item['label']"
:value="item['value']">
</el-option>
</el-select>
<el-select v-if="isShowAddButton"
v-model="status"
style="width: 150px;margin-right:10px;"
placeholder="请选择是否发布" >
<el-option
v-for="item in releaseArrray"
:key="item['value']"
:label="item['label']"
:value="item['value']">
</el-option>
</el-select>
<el-input
v-if="isShowAddButton"
v-model="VersionID"
placeholder="检索条件:版本号"
clearable
style="width: 200px;margin-right:10px;"
/>
<el-input
v-model="SearchId"
:placeholder="isShowAddButton ? '检索条件:零件号' : '检索条件:零件号/版本号'"
clearable
style="width: 200px"
/>
<el-button icon="el-icon-search" size="mini" class="search-button-style" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" class="reset-button-style" @click="resetQuery">重置</el-button>
</div>
</template>
</el-dropdown> -->
<img v-if="isShowAddButton && permissions()['add']" @click="handleNew" src="../../assets/img/add.png" alt="" title="新增">
<img v-if="isShowAddButton && permissions()['blukSave']" @click="batchHandle" src="../../assets/icon/batch.png" alt="" title="批量发布">
<img v-if="isShowAddButton && permissions()['issueglobal']" @click="releaseAllHandle" src="../../assets/icon/public.png" alt="" title="全局发布">
<img v-if="isShowAddButton && permissions()['removeIssue']" @click="contraryReleaseAll" src="../../assets/icon/unpublish.png" alt="" title="全局反发布">
<img
v-if="isShowAddButton && permissions()['add']"
@click="handleNew"
src="../../assets/img/add.png" alt="" title="新增">
<img
v-if="isShowAddButton && permissions()['blukSave']"
@click="batchHandle"
src="../../assets/icon/batch.png" alt="" title="批量发布">
<img
v-if="isShowAddButton && permissions()['issueglobal']"
@click="releaseAllHandle"
src="../../assets/icon/public.png" alt="" title="全局发布">
<img
v-if="isShowAddButton && permissions()['removeIssue']"
@click="contraryReleaseAll"
src="../../assets/icon/unpublish.png" alt="" title="全局反发布">
<img v-if="isDownload" @click="download" src="../../assets/img/download.png" alt="" title="下载">
<!-- 上传 -->
<uploadTemplate
v-if="isShowDialog === 'upload'"
:item="item"
v-model:isShowDialog="isShowDialog"
@editCallBack="completeCallBack" />
<uploadTemplate
v-if="isShowDialog === 'upload'"
:item="item"
v-model:isShowDialog="isShowDialog"
@editCallBack="completeCallBack" />
<lookError
v-if="isShowDialog === 'error'"
:item="item"
v-model:isShowDialog="isShowDialog"
@editCallBack="completeCallBack" />
</div>
</template>
@ -126,10 +84,12 @@
import { put, post } from "@/server/api.js";
// isShowAddButton:
import uploadTemplate from "./upload.vue";
import lookError from "./lookError.vue";
export default {
name: "QueryComponent",
components: {
uploadTemplate
uploadTemplate,
lookError
},
props: ["isShowComponent", "isShowAddButton","customerId","CreateModel", 'isDownload', 'isDropdown',"batchImport"],
data() {
@ -142,26 +102,6 @@ export default {
valid: undefined,
status: undefined,
isShowDialog: '',
validArrray: [
{
label: '有效',
value: true
},
{
label: '无效',
value: false
}
],
releaseArrray: [
{
label: '未发布',
value: '0'
},
{
label: '已发布',
value: '1'
}
],
}
},
methods: {
@ -235,6 +175,10 @@ export default {
download(){
this.$emit('download', '')
},
//
handleSeeError() {
this.isShowDialog = 'error'
},
//
handleNew() {
if (!this.customerId) {


+ 72
- 0
src/components/queryComponent/lookError.vue View File

@ -0,0 +1,72 @@
<template>
<el-dialog
:title="title"
custom-class="look-error-wrapper"
model-value fullscreen
:close-on-click-modal="false"
:before-close="cancel">
<el-table
:data="tableData"
v-loading="loading"
size="mini"
style="width: 100%"
border
height="500px"
>
<el-table-column
v-for="(item, index) in headers"
:key="index"
:label="getColumnName(item)"
:show-overflow-tooltip="true"
>
<template #default="scope">
<span>{{ scope.row[item] }}</span>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
v-show="pagination.total > 0"
v-model:pagination="pagination"
@change="getList"
/>
</el-dialog>
</template>
<script>
import { ListMixin } from "@/mixins/ListMixin";
export default {
name: 'editField',
mixins: [ListMixin],
props: {
item: {
default: null,
}
},
data() {
return {
title: '查看错误', //
queryTableDataUrl: "/admin/ap/errordatalst/query",
headers: [
"AP_ErrorDatalst-Id",
"AP_ErrorDatalst-ErrorInfo",
"AP_ErrorDatalst-ErrorType",
"AP_ErrorDatalst-ErrorStatus",
"AP_ErrorDatalst-TargetSource",
"AP_ErrorDatalst-LastModify",
"AP_ErrorDatalst-LastUser",
"AP_ErrorDatalst-CreateTime",
], //
}
},
methods: {
cancel() { //
this.$emit('update:isShowDialog','')
},
}
}
</script>
<style lang="less">
.look-error-wrapper {
height: 100%;
}
</style>

+ 6
- 0
src/router/plan.js View File

@ -48,6 +48,12 @@ const plant = {
title: "原材料需求差异分析",
component: () => import("@/views/plan/workbench/materialAnalysis"),
},
{
icon: "el-icon-document",
path: "/plan/workbench/lookError",
title: "错误查看",
component: () => import("@/views/plan/workbench/lookError"),
},
]
},
],


+ 108
- 0
src/views/plan/workbench/lookError/index.vue View File

@ -0,0 +1,108 @@
<template>
<div ref="tableRef" class="table-height-wrap">
<SearchTemplate>
<el-form :inline="true" class="clearfix search-content">
<el-form-item :label="getColumnName('AP_ErrorDatalst-Id')">
<el-input
v-model.trim="queryParams.Id"
placeholder="请输入查询内容"
clearable
style="width: 240px"
/>
</el-form-item>
<el-form-item>
<el-button
icon="el-icon-search"
size="mini"
class="search-button-style"
@click="handleQuery"
>搜索</el-button
>
<el-button
icon="el-icon-refresh"
size="mini"
class="reset-button-style"
@click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
</SearchTemplate>
<ContentContainer>
<el-table
:data="tableData"
v-loading="loading"
size="mini"
style="width: 100%"
border
v-if="tableHeight"
:height="tableHeight"
>
<el-table-column
v-for="(item, index) in headers"
:key="index"
:label="getColumnName(item)"
:show-overflow-tooltip="true"
>
<template #default="scope">
<span>{{ scope.row[item] }}</span>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
v-show="pagination.total > 0"
v-model:pagination="pagination"
@change="getList"
/>
</ContentContainer>
</div>
</template>
<script>
import { ListMixin } from "@/mixins/ListMixin";
export default {
mixins: [ListMixin],
data() {
return {
queryTableDataUrl: "/admin/ap/errordatalst/query",
headers: [
"AP_ErrorDatalst-Id",
"AP_ErrorDatalst-ErrorInfo",
"AP_ErrorDatalst-ErrorType",
"AP_ErrorDatalst-ErrorStatus",
"AP_ErrorDatalst-TargetSource",
"AP_ErrorDatalst-LastModify",
"AP_ErrorDatalst-LastUser",
"AP_ErrorDatalst-CreateTime",
], //
tableHeight: 0,
};
},
methods: {
//
handleQuery() {
this.pagination.pageNumber = 1;
this.getList();
},
//
resetQuery() {
this.queryParams.Id = undefined;
this.handleQuery();
},
},
mounted() {
this.$nextTick(() => {
this.tableHeight = this.calculationTableHeight(
this.$refs.tableRef,
120
);
})
}
};
</script>
<style lang="less" scoped>
.table-height-wrap {
height: 100%;
overflow: hidden;
}
</style>

+ 15
- 52
src/views/system/oneimport/addOrEdit.vue View File

@ -34,25 +34,10 @@
</el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-ScriptType')">
<el-input v-model="formData['Script-ScriptType']" placeholder="请输入" />
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-FilePath')">
<el-input v-model="formData['Script-FilePath']" placeholder="请输入" />
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item :label="getColumnName('Script-UseHead')">
<el-input-number v-model="formData['Script-UseHead']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="getColumnName('Script-ClearTable')">
<el-input-number v-model="formData['Script-ClearTable']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="getColumnName('Script-StartRow')">
@ -64,31 +49,26 @@
<el-input-number v-model="formData['Script-StartCol']" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="getColumnName('Script-AppendNewRecord')">
<el-input-number v-model="formData['Script-AppendNewRecord']" placeholder="请输入" />
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-ClearTable']">{{getColumnName('Script-ClearTable')}}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="getColumnName('Script-UpdateRecord')">
<el-input-number v-model="formData['Script-UpdateRecord']" placeholder="请输入" />
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-AppendNewRecord']">{{getColumnName('Script-AppendNewRecord')}}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="getColumnName('Script-AppendAndUpdateRecord')">
<el-input-number v-model="formData['Script-AppendAndUpdateRecord']" placeholder="请输入" />
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-UpdateRecord']">{{getColumnName('Script-UpdateRecord')}}</el-checkbox>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-CallSpecFunc')">
<el-input-number v-model="formData['Script-CallSpecFunc']" placeholder="请输入" />
<el-col :span="6">
<el-form-item>
<el-checkbox v-model="formData['Script-AppendAndUpdateRecord']">{{getColumnName('Script-AppendAndUpdateRecord')}}</el-checkbox>
</el-form-item>
</el-col> -->
<!-- <el-col :span="8">
<el-form-item :label="getColumnName('Script-CallFunction')">
<el-input v-model="formData['Script-CallFunction']" placeholder="请输入" />
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="24">
<el-table
style="width: 100%;margin-bottom:10px;"
@ -111,16 +91,6 @@
<el-input v-model="scope.row['ScriptItem-ColName']" clearable placeholder="请输入" />
</template>
</el-table-column>
<!-- <el-table-column :label="getColumnName('ScriptItem-RowNo')">
<template #default="scope">
<el-input-number v-model="scope.row['ScriptItem-RowNo']" clearable placeholder="请输入" />
</template>
</el-table-column>
<el-table-column :label="getColumnName('ScriptItem-RowName')">
<template #default="scope">
<el-input v-model="scope.row['ScriptItem-RowName']" clearable placeholder="请输入" />
</template>
</el-table-column> -->
<el-table-column :label="getColumnName('ScriptItem-ColFieldType')">
<template #default="scope">
<el-input v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
@ -136,9 +106,6 @@
<el-input v-model="scope.row['ScriptItem-DefaultValue']" clearable placeholder="请输入" />
</template>
</el-table-column>
<el-table-column align="center" width="100">
<template #header>
<el-button
@ -166,12 +133,8 @@
<el-button
type="primary"
class="dialog-submit-button"
@click="submitForm"
> </el-button
>
<el-button class="dialog-cancel-button" @click="cancel"
> </el-button
>
@click="submitForm"> </el-button>
<el-button class="dialog-cancel-button" @click="cancel"> </el-button>
</div>
</template>
</el-dialog>


+ 5
- 5
src/views/system/oneimport/index.vue View File

@ -97,11 +97,11 @@
@setIsAddOrEdit="setIsAddOrEdit"
/>
<!-- 上传 -->
<uploadTemplate
v-if="isShowDialog === 'upload'"
:item="item"
v-model:isShowDialog="isShowDialog"
@editCallBack="completeCallBack" />
<uploadTemplate
v-if="isShowDialog === 'upload'"
:item="item"
v-model:isShowDialog="isShowDialog"
@editCallBack="completeCallBack" />
</div>
</template>
<script>


Loading…
Cancel
Save