|
@@ -19,14 +19,14 @@
|
|
@click="toEngine"
|
|
@click="toEngine"
|
|
></i>
|
|
></i>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
-<!-- 工程机多帐号-->
|
|
|
|
-<!-- <el-tooltip effect="dark" content="家用工程机登录" placement="bottom">-->
|
|
|
|
-<!-- <i-->
|
|
|
|
-<!-- class="el-icon-s-platform"-->
|
|
|
|
-<!-- style="font-size: 24px; line-height: 50px"-->
|
|
|
|
-<!-- @click="openEngineAccount"-->
|
|
|
|
-<!-- ></i>-->
|
|
|
|
-<!-- </el-tooltip>-->
|
|
|
|
|
|
+ <!-- 工程机多帐号-->
|
|
|
|
+ <!-- <el-tooltip effect="dark" content="家用工程机登录" placement="bottom">-->
|
|
|
|
+ <!-- <i-->
|
|
|
|
+ <!-- class="el-icon-s-platform"-->
|
|
|
|
+ <!-- style="font-size: 24px; line-height: 50px"-->
|
|
|
|
+ <!-- @click="openEngineAccount"-->
|
|
|
|
+ <!-- ></i>-->
|
|
|
|
+ <!-- </el-tooltip>-->
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<el-badge
|
|
<el-badge
|
|
@@ -96,53 +96,53 @@
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
-<!-- 工程机多帐号-->
|
|
|
|
-<!-- <el-dialog-->
|
|
|
|
-<!-- title="绑定工程机系统"-->
|
|
|
|
-<!-- :visible.sync="dialogFormVisible"-->
|
|
|
|
-<!-- :modal="false"-->
|
|
|
|
-<!-- width="60%"-->
|
|
|
|
-<!-- >-->
|
|
|
|
-<!-- <el-form ref="engineForm" :model="engineForm">-->
|
|
|
|
-<!-- <el-row v-for="(row, index) in engineForm.engineList" :key="row.id" :gutter="20">-->
|
|
|
|
-<!-- <el-col :span="8">-->
|
|
|
|
-<!-- <el-form-item-->
|
|
|
|
-<!-- :label="'账号' + (index+1)"-->
|
|
|
|
-<!-- :label-width="formLabelWidth"-->
|
|
|
|
-<!-- :prop="'engineList.' + index + '.enginUserName'"-->
|
|
|
|
-<!-- :rules="{required: true, message: '请输入工程机账号', trigger: 'blur'}"-->
|
|
|
|
-<!-- >-->
|
|
|
|
-<!-- <el-input v-model="row.enginUserName" placeholder="请输入账号" autocomplete="off"></el-input>-->
|
|
|
|
-<!-- </el-form-item>-->
|
|
|
|
-<!-- </el-col>-->
|
|
|
|
-<!-- <el-col :span="8">-->
|
|
|
|
-<!-- <el-form-item-->
|
|
|
|
-<!-- :label="'密码' + (index+1)"-->
|
|
|
|
-<!-- :label-width="formLabelWidth"-->
|
|
|
|
-<!-- :prop="'engineList.' + index + '.enginPassword'"-->
|
|
|
|
-<!-- :rules="{required: true, message: '请输入工程机密码', trigger: 'blur'}"-->
|
|
|
|
-<!-- >-->
|
|
|
|
-<!-- <el-input v-model="row.enginPassword" placeholder="请输入密码" autocomplete="off" show-password></el-input>-->
|
|
|
|
-<!-- </el-form-item>-->
|
|
|
|
-<!-- </el-col>-->
|
|
|
|
-<!-- <el-col :span="8">-->
|
|
|
|
-<!-- <template v-if="row.adminUserId">-->
|
|
|
|
-<!-- <el-button @click="submitForm(index)">重验</el-button>-->
|
|
|
|
-<!-- </template>-->
|
|
|
|
-<!-- <template v-else>-->
|
|
|
|
-<!-- <el-button @click="submitForm(index)">验证</el-button>-->
|
|
|
|
-<!-- </template>-->
|
|
|
|
|
|
+ <!-- 工程机多帐号-->
|
|
|
|
+ <!-- <el-dialog-->
|
|
|
|
+ <!-- title="绑定工程机系统"-->
|
|
|
|
+ <!-- :visible.sync="dialogFormVisible"-->
|
|
|
|
+ <!-- :modal="false"-->
|
|
|
|
+ <!-- width="60%"-->
|
|
|
|
+ <!-- >-->
|
|
|
|
+ <!-- <el-form ref="engineForm" :model="engineForm">-->
|
|
|
|
+ <!-- <el-row v-for="(row, index) in engineForm.engineList" :key="row.id" :gutter="20">-->
|
|
|
|
+ <!-- <el-col :span="8">-->
|
|
|
|
+ <!-- <el-form-item-->
|
|
|
|
+ <!-- :label="'账号' + (index+1)"-->
|
|
|
|
+ <!-- :label-width="formLabelWidth"-->
|
|
|
|
+ <!-- :prop="'engineList.' + index + '.enginUserName'"-->
|
|
|
|
+ <!-- :rules="{required: true, message: '请输入工程机账号', trigger: 'blur'}"-->
|
|
|
|
+ <!-- >-->
|
|
|
|
+ <!-- <el-input v-model="row.enginUserName" placeholder="请输入账号" autocomplete="off"></el-input>-->
|
|
|
|
+ <!-- </el-form-item>-->
|
|
|
|
+ <!-- </el-col>-->
|
|
|
|
+ <!-- <el-col :span="8">-->
|
|
|
|
+ <!-- <el-form-item-->
|
|
|
|
+ <!-- :label="'密码' + (index+1)"-->
|
|
|
|
+ <!-- :label-width="formLabelWidth"-->
|
|
|
|
+ <!-- :prop="'engineList.' + index + '.enginPassword'"-->
|
|
|
|
+ <!-- :rules="{required: true, message: '请输入工程机密码', trigger: 'blur'}"-->
|
|
|
|
+ <!-- >-->
|
|
|
|
+ <!-- <el-input v-model="row.enginPassword" placeholder="请输入密码" autocomplete="off" show-password></el-input>-->
|
|
|
|
+ <!-- </el-form-item>-->
|
|
|
|
+ <!-- </el-col>-->
|
|
|
|
+ <!-- <el-col :span="8">-->
|
|
|
|
+ <!-- <template v-if="row.adminUserId">-->
|
|
|
|
+ <!-- <el-button @click="submitForm(index)">重验</el-button>-->
|
|
|
|
+ <!-- </template>-->
|
|
|
|
+ <!-- <template v-else>-->
|
|
|
|
+ <!-- <el-button @click="submitForm(index)">验证</el-button>-->
|
|
|
|
+ <!-- </template>-->
|
|
|
|
|
|
-<!-- <el-button v-if="row.adminUserId" @click="toEngine(index)">打开</el-button>-->
|
|
|
|
-<!-- <el-button @click="delAccountForm(index)">删除</el-button>-->
|
|
|
|
-<!-- </el-col>-->
|
|
|
|
-<!-- </el-row>-->
|
|
|
|
-<!-- </el-form>-->
|
|
|
|
-<!-- <div slot="footer" class="dialog-footer">-->
|
|
|
|
-<!-- <el-button @click="addRowEngine">新增账号</el-button>-->
|
|
|
|
-<!-- <el-button @click="dialogFormVisible = false">取 消</el-button>-->
|
|
|
|
-<!-- </div>-->
|
|
|
|
-<!-- </el-dialog>-->
|
|
|
|
|
|
+ <!-- <el-button v-if="row.adminUserId" @click="toEngine(index)">打开</el-button>-->
|
|
|
|
+ <!-- <el-button @click="delAccountForm(index)">删除</el-button>-->
|
|
|
|
+ <!-- </el-col>-->
|
|
|
|
+ <!-- </el-row>-->
|
|
|
|
+ <!-- </el-form>-->
|
|
|
|
+ <!-- <div slot="footer" class="dialog-footer">-->
|
|
|
|
+ <!-- <el-button @click="addRowEngine">新增账号</el-button>-->
|
|
|
|
+ <!-- <el-button @click="dialogFormVisible = false">取 消</el-button>-->
|
|
|
|
+ <!-- </div>-->
|
|
|
|
+ <!-- </el-dialog>-->
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -154,7 +154,11 @@ import Hamburger from "@/components/Hamburger";
|
|
import Screenfull from "@/components/Screenfull";
|
|
import Screenfull from "@/components/Screenfull";
|
|
import NavMenu from "@/components/NavMenu";
|
|
import NavMenu from "@/components/NavMenu";
|
|
import { getNoticeListCount } from "@/api/notice";
|
|
import { getNoticeListCount } from "@/api/notice";
|
|
-import {checkEngineAccount, bindEngineAccount, delEngineAccount} from "@/api/setting";
|
|
|
|
|
|
+import {
|
|
|
|
+ checkEngineAccount,
|
|
|
|
+ bindEngineAccount,
|
|
|
|
+ delEngineAccount,
|
|
|
|
+} from "@/api/setting";
|
|
import request from "@/utils/request";
|
|
import request from "@/utils/request";
|
|
|
|
|
|
export default {
|
|
export default {
|
|
@@ -178,7 +182,7 @@ export default {
|
|
],
|
|
],
|
|
},
|
|
},
|
|
formLabelWidth: "100px",
|
|
formLabelWidth: "100px",
|
|
- dialogFormVisible: false
|
|
|
|
|
|
+ dialogFormVisible: false,
|
|
};
|
|
};
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
@@ -188,7 +192,7 @@ export default {
|
|
that.tcMessage();
|
|
that.tcMessage();
|
|
this.intivalId = setInterval(function () {
|
|
this.intivalId = setInterval(function () {
|
|
that.tcMessage();
|
|
that.tcMessage();
|
|
- }, 3000);
|
|
|
|
|
|
+ }, 5000);
|
|
// this.timer = setInterval(function () {
|
|
// this.timer = setInterval(function () {
|
|
// that.initNotice();
|
|
// that.initNotice();
|
|
// }, 3000);
|
|
// }, 3000);
|
|
@@ -252,7 +256,7 @@ export default {
|
|
this.$router.push("/notice/index");
|
|
this.$router.push("/notice/index");
|
|
},
|
|
},
|
|
openEngineAccount() {
|
|
openEngineAccount() {
|
|
- this.engineForm.engineList = this.userInfo.bindEnginList
|
|
|
|
|
|
+ this.engineForm.engineList = this.userInfo.bindEnginList;
|
|
this.dialogFormVisible = true;
|
|
this.dialogFormVisible = true;
|
|
},
|
|
},
|
|
toEngine() {
|
|
toEngine() {
|