video_surveillance
/
videoSurveillance
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

Browse Source
dev
Tuzki 2 years ago
parent 0d22d46533
commit e487d0e283
3 changed files with 118 additions and 119 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 216
      ruoyi-ui/src/views/system/management/estate/investor-data/index.vue
  2. 18
      ruoyi-ui/src/views/system/management/ticket-data/ticket-check-flow/index.vue
  3. 3
      ruoyi-ui/src/views/system/management/ticket-data/ticket-check-flow/tickt.js

216
ruoyi-ui/src/views/system/management/estate/investor-data/index.vue
Unescape View File

@ -1,16 +1,17 @@
<template>
<div class="app-container">
<el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
<el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small"
@submit.native.prevent>
<el-form-item label="投资商名称" prop="investorName">
<el-input
v-model="queryParams.investorName"
placeholder="请输入投资商名称"
clearable
placeholder="请输入投资商名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位注册地" prop="registeredSite">
<el-select v-model="queryParams.registeredSite" placeholder="请选择数据分组" clearable>
<el-select v-model="queryParams.registeredSite" clearable placeholder="请选择数据分组">
<el-option
v-for="dict in dict.type.registered_place_of_unit"
:key="dict.value"
@ -20,7 +21,7 @@
</el-select>
</el-form-item>
<el-form-item label="单位性质" prop="unitNature">
<el-select v-model="queryParams.registeredSite" placeholder="请选择数据分组" clearable>
<el-select v-model="queryParams.unitNature" clearable placeholder="请选择数据分组">
<el-option
v-for="dict in dict.type.nature_of_unit"
:key="dict.value"
@ -32,13 +33,13 @@
<el-form-item label="联系人信息" prop="contacts">
<el-input
v-model="queryParams.contacts"
placeholder="请输入联系人姓名"
clearable
placeholder="请输入联系人姓名"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -46,117 +47,124 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
v-hasPermi="['investorData:investorData:add']"
icon="el-icon-plus"
plain
size="mini"
type="primary"
@click="handleAdd"
v-hasPermi="['investorData:investorData:add']"
>新增</el-button>
>新增
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['investorData:investorData:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['investorData:investorData:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['investorData:investorData:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['investorData:investorData:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['investorData:investorData:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="el-icon-download"-->
<!-- size="mini"-->
<!-- @click="handleExport"-->
<!-- v-hasPermi="['investorData:investorData:export']"-->
<!-- >导出</el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="investorDataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column v-if="false" label="主键" align="center" prop="id" />
<el-table-column label="投资商名称" align="center" prop="investorName" >
<el-table-column align="center" type="selection" width="55"/>
<el-table-column v-if="false" align="center" label="主键" prop="id"/>
<el-table-column align="center" label="投资商名称" prop="investorName">
<template slot-scope="scope">
<span>{{ scope.row.investorName || '/' }}</span>
</template>
</el-table-column>
<el-table-column label="单位注册地" align="center" prop="registeredSite" >
<el-table-column align="center" label="单位注册地" prop="registeredSite">
<template slot-scope="scope">
<dict-tag :options="dict.type.registered_place_of_unit" :value="scope.row.registeredSite"></dict-tag>
</template>
</el-table-column>
<el-table-column label="国家名称" align="center" prop="countryName" >
<el-table-column align="center" label="国家名称" prop="countryName">
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.countryName || '中国' }}-->
<!-- </template>-->
<template slot-scope="scope">
{{ scope.row.countryName || '中国' }}
<dict-tag :options="earthCountryOptions" :value="scope.row.countryName"></dict-tag>
<!-- <span>{{ scope.row.countryName | countrysName(earthCountryOptions) }}</span>-->
</template>
</el-table-column>
<el-table-column label="行政区划-省" align="center" prop="province" />
<el-table-column label="行政区划-市" align="center" prop="city" />
<el-table-column label="行政区划-县" align="center" prop="county" />
<el-table-column label="单位性质" align="center" prop="unitNature" >
<el-table-column align="center" label="行政区划-省" prop="province"/>
<el-table-column align="center" label="行政区划-市" prop="city"/>
<el-table-column align="center" label="行政区划-县" prop="county"/>
<el-table-column align="center" label="单位性质" prop="unitNature">
<template slot-scope="scope">
<dict-tag :options="dict.type.nature_of_unit" :value="scope.row.unitNature"/>
</template>
</el-table-column>
<el-table-column label="联系人姓名" align="center" prop="contacts" />
<el-table-column label="联系电话" align="center" prop="telephone" />
<el-table-column label="排序编码" align="center" prop="sort" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column align="center" label="联系人姓名" prop="contacts"/>
<el-table-column align="center" label="联系电话" prop="telephone"/>
<el-table-column align="center" label="排序编码" prop="sort"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template slot-scope="scope">
<el-button
v-hasPermi="['investorData:investorData:edit']"
icon="el-icon-edit"
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['investorData:investorData:edit']"
>修改</el-button>
>修改
</el-button>
<el-button
v-hasPermi="['investorData:investorData:remove']"
icon="el-icon-delete"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['investorData:investorData:remove']"
>删除</el-button>
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
<!-- 添加或修改项目投诉商数据 对话框 -->
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="700px">
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" append-to-body width="700px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="投资商名称" prop="investorName">
<el-input v-model="form.investorName" placeholder="请输入投资商名称" />
<el-input v-model="form.investorName" placeholder="请输入投资商名称"/>
</el-form-item>
<el-form-item label="排序编码" prop="sort">
<el-input v-model="form.sort" placeholder="请输入排序编码" />
<el-input v-model="form.sort" placeholder="请输入排序编码"/>
</el-form-item>
<el-form-item label="单位注册地" prop="registeredSite">
<el-select v-model="form.registeredSite" placeholder="请选择数据分组" clearable>
<el-select v-model="form.registeredSite" clearable placeholder="请选择数据分组">
<el-option
v-for="dict in dict.type.registered_place_of_unit"
:key="dict.value"
@ -202,10 +210,10 @@
</el-select>
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" />
<el-input v-model="form.address" placeholder="请输入详细地址"/>
</el-form-item>
<el-form-item label="单位性质" prop="unitNature">
<el-select v-model="form.unitNature" placeholder="请选择单位性质" clearable>
<el-select v-model="form.unitNature" clearable placeholder="请选择单位性质">
<el-option
v-for="dict in dict.type.nature_of_unit"
:key="dict.value"
@ -215,30 +223,30 @@
</el-select>
</el-form-item>
<el-form-item label="联系人姓名" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入联系人姓名" />
<el-input v-model="form.contacts" placeholder="请输入联系人姓名"/>
</el-form-item>
<el-form-item label="联系电话" prop="telephone">
<el-input v-model="form.telephone" placeholder="请输入联系电话" />
<el-input v-model="form.telephone" placeholder="请输入联系电话"/>
</el-form-item>
<el-form-item label="网址" prop="website">
<el-input v-model="form.website" placeholder="请输入网址" />
<el-input v-model="form.website" placeholder="请输入网址"/>
</el-form-item>
<el-form-item label="主要业务范围" prop="mainBusiness">
<el-input v-model="form.mainBusiness" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.mainBusiness" placeholder="请输入内容" type="textarea"/>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
<el-input v-model="form.remarks" placeholder="请输入内容" type="textarea"/>
</el-form-item>
<!-- <el-form-item label="数据来源 0：接口 1：手工" prop="dataSource">-->
<!-- <el-input v-model="form.dataSource" placeholder="请输入数据来源 0：接口 1：手工" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据状态 0新增 1修改 2删除" prop="delFlag">-->
<!-- <el-input v-model="form.delFlag" placeholder="请输入数据状态 0新增 1修改 2删除" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="企业标识码 数据隔离使用的企业唯一标识" prop="organCode">-->
<!-- <el-input v-model="form.organCode" placeholder="请输入企业标识码 数据隔离使用的企业唯一标识" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据来源 0：接口 1：手工" prop="dataSource">-->
<!-- <el-input v-model="form.dataSource" placeholder="请输入数据来源 0：接口 1：手工" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="数据状态 0新增 1修改 2删除" prop="delFlag">-->
<!-- <el-input v-model="form.delFlag" placeholder="请输入数据状态 0新增 1修改 2删除" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="企业标识码 数据隔离使用的企业唯一标识" prop="organCode">-->
<!-- <el-input v-model="form.organCode" placeholder="请输入企业标识码 数据隔离使用的企业唯一标识" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@ -249,15 +257,23 @@
</template>
<script>
import { listInvestorData, getInvestorData, delInvestorData, addInvestorData, updateInvestorData } from "@/api/investorData/investorData";
import {
listInvestorData,
getInvestorData,
delInvestorData,
addInvestorData,
updateInvestorData
} from "@/api/investorData/investorData";
import tickt from "@/views/system/management/ticket-data/ticket-check-flow/tickt";
export default {
name: "InvestorData",
dicts:['registered_place_of_unit','nature_of_unit'],
mixins:[tickt],
dicts: ['registered_place_of_unit', 'nature_of_unit'],
mixins: [tickt],
data() {
return {change:false,
return {
change: false,
that: this,
// 遮罩层
loading: true,
// 选中数组
@ -300,18 +316,17 @@ export default {
// 表单参数
form: {},
// 表单校验
rules: {
}
rules: {}
};
},
watch:{
'open':{
deep:true,
immediate:true,
handler(val){
if (val == false){
watch: {
'open': {
deep: true,
immediate: true,
handler(val) {
if (val == false) {
this.change = false
}else {
} else {
this.change = true
}
}
@ -376,7 +391,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
@ -420,12 +435,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除项目投诉商数据 编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除项目投诉商数据 编号为"' + ids + '"的数据项？').then(function () {
return delInvestorData(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => {
});
},
/** 导出按钮操作 */
handleExport() {

18
ruoyi-ui/src/views/system/management/ticket-data/ticket-check-flow/index.vue
Unescape View File

@ -373,13 +373,6 @@ export default {
},
created() {
this.getList();
this.getDicts("data_sources").then(response => {
this.sourcesOptions = response.data
})
this.getDicts("in_and_out_direction").then(response => {
this.inAndOutDirectionOption = response.data
})
},
methods: {
/** 查询检票流水数据列表 */
@ -387,17 +380,6 @@ export default {
this.loading = true;
listTicketCheckFlow(this.queryParams).then(response => {
this.ticketCheckFlowList = response.rows;
this.ticketCheckFlowList.forEach((item) => {
if (item.inAndOutDirection === "1") {
item.inAndOutDirection = '进'
} else if (item.inAndOutDirection === '2') {
item.inAndOutDirection = '出'
}else if(item.dataSources === "1"){
item.dataSources = '手动'
}else if(item.dataSources === "2"){
item.dataSources = '接口'
}
})
this.total = response.total;
this.loading = false;
});

3
ruoyi-ui/src/views/system/management/ticket-data/ticket-check-flow/tickt.js
Unescape View File

@ -14,7 +14,7 @@ import { getTouristInfo } from '@/api/marketingdata/pictorialVoice'
import { getAllActivity } from '@/api/marketingdata/marketingActivityDetail'
export default {
dicts:['license_plate_color','task_finish_state','patrol_type','patrol_task_state','electric_fence','check_in_way','channel_type','data_sources','sys_user_sex','payment_method','turnover_type','cutscene_type','car_number_color_dict','vehicle_type','documents_type'],
dicts:['in_and_out_direction','license_plate_color','task_finish_state','patrol_type','patrol_task_state','electric_fence','check_in_way','channel_type','data_sources','sys_user_sex','payment_method','turnover_type','cutscene_type','car_number_color_dict','vehicle_type','documents_type'],
components: { autoSelect },
data() {
return {
@ -559,6 +559,7 @@ export default {
getEarthCountry() {
getEarthCountry().then(value => {
this.earthCountryOptions = value.rows
console.log(this.earthCountryOptions)
})
}
},

Write Preview
Loading…
Cancel
Save