role1.0
fanluyan 1 year ago
parent b3a60b2240
commit 3a527fbb18

@ -154,7 +154,7 @@ export default {
created() { created() {
getdyListJoggle().then((res) => { getdyListJoggle().then((res) => {
console.log(res); console.log(res);
this.dyOptions = res.data.list; this.dyOptions = res.data;
console.log(this.dyOptions); console.log(this.dyOptions);
}); });
}, },

@ -48,7 +48,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dyLevelname" prop="dyLevelName"
label="电压等级名称" label="电压等级名称"
show-overflow-tooltip show-overflow-tooltip
min-width="120" min-width="120"

@ -39,8 +39,8 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="装置ID" prop="cmdId"> <el-form-item label="装置ID" prop="cmdid">
<el-input v-model="formInfo.cmdId" autocomplete="on"></el-input> <el-input v-model="formInfo.cmdid" autocomplete="on"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="装置类型:" prop="devType"> <el-form-item label="装置类型:" prop="devType">
<el-select v-model="formInfo.devType" placeholder="请选择"> <el-select v-model="formInfo.devType" placeholder="请选择">
@ -274,7 +274,7 @@ export default {
], ],
protocolOptions: [], // protocolOptions: [], //
rules: { rules: {
cmdId: [ cmdid: [
{ required: true, message: "请输入装置ID", trigger: "blur" }, { required: true, message: "请输入装置ID", trigger: "blur" },
{ validator: validCmid, trigger: "blur" }, { validator: validCmid, trigger: "blur" },
], ],
@ -306,7 +306,7 @@ export default {
return (this.formInfo = { return (this.formInfo = {
lineId: "", lineId: "",
towerId: "", towerId: "",
cmdId: "", cmdid: "",
equipName: "", equipName: "",
devType: this.devTypeOptions[0].id, devType: this.devTypeOptions[0].id,
hasPan: this.hasPanOptions[0].id, hasPan: this.hasPanOptions[0].id,
@ -399,7 +399,7 @@ export default {
// displayName: this.formInfo.cmdId, // displayName: this.formInfo.cmdId,
// }; // };
this.$set(this.formInfo, "workingDate", new Date().getTime()); this.$set(this.formInfo, "workingDate", new Date().getTime());
this.$set(this.formInfo, "displayName", this.formInfo.cmdId); this.$set(this.formInfo, "displayName", this.formInfo.cmdid);
console.log(this.formInfo); console.log(this.formInfo);
addTerminalJoggle(this.formInfo) addTerminalJoggle(this.formInfo)
.then((res) => { .then((res) => {

@ -130,7 +130,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cmdId" prop="cmdid"
label="设备编号" label="设备编号"
show-overflow-tooltip show-overflow-tooltip
min-width="150" min-width="150"
@ -263,13 +263,6 @@
@click.native.stop="handleDelete(scope.row)" @click.native.stop="handleDelete(scope.row)"
>删除</el-button >删除</el-button
> >
<!-- <el-button
type="text"
class="deleteText"
@click.native.stop="handleOpen(scope.row)"
v-if="scope.row.status == 0"
>打开</el-button
> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="180" v-else> <el-table-column fixed="right" label="操作" width="180" v-else>
@ -607,7 +600,7 @@ export default {
this.$message({ this.$message({
duration: 1500, duration: 1500,
type: "success", type: "success",
message: "关闭成功!", message: "删除成功!",
showClose: true, showClose: true,
}); });
}) })

@ -18,6 +18,7 @@
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
value-format="timestamp"
:picker-options="pickerOptions" :picker-options="pickerOptions"
@change="changedate" @change="changedate"
@focus="handleDateFocus" @focus="handleDateFocus"
@ -291,7 +292,7 @@ export default {
}, },
// //
changedate() { changedate() {
console.log(this.dateValue.getTime()); console.log(this.dateValue);
this.$parent.getPhotoList( this.$parent.getPhotoList(
this.selectChannelValue, this.selectChannelValue,
this.dateValue, this.dateValue,

@ -266,6 +266,7 @@ export default {
"starttime", "starttime",
new Date(new Date().toLocaleDateString()).getTime() new Date(new Date().toLocaleDateString()).getTime()
); );
this.getSearchdy(); this.getSearchdy();
} else { } else {
this.getSearchdy(); this.getSearchdy();
@ -274,7 +275,7 @@ export default {
this.formdata.towerid = this.$route.query.towerId; this.formdata.towerid = this.$route.query.towerId;
this.formdata.channelid = this.$route.query.channelId; this.formdata.channelid = this.$route.query.channelId;
this.formdata.termid = this.$route.query.termId; this.formdata.termid = this.$route.query.termId;
this.$set(this.formdata, "starttime", this.$route.query.date); this.$set(this.formdata, "starttime", Number(this.$route.query.date));
} }
}, },
methods: { methods: {
@ -370,7 +371,7 @@ export default {
this.loading = true; this.loading = true;
this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pageindex", this.page);
this.$set(this.formdata, "pagesize", this.pageSize); this.$set(this.formdata, "pagesize", this.pageSize);
console.log(this.formdata);
getRealtimePhoto(this.formdata) getRealtimePhoto(this.formdata)
.then((res) => { .then((res) => {
this.picList = []; this.picList = [];

Loading…
Cancel
Save