From a2b8fc101f61384ead7e02c0be7fb9ae714c1b30 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 17 三月 2020 09:22:12 +0800
Subject: [PATCH] 3/17
---
src/components/square.vue | 8 +++++---
src/components/popup/portion/substepReadOnly.vue | 2 +-
.gitignore | 1 +
vue.config.js | 2 +-
src/views/Overview.vue | 42 +++++++++++++-----------------------------
src/components/popup/newProject.vue | 2 +-
6 files changed, 22 insertions(+), 35 deletions(-)
diff --git a/.gitignore b/.gitignore
index a0dddc6..a5be384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
*.njsproj
*.sln
*.sw?
+cloc.exe
diff --git a/src/components/popup/newProject.vue b/src/components/popup/newProject.vue
index a102f54..3f62450 100644
--- a/src/components/popup/newProject.vue
+++ b/src/components/popup/newProject.vue
@@ -136,9 +136,9 @@
},
mounted() {
if(this.rowData.id) {
- this.ruleForm = this.rowData;
this.xmId = this.rowData.id;
}
+ this.ruleForm = this.rowData;
this.userId = localStorage.getItem('userId');
this.assign = localStorage.getItem('assign');
},
diff --git a/src/components/popup/portion/substepReadOnly.vue b/src/components/popup/portion/substepReadOnly.vue
index 3b04c4c..1b41bab 100644
--- a/src/components/popup/portion/substepReadOnly.vue
+++ b/src/components/popup/portion/substepReadOnly.vue
@@ -1487,7 +1487,7 @@
let form_obj = {};
form_obj = this.form_objs[itm_k];
- this.money += form_obj.budget;
+ this.money += parseFloat(form_obj.budget);
}
},
diff --git a/src/components/square.vue b/src/components/square.vue
index 6b0f9ba..b941b7f 100644
--- a/src/components/square.vue
+++ b/src/components/square.vue
@@ -43,6 +43,7 @@
<p v-if="noMore">娌℃湁鏇村浜�</p>
</div>
<el-dialog
+ v-if="dialogVisible"
title="璇︽儏"
:visible.sync="dialogVisible"
width="40%"
@@ -93,11 +94,11 @@
<div style="width: 0px; height: 0px;">
<iframe ref="frame_export" style="width: 0px; height: 0px;"></iframe>
</div>
- <el-dialog @close="Cancel" width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
+ <el-dialog v-if="dialog_1" @close="Cancel" width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
<newProject @closeNewProject="closeNewProject" v-bind:rowData="rowData" ref="newProject_"></newProject>
</el-dialog>
- <el-dialog @close="Cancel1" width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
+ <el-dialog v-if="dialog_2" @close="Cancel1" width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
<newProject ref="newProject1_"></newProject>
</el-dialog>
</div>
@@ -171,7 +172,7 @@
.then(data_ => {
if(data_.data.success) {
this.rowData = {
- id:selected.id,
+ //id:selected.id,
desp:selected.desp,
name:selected.title,
//objective:this.selected.reseachType,
@@ -382,6 +383,7 @@
.handleClose {
margin: 10px;
text-align: left;
+ margin-left: 30%;
}
.handleClose .el-dialog__body {
padding: 10px 20px;
diff --git a/src/views/Overview.vue b/src/views/Overview.vue
index cdf03b7..95cfcec 100644
--- a/src/views/Overview.vue
+++ b/src/views/Overview.vue
@@ -1,8 +1,8 @@
<template>
- <div class="class_overview">
+ <div class="class_overview" >
<div style="float: left; width: 100%; height: 50px;">
<span>璇烽�夋嫨椤圭洰锛�</span>
- <el-select @change="selectChange_" filterable v-model="value" placeholder="璇烽�夋嫨" size="small">
+ <el-select @change="selectChange_" filterable v-model="value" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -14,7 +14,7 @@
<div id="myChart" :style="{width: '100%', height: '100%'}"></div>
</div>
<div class="z_shadow" style="float: left; margin: 10px; margin-top: 0px; width: 46%; height: 58%; border: 1px solid #e4eef9;overflow: auto;padding: 5px;">
- <el-timeline :reverse="reverse" style="margin-top: 30px;">
+ <el-timeline style="margin-top: 30px;">
<el-timeline-item v-for="(deal, index) in deals" :key="index" :timestamp="deal.createTime">
{{deal.desp}}
</el-timeline-item>
@@ -83,22 +83,7 @@
mounted() {
this.initSelect();
this.myChart = this.$echarts.init(document.getElementById('myChart'))
- let fileList1 = [{
- name: "鏂囦欢鍚嶇О1",
- type: "isfile",
- path: ""
- },
- {
- name: "鏂囦欢鍚嶇О2",
- type: "isfile",
- path: ""
- },
- {
- name: "鏂囦欢澶瑰悕绉�",
- type: "isfiles",
- path: ""
- },
- ];
+ let fileList1 = [];
this.fileList = fileList1;
this.initChart();
},
@@ -108,7 +93,6 @@
var me = this;
this.$axios.get("/api/scheme/all")
.then(data_ => {
- console.log(data_);
if (data_.data.success) {
me.options = [];
var datas = data_.data.data;
@@ -121,12 +105,11 @@
});
}
}).catch(error => {
- console.log(error);
})
},
file_click(file) {
if (!file.file) {
-
+
let url = "/api/file/child" ;
this.$axios.get(url,{
params:{
@@ -134,7 +117,7 @@
}
})
.then(data_ => {
- console.log(data_);
+
if (data_.data.success) {
var datas = data_.data.data;
@@ -145,8 +128,8 @@
this.fileLevel++;
}
+
}).catch(error => {
- console.log(error);
})
} else {
@@ -170,7 +153,6 @@
}
})
.then(data_ => {
- console.log(data_);
if (data_.data.success) {
var datas = data_.data.data;
@@ -178,7 +160,6 @@
this.fileLevel--;
}
}).catch(error => {
- console.log(error);
})
},
@@ -188,11 +169,14 @@
},
selectChange_(val) {
let me = this;
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁',
+ });
let url = "/api/scheme/getSchemeInfo/" + this.value;
this.$axios.get(url, {
}).then(data_ => {
- console.log(data_);
if (data_.data.success) {
let result = data_.data.data;
me.initChart(result.option);
@@ -229,10 +213,10 @@
me.fileList = result.paths;
me.task_itm = result.scheme;
me.deals = result.record;
-
+ loading.close();
}
}).catch(error => {
- console.log(error);
+ loading.close();
})
},
diff --git a/vue.config.js b/vue.config.js
index 8c3779d..2995520 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@
devServer: {
proxy: {
'/api/api': {
- target: 'http://highdatas.com:8090',
+ target: 'http://srs.highdatas.com:8090',
changeOrigin: true,
ws: true,
pathRewrite: {
--
Gitblit v1.8.0