guoyuepeng
/
qa-regulatory-gwj-vue
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2024年1月24日测试' into 2024年1月24日测试

2024年2月1日V1.0.53^2
songwenxuan 2024-01-31 14:56:54 +08:00
parent 6e151129c5 afa82bcd14
commit 0866882e55
30 changed files with 591 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/list.vue
View File

@ -84,7 +84,7 @@
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
<div style="height: 50px"></div> <div style="height: 50px"/>
</div> </div>
</template> </template>
<script> <script>

18
src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/index.vue
View File

@ -14,8 +14,8 @@
<script> <script>
import List from './components/list' import List from './components/list'
import Detail from './components/detail' import Detail from './components/detail'
import ListCfd from "./components/list_cfd" import ListCfd from './components/list_cfd'
import DetailCfd from "./components/detail_cfd" import DetailCfd from './components/detail_cfd'
export default { export default {
components: { components: {
List: List, List: List,
@ -23,13 +23,6 @@ export default {
ListCfd: ListCfd, ListCfd: ListCfd,
DetailCfd: DetailCfd DetailCfd: DetailCfd
}, },
created() {
if (this.CORPINFO_ID == '035958e685cf4850bc40151c5e0617a6') {
this.activeName = 'ListCfd'
} else {
this.activeName = 'List'
}
},
data() { data() {
return { return {
activeName: 'List', activeName: 'List',
@ -49,6 +42,13 @@ export default {
} }
} }
}, },
created() {
if (this.CORPINFO_ID == '035958e685cf4850bc40151c5e0617a6') {
this.activeName = 'ListCfd'
} else {
this.activeName = 'List'
}
},
methods: { methods: {
goBack() { goBack() {
this.$parent.activeName = 'CorpInfo' this.$parent.activeName = 'CorpInfo'

7
src/views/firefighting/fireReport/index.vue
View File

@ -1,5 +1,10 @@
<template> <template>
<component :is="parentObj.activeName"/> <div>
<FireControlRoom v-if="parentObj.activeName === 'FireControlRoom'"/>
<FirePumpRoom v-if="parentObj.activeName === 'FirePumpRoom'"/>
<FireResources v-if="parentObj.activeName === 'FireResources'"/>
<List v-show="parentObj.activeName === 'List'"/>
</div>
</template> </template>
<script> <script>
import List from './components/list' import List from './components/list'

25
src/views/hidden/commonly/commonly/components/companiesList.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form label-width="100px"> <el-form label-width="100px">
<el-row>
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="隐患来源"> <el-form-item label="隐患来源">
@ -46,6 +47,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="隐患状态"> <el-form-item label="隐患状态">
<el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%"> <el-select v-model="form.HIDDEN_STATUS" placeholder="隐患状态" clearable style="width: 100%">
@ -64,6 +67,17 @@
<el-input v-model="form.CONFIRM_USER"/> <el-input v-model="form.CONFIRM_USER"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
<el-form-item label="隐患类型" prop="HIDDENTYPE">
<el-cascader
ref="deptTree_Select3"
:options="hiddenTypeList"
:props="defaultProps2"
v-model="form.HIDDEN_TYPE"
collapse-tags
clearable/>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="整改负责人"> <el-form-item label="整改负责人">
<el-input v-model="form.RECTIFICATION_USER"/> <el-input v-model="form.RECTIFICATION_USER"/>
@ -74,6 +88,7 @@
<el-input v-model="form.CHECK_USER"/> <el-input v-model="form.CHECK_USER"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="隐患发现时间"> <el-form-item label="隐患发现时间">
<el-date-picker <el-date-picker
@ -209,7 +224,7 @@ export default {
varList: [], varList: [],
treeData: [], treeData: [],
hiddenPartList: [], hiddenPartList: [],
hiddenTypeList: [], hiddenTypeList: [],//隐患类型
hiddenlevelList: [ hiddenlevelList: [
{ {
value: 'hiddenLevel1004', value: 'hiddenLevel1004',
@ -230,6 +245,13 @@ export default {
children: 'nodes', children: 'nodes',
label: 'name' label: 'name'
}, },
defaultProps2: {
value: 'id',
children: 'nodes',
label: 'name',
multiple: true,
emitPath: false
},
form: { form: {
SOURCE: undefined, SOURCE: undefined,
HIDDENDESCR: '', HIDDENDESCR: '',
@ -243,6 +265,7 @@ export default {
CONFIRM_USER: '', CONFIRM_USER: '',
HIDDENFIND_NAME: '', HIDDENFIND_NAME: '',
CORPINFO_ID: '', CORPINFO_ID: '',
HIDDEN_TYPE: '',
HIDDEN_STATUS: undefined HIDDEN_STATUS: undefined
} }
} }

1
src/views/keyprojects/personnelmanagement/index.vue
View File

@ -82,7 +82,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page-btn-group"> <div class="page-btn-group">
<div> <div>
<el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button> <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>

4
src/views/keyprojects/platformelectronic/index.vue
View File

@ -202,7 +202,7 @@ export default {
{ id: '0', name: '请选择' }, { id: '0', name: '请选择' },
{ id: '1', name: '油管区' }, { id: '1', name: '油管区' },
{ id: '2', name: '码头区' } { id: '2', name: '码头区' }
], ]
} }
}, },
async created() { async created() {
@ -339,7 +339,7 @@ export default {
this.form.VIDEONAME = data.pd.NAME this.form.VIDEONAME = data.pd.NAME
this.form.CODE = data.pd.INDEXCODE this.form.CODE = data.pd.INDEXCODE
this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU this.form.SUOSHUQUYU = data.pd.SUOSHUQUYU
this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + "," +data.pd.LATITUDE this.form.LONGITUDEANDLATITUDE = data.pd.LONGITUDE + ',' + data.pd.LATITUDE
this.listLoading = false this.listLoading = false
resolve() resolve()
}).catch((e) => { }).catch((e) => {

2
src/views/map/components/caofeidian_index.vue
View File

@ -16,7 +16,7 @@
<div class="block3"> <div class="block3">
<layout-title title="人员定位信息"/> <layout-title title="人员定位信息"/>
<div class="options"> <div class="options">
<div v-for="(item,index) in block3OptionsList" :key="index" class="option" v-if="index === 2"> <div v-for="(item,index) in block3OptionsList" v-if="index === 2" :key="index" class="option">
<img :src="item.img" class="img_top" alt=""> <img :src="item.img" class="img_top" alt="">
<img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt=""> <img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt="">
<div class="label">{{ item.label }}</div> <div class="label">{{ item.label }}</div>

4
src/views/map/components/menjinCfd.vue
View File

@ -95,7 +95,7 @@ export default {
title: '人员闸机数', title: '人员闸机数',
img: require('../../../assets/map/menjin/ico1.png'), img: require('../../../assets/map/menjin/ico1.png'),
label1: '在线数', label1: '在线数',
count1: 0, count1: 0
// label2: '离线数', // label2: '离线数',
// count2: 0 // count2: 0
}, },
@ -103,7 +103,7 @@ export default {
title: '车辆闸机数', title: '车辆闸机数',
img: require('../../../assets/map/menjin/ico2.png'), img: require('../../../assets/map/menjin/ico2.png'),
label1: '在线数', label1: '在线数',
count1: 0, count1: 0
// label2: '离线数', // label2: '离线数',
// count2: 0 // count2: 0
}, },

4
src/views/map/components/qixiang.vue
View File

@ -19,11 +19,11 @@
<div class="title">{{ item.title }}</div> <div class="title">{{ item.title }}</div>
<div class="info"> <div class="info">
<div class="img"><img :src="item.img" alt=""></div> <div class="img"><img :src="item.img" alt=""></div>
<div class="count" v-if="item.title == '监测站数'"> <div v-if="item.title == '监测站数'" class="count">
<div>在线数：<count-to :start-val="0" :end-val="+item.onlinecount" :duration="3600"/></div> <div>在线数：<count-to :start-val="0" :end-val="+item.onlinecount" :duration="3600"/></div>
<div>离线数：<count-to :start-val="0" :end-val="+item.Offlinecount" :duration="3600"/></div> <div>离线数：<count-to :start-val="0" :end-val="+item.Offlinecount" :duration="3600"/></div>
</div> </div>
<div class="count" v-else> <div v-else class="count">
<div>在线数：-</div> <div>在线数：-</div>
<div>离线数：-</div> <div>离线数：-</div>
</div> </div>

12
src/views/map/dialog/hotwork.vue
View File

@ -72,31 +72,31 @@
<tr> <tr>
<td class="bbg-transparent">动火单位(部门)负责人意见</td> <td class="bbg-transparent">动火单位(部门)负责人意见</td>
<td colspan="5"> <td colspan="5">
<img v-if="info.HOT_WORK_USER_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.HOT_WORK_USER_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_USER_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">现场管辖单位(部门)负责人意见</td> <td class="bbg-transparent">现场管辖单位(部门)负责人意见</td>
<td colspan="5"> <td colspan="5">
<img v-if="info.UNIT_LEADER_PRINCIPAL" v-viewer :src="config.fileUrl+info.UNIT_LEADER_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.UNIT_LEADER_PRINCIPAL" :src="config.fileUrl+info.UNIT_LEADER_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent">动火许可证签发单位意见</td> <td class="bbg-transparent">动火许可证签发单位意见</td>
<td colspan="5"> <td colspan="5">
<img v-if="info.ISSUING_PRINCIPAL" v-viewer :src="config.fileUrl+info.ISSUING_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.ISSUING_PRINCIPAL" :src="config.fileUrl+info.ISSUING_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="bbg-transparent" rowspan="2">动火前管辖单位现场人员许可</td> <td class="bbg-transparent" rowspan="2">动火前管辖单位现场人员许可</td>
<td colspan="2"> <td colspan="2">
姓名： 姓名：
<img v-if="info.HOT_WORK_PERSON_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.HOT_WORK_PERSON_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_PERSON_PRINCIPAL" width="50px" height="50px">
</td> </td>
<td class="bbg-transparent" rowspan="2">动火后管辖单位现场人员验收</td> <td class="bbg-transparent" rowspan="2">动火后管辖单位现场人员验收</td>
<td colspan="2"> <td colspan="2">
姓名： 姓名：
<img v-if="info.HOT_WORK_AFTER_PRINCIPAL" v-viewer :src="config.fileUrl+info.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px"> <img v-viewer v-if="info.HOT_WORK_AFTER_PRINCIPAL" :src="config.fileUrl+info.HOT_WORK_AFTER_PRINCIPAL" width="50px" height="50px">
</td> </td>
</tr> </tr>
<tr> <tr>
@ -116,7 +116,7 @@
<td>{{ item.userName }}</td> <td>{{ item.userName }}</td>
<td>{{ item.TIME }}</td> <td>{{ item.TIME }}</td>
<td> <td>
<img v-if="item.FILEPATH" v-viewer :src="config.fileUrl+item.FILEPATH" width="50px" height="50px"> <img v-viewer v-if="item.FILEPATH" :src="config.fileUrl+item.FILEPATH" width="50px" height="50px">
</td> </td>
</tr> </tr>
</table> </table>

111
src/views/map/dialog/humiditystation.vue
View File

@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null let myChart4 = null
let myChart5 = null let myChart5 = null
let myChart6 = null const myChart6 = null
export default { export default {
props: { props: {
id: { id: {
@ -46,12 +46,12 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {
config: config, config: config,
info: {}, info: {}
} }
}, },
mounted() { mounted() {
@ -73,7 +73,7 @@ export default {
'/map/getById', '/map/getById',
{ {
id: this.id, id: this.id,
TYPE: this.type, TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -96,7 +96,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: { series: {
@ -136,33 +136,33 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function(e) { formatter: function(e) {
switch (e + "") { switch (e + '') {
case "0": case '0':
return "北"; return '北'
case "45": case '45':
return "东北"; return '东北'
case "135": case '135':
return "东南"; return '东南'
case "225": case '225':
return "西南" return '西南'
case "315": case '315':
return "西北"; return '西北'
case "360": case '360':
return "北"; return '北'
case "180": case '180':
return "南"; return '南'
case "90": case '90':
return "东"; return '东'
case "270": case '270':
return "西"; return '西'
default: default:
return e; return e
} }
}, },
distance: -60, distance: -60,
textStyle: { textStyle: {
fontSize: 14, fontSize: 14,
fontWeight: "", fontWeight: '',
color: '#fff' color: '#fff'
} }
}, },
@ -173,7 +173,7 @@ export default {
}, },
detail: { detail: {
formatter: function(param) { formatter: function(param) {
var level = ''; var level = ''
if (param > 0 && param < 90) { if (param > 0 && param < 90) {
level = '东北' level = '东北'
} else if (param > 90 && param < 180) { } else if (param > 90 && param < 180) {
@ -191,7 +191,7 @@ export default {
} else if (param == 180) { } else if (param == 180) {
level = '正南' level = '正南'
} }
return "当前风向:"+level + "(" + param + "°)"; return '当前风向:' + level + '(' + param + '°)'
}, },
offsetCenter: [0, 190], offsetCenter: [0, 190],
textStyle: { textStyle: {
@ -201,35 +201,34 @@ export default {
}, },
data: [data.pd.WINDDIRECTION] data: [data.pd.WINDDIRECTION]
} }
}; }
myChart4.setOption(option) myChart4.setOption(option)
}, },
initEcharts2(data) { initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5')) myChart5 = echarts.init(document.querySelector('#main5'))
var value = data.pd.TEMPERATURE; var value = data.pd.TEMPERATURE
var kd = []; var kd = []
// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据 // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
for (var i = 0, len = 130; i <= len; i++) { for (var i = 0, len = 130; i <= len; i++) {
if (i > 100 || i < 30) { if (i > 100 || i < 30) {
kd.push('0') kd.push('0')
} else { } else {
if (i % 5 === 0) { if (i % 5 === 0) {
kd.push('5'); kd.push('5')
} else { } else {
kd.push('3'); kd.push('3')
} }
} }
} }
// console.log(kd) // console.log(kd)
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
function getData(value) { function getData(value) {
return [Number(value) + 30]; return [Number(value) + 30]
} }
console.log(getData(value)) console.log(getData(value))
var data = getData(value + 30); var data = getData(value + 30)
var mercuryColor = '#fd4d49'; var mercuryColor = '#fd4d49'
var borderColor = '#fd4d49'; var borderColor = '#fd4d49'
const option = { const option = {
title: { title: {
@ -238,18 +237,18 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
yAxis: [{ yAxis: [{
show: false, show: false,
min: 0, min: 0,
max: 130, max: 130
}, { }, {
show: false, show: false,
data: [], data: [],
min: 0, min: 0,
max: 130, max: 130
}], }],
xAxis: [{ xAxis: [{
show: false, show: false,
@ -263,7 +262,7 @@ export default {
}, { }, {
show: false, show: false,
min: -110, min: -110,
max: 100, max: 100
}], }],
series: [{ series: [{
@ -276,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
barBorderRadius: 0, barBorderRadius: 0
} }
}, },
label: { label: {
@ -285,11 +284,11 @@ export default {
position: 'top', position: 'top',
formatter: function(param) { formatter: function(param) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
return (((param.value * 100) - (30 * 100)) / 100) + '°C'; return (((param.value * 100) - (30 * 100)) / 100) + '°C'
}, },
textStyle: { textStyle: {
color: '#ccc', color: '#ccc',
fontSize: '10', fontSize: '10'
} }
} }
}, },
@ -304,7 +303,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 1 z: 1
@ -318,7 +317,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 0 z: 0
@ -332,7 +331,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
opacity: 1, opacity: 1
} }
}, },
z: 2 z: 2
@ -346,7 +345,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
opacity: 1, opacity: 1
} }
}, },
z: 1 z: 1
@ -360,7 +359,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
opacity: 1, opacity: 1
} }
}, },
z: 0 z: 0
@ -379,12 +378,12 @@ export default {
formatter: function(params) { formatter: function(params) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
if (params.dataIndex > 100 || params.dataIndex < 30) { if (params.dataIndex > 100 || params.dataIndex < 30) {
return ''; return ''
} else { } else {
if (params.dataIndex % 5 === 0) { if (params.dataIndex % 5 === 0) {
return params.dataIndex - 30; return params.dataIndex - 30
} else { } else {
return ''; return ''
} }
} }
} }
@ -396,12 +395,12 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 10, barBorderRadius: 10
} }
}, },
z: 0 z: 0
}] }]
}; }
myChart5.setOption(option) myChart5.setOption(option)
}, },
initEcharts3(data) { initEcharts3(data) {
@ -414,7 +413,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: [ series: [

2
src/views/map/dialog/peoplePositionCfdD.vue
View File

@ -92,7 +92,7 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {

2
src/views/map/dialog/peoplePositionOne.vue
View File

@ -65,7 +65,7 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {

111
src/views/map/dialog/temperaturestation.vue
View File

@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null let myChart4 = null
let myChart5 = null let myChart5 = null
let myChart6 = null const myChart6 = null
export default { export default {
props: { props: {
id: { id: {
@ -46,12 +46,12 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {
config: config, config: config,
info: {}, info: {}
} }
}, },
mounted() { mounted() {
@ -73,7 +73,7 @@ export default {
'/map/getById', '/map/getById',
{ {
id: this.id, id: this.id,
TYPE: this.type, TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -96,7 +96,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: { series: {
@ -136,33 +136,33 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function(e) { formatter: function(e) {
switch (e + "") { switch (e + '') {
case "0": case '0':
return "北"; return '北'
case "45": case '45':
return "东北"; return '东北'
case "135": case '135':
return "东南"; return '东南'
case "225": case '225':
return "西南" return '西南'
case "315": case '315':
return "西北"; return '西北'
case "360": case '360':
return "北"; return '北'
case "180": case '180':
return "南"; return '南'
case "90": case '90':
return "东"; return '东'
case "270": case '270':
return "西"; return '西'
default: default:
return e; return e
} }
}, },
distance: -60, distance: -60,
textStyle: { textStyle: {
fontSize: 14, fontSize: 14,
fontWeight: "", fontWeight: '',
color: '#fff' color: '#fff'
} }
}, },
@ -173,7 +173,7 @@ export default {
}, },
detail: { detail: {
formatter: function(param) { formatter: function(param) {
var level = ''; var level = ''
if (param > 0 && param < 90) { if (param > 0 && param < 90) {
level = '东北' level = '东北'
} else if (param > 90 && param < 180) { } else if (param > 90 && param < 180) {
@ -191,7 +191,7 @@ export default {
} else if (param == 180) { } else if (param == 180) {
level = '正南' level = '正南'
} }
return "当前风向:"+level + "(" + param + "°)"; return '当前风向:' + level + '(' + param + '°)'
}, },
offsetCenter: [0, 190], offsetCenter: [0, 190],
textStyle: { textStyle: {
@ -201,35 +201,34 @@ export default {
}, },
data: [data.pd.WINDDIRECTION] data: [data.pd.WINDDIRECTION]
} }
}; }
myChart4.setOption(option) myChart4.setOption(option)
}, },
initEcharts2(data) { initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5')) myChart5 = echarts.init(document.querySelector('#main5'))
var value = data.pd.TEMPERATURE; var value = data.pd.TEMPERATURE
var kd = []; var kd = []
// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据 // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
for (var i = 0, len = 130; i <= len; i++) { for (var i = 0, len = 130; i <= len; i++) {
if (i > 100 || i < 30) { if (i > 100 || i < 30) {
kd.push('0') kd.push('0')
} else { } else {
if (i % 5 === 0) { if (i % 5 === 0) {
kd.push('5'); kd.push('5')
} else { } else {
kd.push('3'); kd.push('3')
} }
} }
} }
// console.log(kd) // console.log(kd)
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
function getData(value) { function getData(value) {
return [Number(value) + 30]; return [Number(value) + 30]
} }
console.log(getData(value)) console.log(getData(value))
var data = getData(value + 30); var data = getData(value + 30)
var mercuryColor = '#fd4d49'; var mercuryColor = '#fd4d49'
var borderColor = '#fd4d49'; var borderColor = '#fd4d49'
const option = { const option = {
title: { title: {
@ -238,18 +237,18 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
yAxis: [{ yAxis: [{
show: false, show: false,
min: 0, min: 0,
max: 130, max: 130
}, { }, {
show: false, show: false,
data: [], data: [],
min: 0, min: 0,
max: 130, max: 130
}], }],
xAxis: [{ xAxis: [{
show: false, show: false,
@ -263,7 +262,7 @@ export default {
}, { }, {
show: false, show: false,
min: -110, min: -110,
max: 100, max: 100
}], }],
series: [{ series: [{
@ -276,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
barBorderRadius: 0, barBorderRadius: 0
} }
}, },
label: { label: {
@ -285,11 +284,11 @@ export default {
position: 'top', position: 'top',
formatter: function(param) { formatter: function(param) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
return (((param.value * 100) - (30 * 100)) / 100) + '°C'; return (((param.value * 100) - (30 * 100)) / 100) + '°C'
}, },
textStyle: { textStyle: {
color: '#ccc', color: '#ccc',
fontSize: '10', fontSize: '10'
} }
} }
}, },
@ -304,7 +303,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 1 z: 1
@ -318,7 +317,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 0 z: 0
@ -332,7 +331,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
opacity: 1, opacity: 1
} }
}, },
z: 2 z: 2
@ -346,7 +345,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
opacity: 1, opacity: 1
} }
}, },
z: 1 z: 1
@ -360,7 +359,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
opacity: 1, opacity: 1
} }
}, },
z: 0 z: 0
@ -379,12 +378,12 @@ export default {
formatter: function(params) { formatter: function(params) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
if (params.dataIndex > 100 || params.dataIndex < 30) { if (params.dataIndex > 100 || params.dataIndex < 30) {
return ''; return ''
} else { } else {
if (params.dataIndex % 5 === 0) { if (params.dataIndex % 5 === 0) {
return params.dataIndex - 30; return params.dataIndex - 30
} else { } else {
return ''; return ''
} }
} }
} }
@ -396,12 +395,12 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 10, barBorderRadius: 10
} }
}, },
z: 0 z: 0
}] }]
}; }
myChart5.setOption(option) myChart5.setOption(option)
}, },
initEcharts3(data) { initEcharts3(data) {
@ -414,7 +413,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: [ series: [

1
src/views/map/dialog/weatherstation.vue
View File

@ -106,7 +106,6 @@ export default {
this.initEcharts2(data) this.initEcharts2(data)
} }
if (data.pd.WINDSPEED != '-') { if (data.pd.WINDSPEED != '-') {
this.initEcharts3(data) this.initEcharts3(data)
} }
}) })

111
src/views/map/dialog/windspeedstation.vue
View File

@ -32,7 +32,7 @@ import * as echarts from 'echarts'
let myChart4 = null let myChart4 = null
let myChart5 = null let myChart5 = null
let myChart6 = null const myChart6 = null
export default { export default {
props: { props: {
id: { id: {
@ -46,12 +46,12 @@ export default {
default() { default() {
return '' return ''
} }
}, }
}, },
data() { data() {
return { return {
config: config, config: config,
info: {}, info: {}
} }
}, },
mounted() { mounted() {
@ -73,7 +73,7 @@ export default {
'/map/getById', '/map/getById',
{ {
id: this.id, id: this.id,
TYPE: this.type, TYPE: this.type
} }
).then((data) => { ).then((data) => {
this.listLoading = false this.listLoading = false
@ -96,7 +96,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: { series: {
@ -136,33 +136,33 @@ export default {
}, },
axisLabel: { axisLabel: {
formatter: function(e) { formatter: function(e) {
switch (e + "") { switch (e + '') {
case "0": case '0':
return "北"; return '北'
case "45": case '45':
return "东北"; return '东北'
case "135": case '135':
return "东南"; return '东南'
case "225": case '225':
return "西南" return '西南'
case "315": case '315':
return "西北"; return '西北'
case "360": case '360':
return "北"; return '北'
case "180": case '180':
return "南"; return '南'
case "90": case '90':
return "东"; return '东'
case "270": case '270':
return "西"; return '西'
default: default:
return e; return e
} }
}, },
distance: -60, distance: -60,
textStyle: { textStyle: {
fontSize: 14, fontSize: 14,
fontWeight: "", fontWeight: '',
color: '#fff' color: '#fff'
} }
}, },
@ -173,7 +173,7 @@ export default {
}, },
detail: { detail: {
formatter: function(param) { formatter: function(param) {
var level = ''; var level = ''
if (param > 0 && param < 90) { if (param > 0 && param < 90) {
level = '东北' level = '东北'
} else if (param > 90 && param < 180) { } else if (param > 90 && param < 180) {
@ -191,7 +191,7 @@ export default {
} else if (param == 180) { } else if (param == 180) {
level = '正南' level = '正南'
} }
return "当前风向:"+level + "(" + param + "°)"; return '当前风向:' + level + '(' + param + '°)'
}, },
offsetCenter: [0, 190], offsetCenter: [0, 190],
textStyle: { textStyle: {
@ -201,35 +201,34 @@ export default {
}, },
data: [data.pd.WINDDIRECTION] data: [data.pd.WINDDIRECTION]
} }
}; }
myChart4.setOption(option) myChart4.setOption(option)
}, },
initEcharts2(data) { initEcharts2(data) {
myChart5 = echarts.init(document.querySelector('#main5')) myChart5 = echarts.init(document.querySelector('#main5'))
var value = data.pd.TEMPERATURE; var value = data.pd.TEMPERATURE
var kd = []; var kd = []
// 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据 // 刻度使用柱状图模拟，短设置3，长的设置5；构造一个数据
for (var i = 0, len = 130; i <= len; i++) { for (var i = 0, len = 130; i <= len; i++) {
if (i > 100 || i < 30) { if (i > 100 || i < 30) {
kd.push('0') kd.push('0')
} else { } else {
if (i % 5 === 0) { if (i % 5 === 0) {
kd.push('5'); kd.push('5')
} else { } else {
kd.push('3'); kd.push('3')
} }
} }
} }
// console.log(kd) // console.log(kd)
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
function getData(value) { function getData(value) {
return [Number(value) + 30]; return [Number(value) + 30]
} }
console.log(getData(value)) console.log(getData(value))
var data = getData(value + 30); var data = getData(value + 30)
var mercuryColor = '#fd4d49'; var mercuryColor = '#fd4d49'
var borderColor = '#fd4d49'; var borderColor = '#fd4d49'
const option = { const option = {
title: { title: {
@ -238,18 +237,18 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
yAxis: [{ yAxis: [{
show: false, show: false,
min: 0, min: 0,
max: 130, max: 130
}, { }, {
show: false, show: false,
data: [], data: [],
min: 0, min: 0,
max: 130, max: 130
}], }],
xAxis: [{ xAxis: [{
show: false, show: false,
@ -263,7 +262,7 @@ export default {
}, { }, {
show: false, show: false,
min: -110, min: -110,
max: 100, max: 100
}], }],
series: [{ series: [{
@ -276,7 +275,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
barBorderRadius: 0, barBorderRadius: 0
} }
}, },
label: { label: {
@ -285,11 +284,11 @@ export default {
position: 'top', position: 'top',
formatter: function(param) { formatter: function(param) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
return (((param.value * 100) - (30 * 100)) / 100) + '°C'; return (((param.value * 100) - (30 * 100)) / 100) + '°C'
}, },
textStyle: { textStyle: {
color: '#ccc', color: '#ccc',
fontSize: '10', fontSize: '10'
} }
} }
}, },
@ -304,7 +303,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 1 z: 1
@ -318,7 +317,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 50, barBorderRadius: 50
} }
}, },
z: 0 z: 0
@ -332,7 +331,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: mercuryColor, color: mercuryColor,
opacity: 1, opacity: 1
} }
}, },
z: 2 z: 2
@ -346,7 +345,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: '#ffffff', color: '#ffffff',
opacity: 1, opacity: 1
} }
}, },
z: 1 z: 1
@ -360,7 +359,7 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
opacity: 1, opacity: 1
} }
}, },
z: 0 z: 0
@ -379,12 +378,12 @@ export default {
formatter: function(params) { formatter: function(params) {
// 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值 // 因为柱状初始化为0，温度存在负值，所以，原本的0-100，改为0-130，0-30用于表示负值
if (params.dataIndex > 100 || params.dataIndex < 30) { if (params.dataIndex > 100 || params.dataIndex < 30) {
return ''; return ''
} else { } else {
if (params.dataIndex % 5 === 0) { if (params.dataIndex % 5 === 0) {
return params.dataIndex - 30; return params.dataIndex - 30
} else { } else {
return ''; return ''
} }
} }
} }
@ -396,12 +395,12 @@ export default {
itemStyle: { itemStyle: {
normal: { normal: {
color: borderColor, color: borderColor,
barBorderRadius: 10, barBorderRadius: 10
} }
}, },
z: 0 z: 0
}] }]
}; }
myChart5.setOption(option) myChart5.setOption(option)
}, },
initEcharts3(data) { initEcharts3(data) {
@ -414,7 +413,7 @@ export default {
textStyle: { textStyle: {
fontWeight: 'normal', fontWeight: 'normal',
fontSize: 16, fontSize: 16,
color: "#fff" color: '#fff'
} }
}, },
series: [ series: [

8
src/views/map/dialog/xfControl.vue
View File

@ -47,8 +47,8 @@
</div> </div>
<el-carousel :interval="4000" type="card" height="200px"> <el-carousel :interval="4000" type="card" height="200px">
<el-carousel-item v-for="(image, index) in images" :key="index"> <el-carousel-item v-for="(image, index) in images" :key="index">
<img v-if="gangkou === '00004'" v-viewer :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-if="gangkou === '00004'" :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
<img v-else v-viewer :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-else :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
@ -109,8 +109,8 @@
</div> </div>
<el-carousel :interval="4000" type="card" height="200px"> <el-carousel :interval="4000" type="card" height="200px">
<el-carousel-item v-for="(image, index) in images" :key="index"> <el-carousel-item v-for="(image, index) in images" :key="index">
<img v-if="gangkou === '00004'" v-viewer :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-if="gangkou === '00004'" :src="config.cfdfileUrl + image.FILEPATH" style="max-width: 100%;">
<img v-else v-viewer :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;"> <img v-viewer v-else :src="config.fileUrl + image.FILEPATH" style="max-width: 100%;">
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>

28
src/views/security_commitment/promise_book_issued/components/add.vue
View File

@ -408,9 +408,15 @@ export default {
{ {
PROMISE_ID: this.$parent.PROMISE_ID PROMISE_ID: this.$parent.PROMISE_ID
} }
).then((data) => { ).then(async(data) => {
const DETAIL = data.promistDetail.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID })) const DETAIL = data.promistDetail.map(item => ({ value: item.COLLATERAL, id: item.PROMISEDETAIL_ID }))
this.form = { ...data.varList, DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM, DETAIL, people: [], coverpeople: [] } this.form = {
...data.varList,
DISTRIBUTIONOBJECT: data.varList.RELEASE_PLATFORM,
DETAIL,
people: [],
coverpeople: []
}
this.isSelectTemplate = true this.isSelectTemplate = true
for (let i = 0; i < data.people.length; i++) { for (let i = 0; i < data.people.length; i++) {
this.form.people.push({ this.form.people.push({
@ -426,15 +432,15 @@ export default {
for (let j = 0; j < this.form.people.length; j++) { for (let j = 0; j < this.form.people.length; j++) {
if (this.form.DISTRIBUTIONOBJECT === '1') { if (this.form.DISTRIBUTIONOBJECT === '1') {
if (data.people[i].POST_ID === this.form.people[j].POST_ID) { if (data.people[i].POST_ID === this.form.people[j].POST_ID) {
this.form.people[j].USER_ID.push(data.people[i].USER_ID) this.form.people[j].USER_ID = data.people[i].USER_ID
this.form.people.splice(j + 1, 1) this.form.people.splice(j + 1, 1)
this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people') await this.getUserList(this.form.people[j].DEPARTMENT_ID, this.form.people[j].POST_ID, j, 'created', 'people')
} }
} else { } else {
if (data.people[i].DEPARTMENT_ID === this.form.people[j].DEPARTMENT_ID) { if (data.people[i].DEPARTMENT_ID === this.form.people[j].DEPARTMENT_ID) {
this.form.people[j].USER_ID.push(data.people[i].USER_ID) this.form.people[j].USER_ID = data.people[i].USER_ID
this.form.people.splice(j + 1, 1) this.form.people.splice(j + 1, 1)
this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people') await this.getUserList1({ id: this.form.people[j].DEPARTMENT_ID }, j, 'created', 'people')
} }
} }
} }
@ -458,9 +464,9 @@ export default {
}) })
for (let j = 0; j < this.form.coverpeople.length; j++) { for (let j = 0; j < this.form.coverpeople.length; j++) {
if (data.coverpeople[i].DEPARTMENT_ID === this.form.coverpeople[j].DEPARTMENT_ID) { if (data.coverpeople[i].DEPARTMENT_ID === this.form.coverpeople[j].DEPARTMENT_ID) {
this.form.coverpeople[j].USER_ID.push(data.coverpeople[i].USER_ID) this.form.coverpeople[j].USER_ID = data.coverpeople[i].USER_ID
this.form.coverpeople.splice(j + 1, 1) this.form.coverpeople.splice(j + 1, 1)
this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople') await this.getUserList1({ id: this.form.coverpeople[j].DEPARTMENT_ID }, j, 'created', 'coverpeople')
} }
} }
} }
@ -517,6 +523,7 @@ export default {
}, },
// 人员 // 人员
getUserList(DEPARTMENT_ID, POST_ID, index, type, list) { getUserList(DEPARTMENT_ID, POST_ID, index, type, list) {
return new Promise((resolve) => {
if (type !== 'created') { if (type !== 'created') {
let flag = false let flag = false
for (let i = 0; i < this.form[list].length; i++) { for (let i = 0; i < this.form[list].length; i++) {
@ -543,11 +550,14 @@ export default {
if (type !== 'created') { if (type !== 'created') {
this.form[list][index].USER_ID = '' this.form[list][index].USER_ID = ''
} }
resolve()
}).catch((e) => { }).catch((e) => {
}) })
})
}, },
// 人员 // 人员
getUserList1({ id: DEPARTMENT_ID }, index, type, list) { getUserList1({ id: DEPARTMENT_ID }, index, type, list) {
return new Promise((resolve) => {
if (type !== 'created') { if (type !== 'created') {
let flag = false let flag = false
for (let i = 0; i < this.form[list].length; i++) { for (let i = 0; i < this.form[list].length; i++) {
@ -574,8 +584,10 @@ export default {
if (type !== 'created') { if (type !== 'created') {
this.form[list][index].USER_ID = '' this.form[list][index].USER_ID = ''
} }
resolve()
}).catch((e) => { }).catch((e) => {
}) })
})
}, },
addPeople() { addPeople() {
this.form.people.push( this.form.people.push(

9
src/views/security_commitment/promise_book_issued/components/see.vue
View File

@ -23,7 +23,8 @@
<td>{{ form.PROMISE_TERM_END }}</td> <td>{{ form.PROMISE_TERM_END }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">承诺人</el-divider> <el-divider v-if="form.TYPE != '1'" content-position="left">承诺人</el-divider>
<el-divider v-if="form.TYPE == '1'" content-position="left">受状人</el-divider>
<table class="table-ui"> <table class="table-ui">
<tr v-for="(item,index) in form.people" :key="item.id"> <tr v-for="(item,index) in form.people" :key="item.id">
<td v-if="form.RELEASE_PLATFORM === '1'" class="bbg">{{ '单位' + (index + 1) }}</td> <td v-if="form.RELEASE_PLATFORM === '1'" class="bbg">{{ '单位' + (index + 1) }}</td>
@ -36,7 +37,8 @@
<td>{{ item.USERNAME && item.USERNAME.join('、') }}</td> <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">被承诺人</el-divider> <el-divider v-if="form.TYPE != '1'" content-position="left">被承诺人</el-divider>
<el-divider v-if="form.TYPE == '1'" content-position="left">发状人</el-divider>
<table class="table-ui"> <table class="table-ui">
<tr v-for="(item,index) in form.coverpeople" :key="item.id"> <tr v-for="(item,index) in form.coverpeople" :key="item.id">
<td class="bbg">{{ '部门' + (index + 1) }}</td> <td class="bbg">{{ '部门' + (index + 1) }}</td>
@ -45,7 +47,8 @@
<td>{{ item.USERNAME && item.USERNAME.join('、') }}</td> <td>{{ item.USERNAME && item.USERNAME.join('、') }}</td>
</tr> </tr>
</table> </table>
<el-divider content-position="left">承诺内容</el-divider> <el-divider v-if="form.TYPE != '1'" content-position="left">承诺内容</el-divider>
<el-divider v-if="form.TYPE == '1'" content-position="left">责任状内容</el-divider>
<table class="table-ui"> <table class="table-ui">
<tr> <tr>
<td class="bbg">正文</td> <td class="bbg">正文</td>

1
src/views/xgf/flow/components/flowStep.vue
View File

@ -81,7 +81,6 @@ export default {
).then((data) => { ).then((data) => {
this.list = data.flow.info this.list = data.flow.info
this.step = data.flow.STEP this.step = data.flow.STEP
this.step = data.flow.endFlag
if (data.flow.endFlag === '1') { if (data.flow.endFlag === '1') {
this.title = '审批中' this.title = '审批中'
} }

11
src/views/xgf/flow/components/sendUtil.vue
View File

@ -5,7 +5,7 @@
<el-row :gutter="12"> <el-row :gutter="12">
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="STATUS" label="是否通过: "> <el-form-item prop="STATUS" label="是否通过: ">
<el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择"> <el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择" @change="clearInfo">
<el-option label="是" value="1"/> <el-option label="是" value="1"/>
<el-option label="否" value="0"/> <el-option label="否" value="0"/>
</el-select> </el-select>
@ -173,6 +173,7 @@ export default {
} }
).then((data) => { ).then((data) => {
this.peopleList = data.userList this.peopleList = data.userList
this.form.user = ''
}).catch((e) => { }).catch((e) => {
console.log(e) console.log(e)
}) })
@ -210,6 +211,14 @@ export default {
list: [], list: [],
tm: new Date().getTime() tm: new Date().getTime()
} }
},
clearInfo() {
this.form.APPOINT_DEPARTMENT_ID = null
this.form.APPOINT_DEPARTMENT_NAME = ''
this.form.APPOINT_USER_ID = null
this.form.APPOINT_USER_NAME = ''
this.form.OPINION = ''
this.form.user = ''
} }
} }
} }

4
src/views/xgf/peopleList/components/list.vue
View File

@ -42,8 +42,8 @@
<el-table-column label="操作" align="center" width="350"> <el-table-column label="操作" align="center" width="350">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button> <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button> <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowStep(row)">审批详情</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button> <el-button v-if="false" type="primary" icon="el-icon-edit" size="mini" @click="handleShowFlow(row)">审批流程</el-button>
<el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button> <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
<el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button> <el-button v-if="row.power_flag === '1' && row.FLOWS_STEP === 2" type="primary" icon="el-icon-s-claim" size="mini" @click="entrust([row])">委托制单单位审批</el-button>
<el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button> <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>