Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr
This commit is contained in:
commit
81bfcb2983
@ -11,7 +11,7 @@ import ThemePicker from "@/components/ThemePicker";
|
||||
export default {
|
||||
name: "App",
|
||||
created() {
|
||||
this.$store.dispatch('LogOut')
|
||||
if (process.env.NODE_ENV !== 'development') this.$store.dispatch('LogOut')
|
||||
},
|
||||
components: { ThemePicker },
|
||||
methods:{
|
||||
|
@ -40,48 +40,48 @@
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
|
||||
>新增
|
||||
>人工新增
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="success"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-edit"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="single"-->
|
||||
<!-- @click="handleUpdate"-->
|
||||
|
||||
>修改
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
<!-- >修改-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="danger"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="multiple"-->
|
||||
<!-- @click="handleDelete"-->
|
||||
|
||||
>删除
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
<!-- >删除-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="warning"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-download"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleExport"-->
|
||||
|
||||
>导出
|
||||
</el-button>
|
||||
</el-col>
|
||||
<!-- >导出-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="godUniversalElectricMeterList" @selection-change="handleSelectionChange">
|
||||
<el-table v-loading="loading" :data="qyzyWorkRedioList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="识别编号" align="center" prop="reserveOne"/>
|
||||
<el-table-column label="识别类型" align="center" prop="reserveTwo"/>
|
||||
@ -215,7 +215,7 @@ export default {
|
||||
reserveThirteen: null,
|
||||
reserveFourteen: null,
|
||||
sysType: null,
|
||||
moduleType: 'regionalPersonnel',
|
||||
moduleType: 'regionalPersonnelImg',
|
||||
dataType: '视频信息'
|
||||
},
|
||||
// 表单参数
|
||||
@ -360,7 +360,7 @@ export default {
|
||||
reserveThirteen: null,
|
||||
reserveFourteen: null,
|
||||
sysType: null,
|
||||
moduleType: 'regionalPersonnel',
|
||||
moduleType: 'regionalPersonnelImg',
|
||||
remark: null
|
||||
}
|
||||
this.resetForm('form')
|
||||
@ -420,7 +420,7 @@ export default {
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids
|
||||
this.$modal.confirm('是否确认删除作业监控视频管理编号为"' + ids + '"的数据项?').then(function () {
|
||||
this.$modal.confirm('是否确认删除重要区域工作人员检测编号为"' + ids + '"的数据项?').then(function () {
|
||||
return delGodUniversalElectricMeter(ids)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
|
Loading…
Reference in New Issue
Block a user