2024-9-27 测速设备
This commit is contained in:
parent
02a0283487
commit
524e8a1347
7829
package-lock.json
generated
7829
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -8,8 +8,10 @@
|
||||
"build": "vue-cli-service build"
|
||||
},
|
||||
"dependencies": {
|
||||
"@turf/turf": "^7.1.0",
|
||||
"axios": "^0.19.2",
|
||||
"better-scroll": "^2.4.1",
|
||||
"copy-webpack-plugin": "^6.3.2",
|
||||
"core-js": "^3.6.5",
|
||||
"crypto-js": "^4.2.0",
|
||||
"css-declaration-sorter": "^6.3.1",
|
||||
@ -31,6 +33,8 @@
|
||||
"js-file-download": "^0.4.12",
|
||||
"js-md5": "^0.7.3",
|
||||
"lrz": "^4.9.41",
|
||||
"mars3d": "^3.8.3",
|
||||
"mars3d-cesium": "^1.121.1",
|
||||
"moment": "^2.29.1",
|
||||
"monitorjs_horse": "^2.2.1",
|
||||
"mqtt": "^4.2.6",
|
||||
@ -41,6 +45,7 @@
|
||||
"spark-md5": "^3.0.1",
|
||||
"style-resources-loader": "^1.3.3",
|
||||
"stylus-loader": "^3.0.2",
|
||||
"turf": "^3.0.14",
|
||||
"vconsole": "^3.15.1",
|
||||
"videojs-contrib-hls": "^5.15.0",
|
||||
"vue": "^2.6.11",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//-------项目配置标识-------
|
||||
// var COMPANY = ""; //通用
|
||||
var COMPANY = ""; //通用
|
||||
// var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业
|
||||
// var COMPANY='hezhan'; //合展-宿迁
|
||||
// var COMPANY='nanchang'; //南昌地铁、衢州
|
||||
@ -21,7 +21,7 @@
|
||||
// COMPANY = "agjt"; //鞍钢集团
|
||||
// COMPANY = 'zkax' //中科安信
|
||||
// COMPANY = 'hfqc' //乌丹站舍(合肥启程)
|
||||
COMPANY = 'mulei' //木垒
|
||||
// COMPANY = 'mulei' //木垒
|
||||
|
||||
var PROJECT = {
|
||||
local_test: "common", // 普通版
|
||||
|
||||
@ -175,8 +175,8 @@ if (process.env.NODE_ENV == "development") {
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
|
||||
axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
|
||||
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
|
||||
13
src/components/mars3d/MarsBox.vue
Normal file
13
src/components/mars3d/MarsBox.vue
Normal file
@ -0,0 +1,13 @@
|
||||
<template>
|
||||
123
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
@ -38,6 +38,7 @@ import 'quill/dist/quill.core.css'
|
||||
import 'quill/dist/quill.snow.css'
|
||||
|
||||
import 'quill/dist/quill.bubble.css'
|
||||
|
||||
// import VConsole from 'vconsole';
|
||||
// if (process.env.NODE_ENV == 'development'){
|
||||
// new VConsole();
|
||||
|
||||
@ -621,6 +621,14 @@ const routes2 = [{
|
||||
"@/views/projectFront/constructionManage/projectTeamManage.vue"
|
||||
),
|
||||
},
|
||||
{
|
||||
path: "/project/constructionManage/projectareaadmin",
|
||||
name: "项目基础信息管理_项目区域管理",
|
||||
component: () =>
|
||||
import (
|
||||
"@/views/projectFront/constructionManage/projectareaadmin.vue"
|
||||
),
|
||||
},
|
||||
// 施工管理
|
||||
//施工管理--装置管理
|
||||
{
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
<template>
|
||||
<h1>123</h1>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
@ -2,10 +2,12 @@
|
||||
<!-- 检查部位 -->
|
||||
<vue-scroll style="height: 100%">
|
||||
<div class="checkPoint">
|
||||
<el-button type="primary" size="medium" @click="newRootNode"
|
||||
<el-button
|
||||
type="primary"
|
||||
size="medium"
|
||||
@click="newRootNode"
|
||||
v-permission="{key: 'business_add', menuPath: '/project/quality/business'}"
|
||||
>新增区域</el-button
|
||||
>
|
||||
>新增区域</el-button>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
style="width: 100%; margin: 20px 0"
|
||||
@ -14,60 +16,54 @@
|
||||
:tree-props="{ children: 'children' }"
|
||||
class="tables"
|
||||
>
|
||||
<el-table-column
|
||||
prop="regionName"
|
||||
:label="$t('message.quality.regionName')"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="regionCode"
|
||||
:label="$t('message.quality.coding')"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" prop="enterpriseName" label="责任单位">
|
||||
</el-table-column>
|
||||
<el-table-column prop="regionName" :label="$t('message.quality.regionName')"></el-table-column>
|
||||
<el-table-column align="center" prop="regionCode" :label="$t('message.quality.coding')"></el-table-column>
|
||||
<el-table-column align="center" prop="enterpriseName" label="责任单位"></el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="dutyUserName"
|
||||
:label="$t('message.quality.rectificationPeople')"
|
||||
>
|
||||
</el-table-column>
|
||||
></el-table-column>
|
||||
<!-- <el-table-column
|
||||
align="center"
|
||||
|
||||
prop="intendanceNames"
|
||||
:label="$t('message.quality.notifier')"
|
||||
>
|
||||
</el-table-column> -->
|
||||
<el-table-column align="center" prop="aiAnalyseHardName" label="AI设备">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="remark"
|
||||
:label="$t('message.quality.explain')"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="remark"
|
||||
:label="$t('message.quality.operation')"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>-->
|
||||
<el-table-column align="center" prop="aiAnalyseHardName" label="AI设备"></el-table-column>
|
||||
<el-table-column prop="remark" :label="$t('message.quality.explain')" align="center"></el-table-column>
|
||||
<el-table-column prop="remark" :label="$t('message.quality.operation')" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div class="flex2 edit">
|
||||
<!-- <img src="@/assets/images/icon-edit.png" /> -->
|
||||
<el-button type="text" @click="editBtn(scope.row)"
|
||||
v-permission="{key: 'business_edit', menuPath: '/project/quality/business'}">{{
|
||||
<el-button
|
||||
type="text"
|
||||
@click="editBtn(scope.row)"
|
||||
v-permission="{key: 'business_edit', menuPath: '/project/quality/business'}"
|
||||
>
|
||||
{{
|
||||
$t("message.quality.compile")
|
||||
}}</el-button>
|
||||
<el-button type="text" @click="newJuniorBtn(scope.row)"
|
||||
v-permission="{key: 'business_add', menuPath: '/project/quality/business'}">{{
|
||||
}}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
@click="newJuniorBtn(scope.row)"
|
||||
v-permission="{key: 'business_add', menuPath: '/project/quality/business'}"
|
||||
>
|
||||
{{
|
||||
$t("message.quality.newJunior")
|
||||
}}</el-button>
|
||||
<el-button type="text" @click="deleteBtn(scope.row)"
|
||||
v-permission="{key: 'business_delete', menuPath: '/project/quality/business'}">{{
|
||||
}}
|
||||
</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
@click="deleteBtn(scope.row)"
|
||||
v-permission="{key: 'business_delete', menuPath: '/project/quality/business'}"
|
||||
>
|
||||
{{
|
||||
$t("message.quality.delete")
|
||||
}}</el-button>
|
||||
}}
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -79,16 +75,11 @@
|
||||
@close="close"
|
||||
:title="title"
|
||||
:visible.sync="editDialog"
|
||||
width="666px"
|
||||
top="2vh"
|
||||
width="800px"
|
||||
>
|
||||
<div class="dialog_content">
|
||||
<el-form
|
||||
ref="form"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="80px"
|
||||
size="medium"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px" size="medium">
|
||||
<el-form-item
|
||||
:label="$t('message.quality.regionName')"
|
||||
prop="regionName"
|
||||
@ -102,11 +93,7 @@
|
||||
},
|
||||
]"
|
||||
>
|
||||
<el-input
|
||||
placeholder="请输入区域名称"
|
||||
v-model="form.regionName"
|
||||
:disabled="dialogType == 2"
|
||||
></el-input>
|
||||
<el-input placeholder="请输入区域名称" v-model="form.regionName" :disabled="dialogType == 2"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 责任单位 -->
|
||||
<el-form-item label="责任单位" prop="dutyId">
|
||||
@ -125,8 +112,7 @@
|
||||
:key="item.id"
|
||||
:label="item.enterpriseName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 责任人 start -->
|
||||
@ -146,8 +132,7 @@
|
||||
:key="item.userId"
|
||||
:label="item.realName"
|
||||
:value="item.userId"
|
||||
>
|
||||
</el-option>
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 责任人 end -->
|
||||
@ -168,7 +153,7 @@
|
||||
:label="item.workerName"
|
||||
:value="item.userId"
|
||||
>
|
||||
<span style="float: left">{{ item.realName }}</span> -->
|
||||
<span style="float: left">{{ item.realName }}</span>-->
|
||||
<!-- <span-->
|
||||
<!-- style="-->
|
||||
<!-- float: right;-->
|
||||
@ -186,7 +171,7 @@
|
||||
<!-- >-->
|
||||
<!-- </el-option>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
</el-form-item>-->
|
||||
<!-- AI设备 -->
|
||||
<el-form-item label="AI设备" prop="aiDeviceId" v-if="COMPANY == 'agjt'">
|
||||
<el-select
|
||||
@ -201,8 +186,7 @@
|
||||
:key="item.id"
|
||||
:label="item.hardwareName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="AI设备" v-else>
|
||||
@ -218,16 +202,11 @@
|
||||
:key="item.id"
|
||||
:label="item.hardwareName"
|
||||
:value="item.id"
|
||||
>
|
||||
</el-option>
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('message.quality.explain')">
|
||||
<el-input
|
||||
prop="remark"
|
||||
v-model="form.remark"
|
||||
type="textarea"
|
||||
></el-input>
|
||||
<el-input prop="remark" v-model="form.remark" type="textarea"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<!-- <el-checkbox-group v-model="showList">
|
||||
@ -239,8 +218,120 @@
|
||||
>{{ $t("message.quality.notifier")
|
||||
}}{{ $t("message.quality.copyToSubordinate") }}</el-checkbox
|
||||
>
|
||||
</el-checkbox-group> -->
|
||||
</el-checkbox-group>-->
|
||||
</el-form-item>
|
||||
|
||||
<!-- 区域新增 -->
|
||||
<div class="area-box">
|
||||
<!-- 区域监控 -->
|
||||
<div class="area-title">
|
||||
<div class="title-area">
|
||||
划分区域范围
|
||||
<el-button type="primary" size="small" style="background:#6b83d4,">图上绘制</el-button>
|
||||
</div>
|
||||
|
||||
<div class="title-icon">
|
||||
绑定视频监控:
|
||||
<el-select size="small" v-model="value" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 新增设备 -->
|
||||
<div class="area-add">
|
||||
<i></i> 新增设备
|
||||
<div class="area-but">
|
||||
<el-button type="primary" size="small" @click="onareaadd">新增</el-button>
|
||||
<el-button type="danger" size="small" @click="ondeleter">删除</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <el-radio-group v-model="radio">
|
||||
<el-radio :label="3">是</el-radio>
|
||||
<el-radio :label="6">否</el-radio>
|
||||
</el-radio-group>-->
|
||||
|
||||
<div class="area-eq-box">
|
||||
<!-- 单个设备 -->
|
||||
<div class="area-item" v-for="(item,index) in eqdataarr" :key="index">
|
||||
<div class="areaitem-title">
|
||||
<el-radio-group v-model="item.o">
|
||||
<el-radio :label="1">风机</el-radio>
|
||||
<el-radio :label="2">光伏</el-radio>
|
||||
<el-radio :label="3">储能</el-radio>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
<div class="areaitem-con">
|
||||
<div class="areatimecon with-one">
|
||||
设备名称
|
||||
<el-input size="small" v-model="item.a" placeholder="请输入内容" />
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-two">
|
||||
高度数据
|
||||
<el-input size="small" v-model="item.b" placeholder="请输入内容" />
|
||||
</div>
|
||||
<div class="areatimecon with-there">
|
||||
<el-switch v-model="item.k" inactive-text="是否轮廓"></el-switch>
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-one">
|
||||
设备编号
|
||||
<el-input size="small" v-model="item.c" placeholder="请输入内容" />
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-two">
|
||||
比例数据
|
||||
<el-input size="small" v-model="item.d" placeholder="请输入内容" />
|
||||
</div>
|
||||
<div class="areatimecon with-there">
|
||||
<el-switch v-model="item.l" inactive-text="是否阴影"></el-switch>
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-one">
|
||||
模型地址
|
||||
<el-input size="small" v-model="item.e" placeholder="请输入内容" />
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-two">
|
||||
方向角度
|
||||
<el-input size="small" v-model="item.f" placeholder="请输入内容" />
|
||||
</div>
|
||||
<div class="areatimecon with-there">
|
||||
<el-switch v-model="item.m" inactive-text="是否贴地"></el-switch>
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-one">
|
||||
经度数据
|
||||
<el-input size="small" v-model="item.g" placeholder="请输入内容" />
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-two">
|
||||
俯仰角度
|
||||
<el-input size="small" v-model="item.h" placeholder="请输入内容" />
|
||||
</div>
|
||||
<div class="areatimecon with-there">
|
||||
<el-switch v-model="item.n" inactive-text="是否显示"></el-switch>
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-one">
|
||||
纬度数据
|
||||
<el-input size="small" v-model="item.g" placeholder="请输入内容" />
|
||||
</div>
|
||||
|
||||
<div class="areatimecon with-two">
|
||||
俯滚角度
|
||||
<el-input size="small" v-model="item.h" placeholder="请输入内容" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="dialog-footer">
|
||||
@ -249,15 +340,13 @@
|
||||
@click="editDialog = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{ $t("message.alarmValueSet.cancel") }}
|
||||
</el-button>
|
||||
>{{ $t("message.alarmValueSet.cancel") }}</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="submit('form')"
|
||||
size="medium"
|
||||
>{{ $t("message.alarmValueSet.save") }}
|
||||
</el-button>
|
||||
>{{ $t("message.alarmValueSet.save") }}</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</vue-scroll>
|
||||
@ -267,16 +356,63 @@ import {
|
||||
addQualityRegionApi,
|
||||
getQualityRegionListApi,
|
||||
deleteQualityRegionListApi,
|
||||
editQualityRegionListApi,
|
||||
editQualityRegionListApi
|
||||
} from "@/assets/js/api/quality.js";
|
||||
import {
|
||||
getProjectChilderSystemUserListApi,
|
||||
getEnterpriseInfoListApi,
|
||||
getEnterpriseInfoListApi
|
||||
} from "@/assets/js/api/configManage.js";
|
||||
import { aiAnalyseHardWareRecordList } from "@/assets/js/api/equipmentCenter/electricBox";
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
// 区域新增
|
||||
options: [
|
||||
{
|
||||
value: "选项1",
|
||||
label: "黄金糕"
|
||||
},
|
||||
{
|
||||
value: "选项2",
|
||||
label: "双皮奶"
|
||||
},
|
||||
{
|
||||
value: "选项3",
|
||||
label: "蚵仔煎"
|
||||
},
|
||||
{
|
||||
value: "选项4",
|
||||
label: "龙须面"
|
||||
},
|
||||
{
|
||||
value: "选项5",
|
||||
label: "北京烤鸭"
|
||||
}
|
||||
],
|
||||
value: "",
|
||||
// 添加设备
|
||||
radio: 3,
|
||||
// 多个设备
|
||||
eqdataarr: [
|
||||
{
|
||||
a: "1",
|
||||
b: "2",
|
||||
c: "3",
|
||||
d: "4",
|
||||
e: "5",
|
||||
f: "6",
|
||||
g: 10,
|
||||
h: 10,
|
||||
i: 10,
|
||||
j: 10,
|
||||
k: true,
|
||||
l: true,
|
||||
m: true,
|
||||
n: true,
|
||||
o: "1"
|
||||
}
|
||||
],
|
||||
// 区域新增
|
||||
COMPANY: COMPANY,
|
||||
title: this.$t("message.quality.NewRootNode"),
|
||||
dialogType: 1,
|
||||
@ -294,7 +430,7 @@ export default {
|
||||
intendanceIds: [],
|
||||
intendanceNames: "",
|
||||
remark: "",
|
||||
enterpriseName: "",
|
||||
enterpriseName: ""
|
||||
},
|
||||
showList: [],
|
||||
rules: {
|
||||
@ -302,25 +438,25 @@ export default {
|
||||
{
|
||||
required: true,
|
||||
message: "请选择AI设备",
|
||||
trigger: "change",
|
||||
},
|
||||
trigger: "change"
|
||||
}
|
||||
],
|
||||
dutyId: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入责任单位",
|
||||
trigger: "change",
|
||||
},
|
||||
trigger: "change"
|
||||
}
|
||||
],
|
||||
personId: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入责任人",
|
||||
trigger: "change",
|
||||
},
|
||||
],
|
||||
trigger: "change"
|
||||
}
|
||||
]
|
||||
},
|
||||
aiDeviceList: [],
|
||||
aiDeviceList: []
|
||||
};
|
||||
},
|
||||
created() {
|
||||
@ -330,11 +466,22 @@ export default {
|
||||
this.getAIDeviceFn();
|
||||
},
|
||||
methods: {
|
||||
// 区域新增
|
||||
onareaadd() {
|
||||
this.eqdataarr.push({});
|
||||
},
|
||||
|
||||
ondeleter() {
|
||||
if (this.eqdataarr.length == 0) return
|
||||
this.eqdataarr.pop();
|
||||
},
|
||||
|
||||
// 区域新增
|
||||
// 获取AI设备
|
||||
getAIDeviceFn() {
|
||||
aiAnalyseHardWareRecordList({
|
||||
projectSn: this.$store.state.projectSn,
|
||||
}).then((result) => {
|
||||
projectSn: this.$store.state.projectSn
|
||||
}).then(result => {
|
||||
if (result.success) {
|
||||
this.aiDeviceList = result.result;
|
||||
console.log("列表", result);
|
||||
@ -344,9 +491,9 @@ export default {
|
||||
// 获取列表信息
|
||||
getQualityRegionList() {
|
||||
let data = {
|
||||
projectSn: this.projectSn,
|
||||
projectSn: this.projectSn
|
||||
};
|
||||
getQualityRegionListApi(data).then((res) => {
|
||||
getQualityRegionListApi(data).then(res => {
|
||||
console.log(res);
|
||||
if (res.code == 200) {
|
||||
this.tableData = res.result;
|
||||
@ -363,7 +510,7 @@ export default {
|
||||
aiDeviceId: "",
|
||||
intendanceIds: [],
|
||||
intendanceNames: "",
|
||||
remark: "",
|
||||
remark: ""
|
||||
};
|
||||
this.notifierOrPeopleList = [];
|
||||
this.editDialog = true;
|
||||
@ -379,12 +526,12 @@ export default {
|
||||
console.log(this.form, 666777);
|
||||
console.log(this.notifierOrPeopleList, 888999);
|
||||
if (this.form.dutyId.length > 0) {
|
||||
let shouldHavePersonIdList = this.notifierOrPeopleList.map((item) => {
|
||||
let shouldHavePersonIdList = this.notifierOrPeopleList.map(item => {
|
||||
if (this.form.dutyId.includes(item.enterpriseId)) {
|
||||
return item.userId;
|
||||
}
|
||||
});
|
||||
const newArr = this.form.personId.filter((item) =>
|
||||
const newArr = this.form.personId.filter(item =>
|
||||
shouldHavePersonIdList.includes(item)
|
||||
);
|
||||
this.form.personId = newArr;
|
||||
@ -409,10 +556,10 @@ export default {
|
||||
|
||||
//编辑按钮
|
||||
editBtn(value) {
|
||||
if (value.parentRegion && value.parentRegion != '0') {
|
||||
if (value.parentRegion && value.parentRegion != "0") {
|
||||
this.form.parentRegion = value.parentRegion;
|
||||
} else {
|
||||
this.form.parentRegion = '0';
|
||||
this.form.parentRegion = "0";
|
||||
}
|
||||
if (value.intendanceIds == "" || value.intendanceIds == null) {
|
||||
this.form.intendanceIds = null;
|
||||
@ -422,14 +569,14 @@ export default {
|
||||
console.log("编辑", value);
|
||||
this.form.regionName = value.regionName;
|
||||
if (value.enterpriseInfos && value.enterpriseInfos.length > 0) {
|
||||
this.form.dutyId = value.enterpriseInfos.map((item) => {
|
||||
this.form.dutyId = value.enterpriseInfos.map(item => {
|
||||
return item.id;
|
||||
});
|
||||
this.getUpdatePersonListFn();
|
||||
}
|
||||
if (value.systemUsers && value.systemUsers.length > 0) {
|
||||
const newArr = [];
|
||||
value.systemUsers.map((item) => {
|
||||
value.systemUsers.map(item => {
|
||||
if (item.userId) {
|
||||
newArr.push(item.userId);
|
||||
}
|
||||
@ -437,12 +584,15 @@ export default {
|
||||
this.form.personId = newArr;
|
||||
console.log(this.form.personId, 123456789);
|
||||
}
|
||||
if (value.aiAnalyseHardWareRecords && value.aiAnalyseHardWareRecords.length > 0) {
|
||||
this.form.aiDeviceId = value.aiAnalyseHardWareRecords.map((item) => {
|
||||
if (
|
||||
value.aiAnalyseHardWareRecords &&
|
||||
value.aiAnalyseHardWareRecords.length > 0
|
||||
) {
|
||||
this.form.aiDeviceId = value.aiAnalyseHardWareRecords.map(item => {
|
||||
return item.id;
|
||||
});
|
||||
} else {
|
||||
this.form.aiDeviceId = []
|
||||
this.form.aiDeviceId = [];
|
||||
}
|
||||
this.form.remark = value.remark;
|
||||
this.form.id = value.id;
|
||||
@ -462,7 +612,7 @@ export default {
|
||||
aiDeviceId: "",
|
||||
intendanceIds: [],
|
||||
intendanceNames: "",
|
||||
remark: "",
|
||||
remark: ""
|
||||
};
|
||||
this.form.parentRegion = value.id;
|
||||
// console.log(this.form)
|
||||
@ -475,7 +625,7 @@ export default {
|
||||
},
|
||||
// 获取整改单位列表
|
||||
getUpdateUnitListFn() {
|
||||
getEnterpriseInfoListApi({ projectSn: this.projectSn }).then((res) => {
|
||||
getEnterpriseInfoListApi({ projectSn: this.projectSn }).then(res => {
|
||||
console.log(res);
|
||||
if (res.code == 200) {
|
||||
this.enterpriseInfoList = res.result;
|
||||
@ -486,9 +636,9 @@ export default {
|
||||
getUpdatePersonListFn() {
|
||||
let data = {
|
||||
projectSn: this.projectSn,
|
||||
enterpriseId: this.form.dutyId ? this.form.dutyId.join(",") : "",
|
||||
enterpriseId: this.form.dutyId ? this.form.dutyId.join(",") : ""
|
||||
};
|
||||
getProjectChilderSystemUserListApi(data).then((res) => {
|
||||
getProjectChilderSystemUserListApi(data).then(res => {
|
||||
console.log(res);
|
||||
if (res.code == 200) {
|
||||
this.notifierOrPeopleList = res.result;
|
||||
@ -518,7 +668,7 @@ export default {
|
||||
// },
|
||||
//弹窗---保存按钮
|
||||
submit(formName) {
|
||||
this.$refs[formName].validate((valid) => {
|
||||
this.$refs[formName].validate(valid => {
|
||||
if (valid) {
|
||||
let data = {
|
||||
dutyName: this.form.dutyName,
|
||||
@ -529,28 +679,28 @@ export default {
|
||||
regionName: this.form.regionName,
|
||||
remark: this.form.remark,
|
||||
projectSn: this.projectSn,
|
||||
parentRegion: this.form.parentRegion,
|
||||
parentRegion: this.form.parentRegion
|
||||
};
|
||||
if (this.form.aiDeviceId && this.form.aiDeviceId.length > 0) {
|
||||
data.aiAnalyseHardWareRecords = this.form.aiDeviceId.map((item) => {
|
||||
data.aiAnalyseHardWareRecords = this.form.aiDeviceId.map(item => {
|
||||
return { id: item };
|
||||
});
|
||||
}
|
||||
if (this.form.dutyId && this.form.dutyId.length > 0) {
|
||||
data.enterpriseInfos = this.form.dutyId.map((item) => {
|
||||
data.enterpriseInfos = this.form.dutyId.map(item => {
|
||||
return { id: item };
|
||||
});
|
||||
}
|
||||
if (this.form.personId && this.form.personId.length > 0) {
|
||||
console.log(this.form.personId, 777888);
|
||||
data.systemUsers = this.form.personId.map((item) => {
|
||||
data.systemUsers = this.form.personId.map(item => {
|
||||
if (item) {
|
||||
return { userId: item };
|
||||
}
|
||||
});
|
||||
}
|
||||
if (this.dialogType == 1) {
|
||||
addQualityRegionApi(data).then((res) => {
|
||||
addQualityRegionApi(data).then(res => {
|
||||
// console.log(res);
|
||||
if (res.code == 200) {
|
||||
this.$message.success(this.$t("message.quality.newSuccess"));
|
||||
@ -560,7 +710,7 @@ export default {
|
||||
});
|
||||
} else if (this.dialogType == 2) {
|
||||
data.id = this.form.id;
|
||||
editQualityRegionListApi(data).then((res) => {
|
||||
editQualityRegionListApi(data).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.editDialog = false;
|
||||
this.$message.success(res.message);
|
||||
@ -569,7 +719,7 @@ export default {
|
||||
});
|
||||
} else if (this.dialogType == 3) {
|
||||
data.parentRegion = this.form.parentRegion;
|
||||
addQualityRegionApi(data).then((res) => {
|
||||
addQualityRegionApi(data).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.$message.success(this.$t("message.quality.newSuccess"));
|
||||
this.editDialog = false;
|
||||
@ -590,19 +740,19 @@ export default {
|
||||
{
|
||||
confirmButtonText: this.$t("message.quality.confirm"),
|
||||
cancelButtonText: this.$t("message.quality.cancel"),
|
||||
type: "warning",
|
||||
type: "warning"
|
||||
}
|
||||
)
|
||||
.then(() => {
|
||||
let data = {
|
||||
id: value.id,
|
||||
id: value.id
|
||||
};
|
||||
|
||||
deleteQualityRegionListApi(data).then((res) => {
|
||||
deleteQualityRegionListApi(data).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.$message({
|
||||
type: "success",
|
||||
message: this.$t("message.quality.successfullyDelete") + "!",
|
||||
message: this.$t("message.quality.successfullyDelete") + "!"
|
||||
});
|
||||
this.getQualityRegionList();
|
||||
}
|
||||
@ -615,8 +765,8 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
this.$refs["form"].clearValidate();
|
||||
});
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style lang="less" scoped>
|
||||
@ -639,4 +789,97 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 区域新增
|
||||
|
||||
::v-deep .el-dialog {
|
||||
// background: skyblue !important;
|
||||
|
||||
.area-box {
|
||||
// 区域监控
|
||||
.area-title {
|
||||
display: flex;
|
||||
}
|
||||
.title-area {
|
||||
margin-right: 40px;
|
||||
}
|
||||
|
||||
// 新增设备
|
||||
.area-add {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin: 10px 0;
|
||||
position: relative;
|
||||
|
||||
.area-but {
|
||||
position: absolute;
|
||||
right: 20px;
|
||||
top: 10px;
|
||||
}
|
||||
|
||||
i {
|
||||
display: block;
|
||||
width: 3px;
|
||||
height: 12px;
|
||||
background: #7091f0;
|
||||
font-style: normal;
|
||||
margin-right: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
// 单个设备
|
||||
.area-eq-box {
|
||||
height: 400px;
|
||||
overflow-y: auto;
|
||||
// background: skyblue;
|
||||
margin-top: 10px;
|
||||
.area-item {
|
||||
// height: 280px;
|
||||
// margin-top: 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin-bottom: 20px;
|
||||
|
||||
.areaitem-title {
|
||||
}
|
||||
|
||||
.areaitem-con {
|
||||
flex: 1;
|
||||
width: 95%;
|
||||
background: #ececec;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 5px;
|
||||
|
||||
margin-top: 5px;
|
||||
padding: 10px;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-content: flex-start;
|
||||
|
||||
.areatimecon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
white-space: nowrap;
|
||||
// padding-right: 10px;
|
||||
|
||||
input {
|
||||
width: 200px;
|
||||
}
|
||||
}
|
||||
|
||||
.with-one {
|
||||
width: 40%;
|
||||
}
|
||||
.with-two {
|
||||
margin: 1% 1%;
|
||||
width: 40%;
|
||||
}
|
||||
.with-there {
|
||||
// width: 13%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
const path = require("path");
|
||||
const path = require('path')
|
||||
const webpack = require('webpack')
|
||||
const CopyWebpackPlugin = require('copy-webpack-plugin')
|
||||
// 代码压缩
|
||||
const TerserPlugin = require("terser-webpack-plugin");
|
||||
function addStyleResource(rule) {
|
||||
@ -53,7 +55,9 @@ module.exports = {
|
||||
patterns: [],
|
||||
},
|
||||
},
|
||||
|
||||
productionSourceMap: false,
|
||||
|
||||
configureWebpack: {
|
||||
optimization: {
|
||||
minimizer: [
|
||||
@ -71,7 +75,7 @@ module.exports = {
|
||||
}),
|
||||
],
|
||||
},
|
||||
devtool: 'source map'
|
||||
devtool: 'source map',
|
||||
},
|
||||
|
||||
// configureWebpack: (config) => {
|
||||
@ -86,4 +90,6 @@ module.exports = {
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
|
||||
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user