wangmengwei 3 周之前
父节点
当前提交
f87bd08781
共有 4 个文件被更改,包括 19 次插入39 次删除
  1. 13 33
      src/views/index.vue
  2. 1 1
      src/views/project/add.vue
  3. 2 2
      src/views/zhaoshang/Information/index.vue
  4. 3 3
      src/views/zhaoshang/touzf/index.vue

+ 13 - 33
src/views/index.vue

@@ -165,7 +165,6 @@
 								      value-format="yyyy"
 								      placeholder="选择年">
 								    </el-date-picker>
-			                   
 			                  </div>
 			                </div>
 			                <div class="block_5 flex-col"></div>
@@ -187,8 +186,6 @@
 							<div style="margin-top: 10px;">
 								<line-chartone v-if="zheshowed" :chart-data="zheixnheyd" />
 							</div>
-			                
-			                
 			              </div>
 		</el-col>
       </el-col>
@@ -283,33 +280,18 @@ export default {
     return {
       // 版本号
       version: "3.9.0",
-	  options: [{
-	            value: '选项1',
-	            label: '黄金糕'
-	          }, {
-	            value: '选项2',
-	            label: '双皮奶'
-	          }, {
-	            value: '选项3',
-	            label: '蚵仔煎'
-	          }, {
-	            value: '选项4',
-	            label: '龙须面'
-	          }, {
-	            value: '选项5',
-	            label: '北京烤鸭'
-	          }],
-	          value: '',
-			  qurt:{time:null},
-			  qurtt:{time:null},
-			  qurtn:{time:null},
-	   lineChartData: lineChartData.newVisitis,
-	   zheshowe:true,
-	   zheshowed:true,
-	   getyer:null,
-	   zheixnhey:{},
-	   zheixnheyd:{},
-	   zheixnheyn:{
+	  options: [],
+	  value: '',
+	  qurt:{time:null},
+	  qurtt:{time:null},
+	  qurtn:{time:null},
+	  lineChartData: lineChartData.newVisitis,
+	  zheshowe:true,
+	  zheshowed:true,
+	  getyer:null,
+	  zheixnhey:{},
+	  zheixnheyd:{},
+	  zheixnheyn:{
 		   yearAll:0,
 		   yearAllPt:null,
 		   yearAllPtStatus:1,
@@ -345,9 +327,8 @@ export default {
 	},
 	// 多统计图
 	zheschand(){
-	  console.log(this.qurtt)
 	  this.getcharnaecs(this.qurtt.time)
-	},
+	},  
 	// 百分比
 	getcharnaecsb(row){
 		indextj(row).then(response => {
@@ -357,7 +338,6 @@ export default {
 		  this.zheixnheyn.jsxxNumbfb = ((this.zheixnheyn.jsxxNum/this.zheixnheyn.yearAll).toFixed(2)) * 100
 		  this.zheixnheyn.tcxxNumbfb = ((this.zheixnheyn.tcxxNum/this.zheixnheyn.yearAll).toFixed(2)) * 100
 		  this.zheixnheyn.wcxxNumbfb = ((this.zheixnheyn.wcxxNum/this.zheixnheyn.yearAll).toFixed(2)) * 100
-		  
 		});
 	},
 	// 折线

+ 1 - 1
src/views/project/add.vue

@@ -55,7 +55,7 @@
                 </el-tab-pane>
             </el-tabs>
 
-            <div class="btns flexcc">
+            <div class="btns flexcc" v-if="progress == 4">
               <el-button v-hasPermi="['zhaoshangV3:qyxx:edit']" type="success" size="small" @click="hunpl">完成</el-button>
             </div>
         <!-- </div> -->

+ 2 - 2
src/views/zhaoshang/Information/index.vue

@@ -85,12 +85,12 @@
       return{
         active:2,
         step:[
-          {tit:'立项',desc:[{tit:'新建'},{tit:'审核'}]},
+          {tit:'立项',desc:[{tit:'新建'},]},
           {tit:'签约',desc:[{tit:'签约双方信息'},{tit:'签约项目信息'},{tit:'附件上传'}]},
           {tit:'开工',desc:[{tit:'开工前相关手续办理'},{tit:'开工信息'},{tit:'附件上传'}]},
           {tit:'建设',desc:[{tit:'建设信息'},{tit:'附件上传'}]},
           {tit:'投产',desc:[{tit:'投产信息'},{tit:'附件上传'}]},
-          {tit:'完成',desc:[{tit:'提交'},{tit:'审核'}]},
+          {tit:'完成',desc:[]},
         ],
         activeName:'first',
         // 表详细信息

+ 3 - 3
src/views/zhaoshang/touzf/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
     <el-form style="background-color: #fff;border-radius: 4px; padding-top: 20px;" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
-      <el-form-item label="投资方名称" prop="tzf">
+      <el-form-item label="名称" prop="zcqymc">
         <el-input  
-          v-model="queryParams.tzf"
+          v-model="queryParams.zcqymc"
           placeholder="请输入投资方名称"
           clearable
           @keyup.enter.native="handleQuery"
@@ -335,7 +335,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加公告"
+      this.title = "添加信息"
     },
 	// 历史投资
 	lsihge(item){