Skip to content

G
gassafety-progress
Commit 98120c1e authored by wuqinghua's avatar wuqinghua
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 04d00bb0 b3d696de
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 97 deletions
gassafetyprogress-web/src/components/GetPos/index.vue
View file @ 98120c1e
<!--
* @Author: your name
* @Date: 2022-02-12 11:07:10
* @LastEditTime: 2022-02-16 17:08:55
* @LastEditTime: 2022-02-22 15:08:10
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/components/GetPos.vue/index.vue
......@@ -92,7 +92,9 @@ export default {
methods: {
init() {
this.$nextTick(() => {
this.map = new EditorMap("getposmap", {}, this);
const path = eval(this.$store.state.user.systemSetting.map_center);
console.log("path",path);
this.map = new EditorMap("getposmap", {center:path}, this);
// 如果不传值就是设备,传pipe就是管道
if (this.device == "") {
// 如果传了路径就创建一个marker，如果没传就直接激活手动创建
......
gassafetyprogress-web/src/views/bigWindow/index.vue
View file @ 98120c1e
<!--
* @Author: your name
* @Date: 2022-01-11 13:44:17
* @LastEditTime: 2022-02-17 11:47:53
* @LastEditTime: 2022-02-22 15:09:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue
......@@ -182,9 +182,11 @@ export default {
},
},
mounted() {
const path = eval(this.$store.state.user.systemSetting.map_center);
this.map = new EditorMap(
"map",
{
center:path,
mapStyle: "amap://styles/f71d3a3d73e14f5b2bf5508bf1411758",
zoom: 14.5,
},
......
gassafetyprogress-web/src/views/operationMonitor/workOrder/index.vue
View file @ 98120c1e
......@@ -43,28 +43,6 @@
v-hasPermi="['system:order:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:order:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:order:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
......@@ -80,7 +58,7 @@
</el-row>
<el-table v-loading="loading" :data="orderList" @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="workTitle" />
<el-table-column label="任务类型" align="center" prop="workType">
<template slot-scope="scope">
......
gassafetyprogress-web/src/views/standingBook/equipment/index.vue
View file @ 98120c1e
......@@ -183,43 +183,44 @@
</el-dialog>
<el-dialog :title="title2" :visible.sync="open2" width="800px" append-to-body @cancel="cancel2">
<el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-form ref="detailForm" :model="detailForm" label-width="100px">
<el-row>
<el-col :span="11">
<el-form-item label="用户名称:">
<font>{{detailForm.userName}}</font>
<el-input v-model="detailForm.userName" disabled/>
</el-form-item>
<el-form-item label="身份证号:">
<font>{{detailForm.idCard}}</font>
<el-input v-model="detailForm.idCard" disabled/>
</el-form-item>
<el-form-item label="品牌名称:">
<font v-if="detailForm.brandName != '' && detailForm.brandName != null">{{detailForm.brandName}}</font>
<font v-else> - </font>
<el-input v-model="detailForm.brandName" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="用户编号:">
<font v-if="detailForm.userNo != '' && detailForm.userNo != null">{{detailForm.userNo}}</font>
<font v-else> - </font>
<el-input v-model="detailForm.userNo" disabled style="width: 100%"/>
</el-form-item>
<el-form-item label="联系电话:">
<font>{{detailForm.linkMobile}}</font>
<el-input v-model="detailForm.linkMobile" disabled/>
</el-form-item>
<el-form-item label="安装时间:">
<font>{{detailForm.installTime}}</font>
<el-input v-model="detailForm.installTime" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="详细地址:">
<font>{{detailForm.userAddress}}</font>
</el-form-item>
<el-col :span="23">
<el-form-item label="详细地址:">
<el-input type="textarea" v-model="detailForm.userAddress" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="备注信息:">
<el-input type="textarea" v-model="detailForm.remarks" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
......
gassafetyprogress-web/src/views/standingBook/hidden/index.vue
View file @ 98120c1e
......@@ -248,54 +248,59 @@
<el-row>
<el-col :span="10">
<el-form-item label="隐患名称:">
<font>{{detailForm.hiddenTitle}}</font>
<el-input v-model="detailForm.hiddenTitle" disabled/>
</el-form-item>
<el-form-item label="隐患发现人员:">
<font>{{detailForm.hiddenFindPeople}}</font>
<el-input v-model="detailForm.hiddenFindPeople" disabled/>
</el-form-item>
<el-form-item label="发现时间:">
<font>{{detailForm.hiddenFindDate}}</font>
<el-input v-model="detailForm.hiddenFindDate" disabled/>
</el-form-item>
</el-col>
<el-col :span="13">
<el-form-item label="隐患等级:">
<font v-if="detailForm.hiddenType == '1'">一级隐患</font>
<font v-if="detailForm.hiddenType == '2'">二级隐患</font>
<font v-if="detailForm.hiddenType == '3'">三级隐患</font>
<el-input v-if="detailForm.hiddenType == '1'" value="一级隐患" disabled/>
<el-input v-if="detailForm.hiddenType == '2'" value="二级隐患" disabled/>
<el-input v-if="detailForm.hiddenType == '3'" value="三级隐患" disabled/>
</el-form-item>
<el-form-item label="隐患位置:">
<font>{{detailForm.hiddenLocation}}</font>
<el-input v-model="detailForm.hiddenLocation" disabled/>
</el-form-item>
<el-form-item label="整治情况:">
<el-input v-if="detailForm.remediation == '1'" value="已完成" disabled/>
<el-input v-if="detailForm.remediation == '2'" value="未完成" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-form-item label="处理方案:">
<span class="dbtn" @click="checkFile(detailForm.dealPlanUrl)" v-if="detailForm.dealPlan != ''">
<i class="el-icon el-icon-view"></i>查看/下载
</span>
<span v-else>-</span>
<span v-else><el-input disabled/></span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="隐患内容:">
<font>{{detailForm.hiddenContent}}</font>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="整治情况:">
<font v-if="detailForm.remediation == '1'">已完成</font>
<font v-if="detailForm.remediation == '2'">未完成</font>
</el-form-item>
<el-col :span="23">
<el-form-item label="隐患内容:">
<el-input type="textarea" v-model="detailForm.hiddenContent" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="备注信息:">
<el-input type="textarea" v-model="detailForm.remarks" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
<el-col :span="9">
<div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 390px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 100%" id="hiddenContainer"></div>
</div>
</el-col>
......
gassafetyprogress-web/src/views/standingBook/trouble/index.vue
View file @ 98120c1e
......@@ -201,9 +201,9 @@
</el-col>
</el-row>
<el-row>
<el-col :span="23">
<el-col :span="11">
<el-form-item label="是否人员伤亡" prop="isCasualties">
<el-select v-model="form.isCasualties" placeholder="请选择是否人员伤亡">
<el-select v-model="form.isCasualties" placeholder="请选择是否人员伤亡" style="width: 100%">
<el-option label="是" value="1" />
<el-option label="否" value="2" />
</el-select>
......@@ -279,75 +279,76 @@
<el-col :span="14">
<el-form ref="detailForm" :model="detailForm" label-width="120px">
<el-row>
<el-col :span="10">
<el-col :span="11">
<el-form-item label="事故名称:">
<font>{{detailForm.troubleName}}</font>
<el-input v-model="detailForm.troubleName" disabled/>
</el-form-item>
<el-form-item label="事故原因:">
<font>{{detailForm.troubleReason}}</font>
<el-input v-model="detailForm.troubleReason" disabled/>
</el-form-item>
<el-form-item label="责任单位:">
<font v-if="detailForm.responsibleUnit != '' && detailForm.responsibleUnit != null">{{detailForm.responsibleUnit}}</font>
<font v-else> - </font>
<el-input v-model="detailForm.responsibleUnit" disabled/>
</el-form-item>
<el-form-item label="是否人员伤亡:">
<font v-if="detailForm.isCasualties == '1'">是</font>
<font v-if="detailForm.isCasualties == '2'">否</font>
<el-input v-if="detailForm.isCasualties == '1'" value="是" disabled/>
<el-input v-if="detailForm.isCasualties == '2'" value="是" disabled/>
</el-form-item>
</el-col>
<el-col :span="13">
<el-col :span="12">
<el-form-item label="事故类型:">
<font v-if="detailForm.troubleType == '1'">安全生产事故</font>
<font v-if="detailForm.troubleType == '2'">非生产安全事故</font>
<el-input v-if="detailForm.troubleType == '1'" value="安全生产事故" disabled/>
<el-input v-if="detailForm.troubleType == '2'" value="非生产安全事故" disabled/>
</el-form-item>
<el-form-item label="事故地点:">
<font>{{detailForm.troubleLocation}}</font>
<el-input v-model="detailForm.troubleLocation" disabled/>
</el-form-item>
<el-form-item label="责任人员:">
<font v-if="detailForm.responsiblePeople != '' && detailForm.responsiblePeople != null">{{detailForm.responsiblePeople}}</font>
<font v-else> - </font>
<el-input v-model="detailForm.responsiblePeople" disabled/>
</el-form-item>
<el-form-item label="是否处理:">
<font v-if="detailForm.isDeal == '1'">已处理</font>
<font v-if="detailForm.isDeal == '2'">未处理</font>
<el-input v-if="detailForm.isDeal == '1'" value="已处理" disabled/>
<el-input v-if="detailForm.isDeal == '2'" value="未处理" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailForm.isCasualties == '1'">
<el-col :span="11">
<el-form-item label="受伤人数:">
<font>{{detailForm.injuryNum}}</font>
<el-input v-model="detailForm.injuryNum" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="死亡人数:">
<font>{{detailForm.deathNum}}</font>
<el-input v-model="detailForm.deathNum" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="处理完成时间:">
<font v-if="detailForm.dealDate != '' && detailForm.dealDate != null">{{detailForm.dealDate}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="处理完成时间:">
<el-input v-model="detailForm.dealDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="简要经过:">
<font v-if="detailForm.briefProcess != '' && detailForm.briefProcess != null">{{detailForm.briefProcess}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="简要经过:">
<el-input type="textarea" v-model="detailForm.briefProcess" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-form-item label="备注信息:">
<font v-if="detailForm.remarks != '' && detailForm.remarks != null">{{detailForm.remarks}}</font>
<font v-else> - </font>
</el-form-item>
<el-col :span="23">
<el-form-item label="备注信息:">
<el-input type="textarea" v-model="detailForm.remarks" disabled/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
<el-col :span="9">
<div style="width: 100%;height: 390px;margin-top: -25px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 390px; border: 1px solid rgb(218, 213, 213);margin-bottom: 10px;">
<div style="width: 100%;height: 100%" id="troubleContainer"></div>
</div>
</el-col>
......
gassafetyprogress-web/vue.config.js
View file @ 98120c1e
......@@ -34,7 +34,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8903/gassafety`,
target: `http://222.223.203.154:8092/gassafety`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment