Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-25 0e68368c1df02acb4e96c14b7f4a307d369f1415

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/systemSetting/device/bayonet/create/index.vue
#	src/views/systemSetting/device/bayonet/index.vue

 src/api/system/bayonet.js

@@ -1,7 +1,18 @@
import http from "@/http";
export default {
    getBayonetList: (params) => { return http.get('/sccg/equipment_bayonet/query', params); },
    exportBayonetList: (params) => { return http.downloadFile('/sccg/equipment_bayonet/export', params); },
    addBayonet: (params) => { return http.post('/sccg/equipment_bayonet/addition', params); },
    updateBayonet: (params) => { return http.put('/sccg/equipment_bayonet/modification', params) }
}
    getBayonetList: (params) => {
        return http.get('/sccg/equipment_bayonet/query', params);
    },
    exportBayonetList: (params) => {
        return http.get('/sccg/equipment_bayonet/export', params);
    },
    addBayonet: (params) => {
        return http.post('/sccg/equipment_bayonet/addition', params);
    },
    updateBayonet: (params) => {
        return http.put('/sccg/equipment_bayonet/modification', params)
    },
    deleteBayonet: (id) => {
        return http.delete('/sccg/equipment_bayonet/delete/' + id)
    }
}

 src/views/operate/images/index.vue

@@ -40,7 +40,7 @@
                    @selection-change="tableChange">
                    <el-table-column type="selection" min-width="5">
                    </el-table-column>
                    <el-table-column prop="baseId" label="所属事件编号" min-width="18">
                    <el-table-column prop="code" label="所属事件编号" min-width="18">
                    </el-table-column>
                    <el-table-column prop="category" label="问题类别" min-width="8">
                      <template v-if="scope.row.category" slot-scope="scope">

 src/views/operate/message/myIndex/index.vue

@@ -254,6 +254,7 @@
            startTime: this.datetime ? this.datetime[0] : null,
            endTime: this.datetime ? this.datetime[1] : null
          }
          debugger
          getMessageList(messageParam)
              .then(({ records, total }) => {
                this.tableData = records;