Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr

Browse Source
This commit is contained in:
Tony 2023-12-14 10:32:08 +08:00
commit 81bfcb2983
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
god-ui/src/App.vue
View File

@ -11,7 +11,7 @@ import ThemePicker from "@/components/ThemePicker";
export default { export default {
name: "App", name: "App",
created() { created() {
this.$store.dispatch('LogOut') if (process.env.NODE_ENV !== 'development') this.$store.dispatch('LogOut')
}, },
components: { ThemePicker }, components: { ThemePicker },
methods:{ methods:{

74
god-ui/src/views/aiRecognition/regionalPersonnel/index.vue
View File

@ -40,48 +40,48 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增 >人工新增
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
>修改 <!-- >修改-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="warning" <!-- type="warning"-->
plain <!-- plain-->
icon="el-icon-download" <!-- icon="el-icon-download"-->
size="mini" <!-- size="mini"-->
@click="handleExport" <!-- @click="handleExport"-->
>导出 <!-- >导出-->
</el-button> <!-- </el-button>-->
</el-col> <!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </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 type="selection" width="55" align="center"/>
<el-table-column label="识别编号" align="center" prop="reserveOne"/> <el-table-column label="识别编号" align="center" prop="reserveOne"/>
<el-table-column label="识别类型" align="center" prop="reserveTwo"/> <el-table-column label="识别类型" align="center" prop="reserveTwo"/>
@ -215,7 +215,7 @@ export default {
reserveThirteen: null, reserveThirteen: null,
reserveFourteen: null, reserveFourteen: null,
sysType: null, sysType: null,
moduleType: 'regionalPersonnel', moduleType: 'regionalPersonnelImg',
dataType: '视频信息' dataType: '视频信息'
}, },
// 表单参数 // 表单参数
@ -360,7 +360,7 @@ export default {
reserveThirteen: null, reserveThirteen: null,
reserveFourteen: null, reserveFourteen: null,
sysType: null, sysType: null,
moduleType: 'regionalPersonnel', moduleType: 'regionalPersonnelImg',
remark: null remark: null
} }
this.resetForm('form') this.resetForm('form')
@ -420,7 +420,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids const ids = row.id || this.ids
this.$modal.confirm('是否确认删除作业监控视频管理编号为"' + ids + '"的数据项？').then(function () { this.$modal.confirm('是否确认删除重要区域工作人员检测编号为"' + ids + '"的数据项？').then(function () {
return delGodUniversalElectricMeter(ids) return delGodUniversalElectricMeter(ids)
}).then(() => { }).then(() => {
this.getList() this.getList()