Commit fc532ca5 authored by 张俊's avatar 张俊

修改

parent 7bb655f4
...@@ -115,12 +115,18 @@ ...@@ -115,12 +115,18 @@
:styles="item.prop == 'cpu' ? spCurveStyles2 : spCurveStyles3" :styles="item.prop == 'cpu' ? spCurveStyles2 : spCurveStyles3"
/> />
</sparkline> </sparkline>
<span class="use" v-if="item.prop == 'cpu'" <span class="use" v-if="item.prop == 'cpu'&&scope.row.cpu_use"
>{{ scope.row["cpu_use"] }}.00mm</span >{{ scope.row["cpu_use"] }}.00mm</span
> >
<span class="use" v-if="item.prop == 'mermoy'" <span class="use" v-if="item.prop == 'cpu'&&!scope.row.cpu_use"
>0mm</span
>
<span class="use" v-if="item.prop == 'mermoy'&&scope.row.memory_use"
>{{ scope.row["memory_use"] }}Mi</span >{{ scope.row["memory_use"] }}Mi</span
> >
<span class="use" v-if="item.prop == 'mermoy'&&!scope.row.memory_use"
>0Mi</span
>
</div> </div>
<div v-else-if="item.type === 'image'" class="img_content"> <div v-else-if="item.type === 'image'" class="img_content">
<img <img
......
...@@ -221,11 +221,6 @@ export default { ...@@ -221,11 +221,6 @@ export default {
open(){ open(){
this.maxline = '' this.maxline = ''
}, },
open1(){
this.maxline1 = ''
this.usetime1 = ''
this.timevalue = ''
},
}, },
computed: { computed: {
...mapGetters([ ...mapGetters([
...@@ -385,6 +380,9 @@ export default { ...@@ -385,6 +380,9 @@ export default {
}else{ }else{
this.open1 = 1 this.open1 = 1
} }
this.maxline1 = ''
this.usetime1 = ''
this.timevalue = ''
}, },
openstart2(){ openstart2(){
if(this.open2){ if(this.open2){
......
...@@ -273,7 +273,7 @@ export default { ...@@ -273,7 +273,7 @@ export default {
getNewList(val) { getNewList(val) {
console.log(val); console.log(val);
this.form.fileList = "" this.form.fileList = ""
this.form.fileList = [val].map((v,k)=>{ this.form.fileList = val.map((v,k)=>{
return v.url return v.url
}).join(';') }).join(';')
console.log(this.form.fileList) console.log(this.form.fileList)
......
...@@ -53,122 +53,6 @@ export default { ...@@ -53,122 +53,6 @@ export default {
data() { data() {
return { return {
now_user: 0, //0:普通用户,1:组织管理员,2:超级管理员 now_user: 0, //0:普通用户,1:组织管理员,2:超级管理员
approval_arr: [
{
title: "一级审批",
result: "审批通过",
arr: [
{
title: "审批时间:",
info: "2020-02-28 15:23:45",
},
{
title: "审批单位:",
info: "某某某城管局",
},
{
title: "审批人:",
info: "张先生",
},
{
title: "审批意见:",
info: "同意",
},
],
},
{
title: "二级审批",
result: "审批通过",
arr: [
{
title: "审批时间:",
info: "2020-02-28 15:23:45",
},
{
title: "审批单位:",
info: "某某某城管局",
},
{
title: "审批人:",
info: "张先生",
},
{
title: "审批意见:",
info: "同意",
},
],
},
],
approval_arr1: [
{
title: "一级审批",
result: "审批通过",
arr: [
{
title: "审批时间:",
info: "2020-02-28 15:23:45",
},
{
title: "审批单位:",
info: "某某某城管局",
},
{
title: "审批人:",
info: "张先生",
},
{
title: "审批意见:",
info: "同意",
},
],
},
{
title: "二级审批",
result: "审批未通过",
arr: [
{
title: "审批时间:",
info: "2020-02-28 15:23:45",
},
{
title: "审批单位:",
info: "某某某城管局",
},
{
title: "审批人:",
info: "张先生",
},
{
title: "审批意见:",
info: "不同意,驳回。",
},
],
},
],
approval_arr2: [
{
title: "一级审批",
result: "审批未通过",
arr: [
{
title: "审批时间:",
info: "2020-02-28 15:23:45",
},
{
title: "审批单位:",
info: "某某某城管局",
},
{
title: "审批人:",
info: "张先生",
},
{
title: "审批意见:",
info: "不同意,驳回。",
},
],
},
],
approval_arr3:[], approval_arr3:[],
service_arr: ["基本信息", "申请审批信息"], service_arr: ["基本信息", "申请审批信息"],
service_header_arr: { service_header_arr: {
...@@ -204,7 +88,7 @@ export default { ...@@ -204,7 +88,7 @@ export default {
"text": "2020-02-28 17:59:30" "text": "2020-02-28 17:59:30"
} }
], ],
aqdetail: true, // aqdetail: true,
}, },
now_service: 0, now_service: 0,
list_arr:[ list_arr:[
......
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