master
fanluyan 2 years ago
parent dba1b1f602
commit 4963000700

@ -90,6 +90,15 @@ export function getAlarmList(data) {
data, data,
}); });
} }
//获取告警label
export function getAlarmTypeList(data) {
return request({
url: "/api/getAlarmTypeList",
method: "post",
data,
});
}
//已读未读 //已读未读
export function readAlarm(data) { export function readAlarm(data) {
return request({ return request({

@ -43,12 +43,12 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="告警原因" class="gjbox"> <el-form-item label="告警原因" class="gjbox">
<el-select v-model="formdata.warnCause"> <el-select v-model="formdata.label">
<el-option <el-option
v-for="item in gjOptions" v-for="item in gjOptions"
:key="item.id" :key="item.label"
:label="item.name" :label="item.name"
:value="item.id" :value="item.label"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -186,6 +186,7 @@
import { import {
getSearchInfo, getSearchInfo,
getAlarmList, getAlarmList,
getAlarmTypeList,
getLatestPhotoJoggle, getLatestPhotoJoggle,
getReturnedPhotoJoggle, getReturnedPhotoJoggle,
readAlarm, readAlarm,
@ -197,12 +198,12 @@ export default {
dyOptions: [{ id: 0, name: "全部" }], // dyOptions: [{ id: 0, name: "全部" }], //
xlOptions: [{ id: 0, name: "全部" }], //线 xlOptions: [{ id: 0, name: "全部" }], //线
gtOptions: [{ id: 0, name: "全部" }], // gtOptions: [{ id: 0, name: "全部" }], //
gjOptions: [{ id: 0, name: "全部" }], // gjOptions: [{ id: 0, label: -1, name: "全部" }], //
formdata: { formdata: {
dyId: "", dyId: "",
lineId: "", lineId: "",
towerId: "", towerId: "",
warnCause: "", label: "",
timeVal: "", timeVal: "",
}, },
photoPic: "", photoPic: "",
@ -276,11 +277,13 @@ export default {
}, },
// //
getSearchgj() { getSearchgj() {
getSearchInfo({ type: 1, id: this.formdata.lineId }) getAlarmTypeList()
.then((res) => { .then((res) => {
this.gjOptions = [{ id: 0, name: "全部" }]; this.gjOptions = [{ id: 0, label: -1, name: "全部" }];
this.gjOptions = this.gjOptions.concat(res.data.list); this.gjOptions = this.gjOptions.concat(res.data.list);
this.formdata.warnCause = this.gjOptions[0].id; console.log(this.gjOptions);
this.formdata.label = this.gjOptions[0].label;
console.log(this.formdata.label);
}) })
.catch((err) => {}); .catch((err) => {});
}, },
@ -297,7 +300,6 @@ export default {
this.tableData = res.data.list; this.tableData = res.data.list;
this.total = res.data.total; this.total = res.data.total;
this.photoPic = res.data.list[0].path; this.photoPic = res.data.list[0].path;
this.selectRow = res.data.list[0]; this.selectRow = res.data.list[0];
console.log(this.selectRow); console.log(this.selectRow);
this.drawline(this.selectRow); this.drawline(this.selectRow);

@ -97,7 +97,7 @@
>--{{ >--{{
item.alias !== null && item.alias !== "" item.alias !== null && item.alias !== ""
? item.alias ? item.alias
: item.channnelname : item.channelName
}}</span }}</span
> >
</p> </p>

@ -28,11 +28,11 @@ module.exports = defineConfig({
proxy: { proxy: {
"/api": { "/api": {
//表示拦截以/api开头的请求路径 //表示拦截以/api开头的请求路径
//target: "http://47.96.238.157:8093", //阿里云服务器环境 target: "http://47.96.238.157:8093", //阿里云服务器环境
target: "http://180.166.218.222:40080", //dell // target: "http://180.166.218.222:40080", //dell
changOrigin: true, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {
"^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的 "^/api": "", //重写api把api变成空字符因为我们真正请求的路径是没有api的
}, },
}, },
}, },

Loading…
Cancel
Save