Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/startBiddingT.vue

.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
-
+node_modules/.cache
 /dist
 
 

src/components/startBiddingT.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main">
-    <div class="baseInfo">
+    <div class="baseInfo bg">
       <el-h6>基础信息</el-h6>
       <el-table :data="baseInfo.one" stripe style="width: 100%"></el-table>
       <el-table :data="baseInfo.one" stripe style="width: 100%">
@@ -22,17 +22,56 @@
         <el-table-column prop="Founder" label="创建人" />
       </el-table>
     </div>
-    <div class="biddingInfo">
-      <el-h6>基础信息</el-h6>
+    <div class="biddingInfo bg">
+      <el-h6>竞价信息</el-h6>
+      <el-table :data="baseInfo.one" stripe style="width: 100%"></el-table>
       <el-table :data="biddingInfo" stripe style="width: 100%">
         <el-table-column prop="OpeningTime" label="开始时间" />
         <el-table-column prop="CurrentBiddingStatus" label="当前竞标状态" />
         <el-table-column prop="CurrentRound" label="当前轮次" />
       </el-table>
     </div>
-    <div class="ruleInfo"></div>
-    <div class="resultInfo"></div>
-    <div class="processInfo"></div>
+    <div class="ruleInfo bg">
+      <el-h6>规则信息</el-h6>
+      <el-table :data="baseInfo.one" stripe style="width: 100%"></el-table>
+      <el-table :data="ruleInfo" stripe style="width: 100%">
+        <el-table-column prop="RuleName" label="规则名称" />
+        <el-table-column prop="NumberOfRounds" label="轮次数(轮)" />
+        <el-table-column prop="RoundTime" label="轮次时间(分钟)" />
+        <el-table-column prop="IntervalDuration" label="间隔时长(分钟)" />
+      </el-table>
+    </div>
+    <div class="resultInfo bg">
+      <el-h6>结果信息</el-h6>
+      <el-table :data="baseInfo.one" stripe style="width: 100%"></el-table>
+      <el-table :data="resultInfo" stripe style="width: 100%">
+        <el-table-column prop="WinningBidder" label="中标单位" />
+        <el-table-column prop="WinningBidPrice" label="中标价格" />
+        <el-table-column prop="Clients" label="委托方" />
+        <el-table-column prop="PriceCeiling" label="价格上限" />
+        <el-table-column prop="PriceFloor" label="价格下限" />
+      </el-table>
+    </div>
+    <div class="processInfo bg">
+      <el-h6>过程信息</el-h6>
+      <el-table :data="baseInfo.one" stripe style="width: 100%"></el-table>
+      <el-table :data="processInfo" stripe style="width: 100%" height="200">
+        <el-table-column prop="BiddingUnit" label="竞价单位" />
+        <el-table-column prop="FirstTime" label="第1轮竞价时间" />
+        <el-table-column prop="FirstQuote" label="第1轮报价" />
+        <el-table-column prop="SecondTime" label="第2轮竞价时间" />
+        <el-table-column prop="SecondQuote" label="第2轮报价" />
+      </el-table>
+    </div>
+    <div class="countDown">
+      --:--
+    </div>
+    <div class="msg">
+      <el-row :gutter="150">
+        <el-col :span="6"><el-input v-model="input" style="width: 140px" placeholder="Please input" /></el-col>
+        <el-col :span="6"><el-button type="primary">提交</el-button></el-col>
+      </el-row>
+    </div>
   </div>
 </template>
 
@@ -72,6 +111,67 @@ export default {
           CurrentBiddingStatus: '进行中',
           CurrentRound: 1,
         }
+      ],
+      ruleInfo: [
+        {
+          RuleName: '煤炭采购规则',
+          NumberOfRounds: 2,
+          RoundTime: 2,
+          IntervalDuration: 1
+        }
+      ],
+      resultInfo: [
+        {
+          WinningBidder: '',
+          WinningBidPrice: '',
+          Clients: '两家子粮库',
+          PriceCeiling: 1300,
+          PriceFloor: 800
+        }
+      ],
+      processInfo: [
+        {
+          BiddingUnit: '000001',
+          FirstTime: '',
+          FirstQuote: '未报价',
+          SecondTime: '',
+          SecondQuote: '未报价'
+        },
+        {
+          BiddingUnit: '000001',
+          FirstTime: '',
+          FirstQuote: '未报价',
+          SecondTime: '',
+          SecondQuote: '未报价'
+        },
+        {
+          BiddingUnit: '000001',
+          FirstTime: '',
+          FirstQuote: '未报价',
+          SecondTime: '',
+          SecondQuote: '未报价'
+        },
+        {
+          BiddingUnit: '000001',
+          FirstTime: '',
+          FirstQuote: '未报价',
+          SecondTime: '',
+          SecondQuote: '未报价'
+        },
+        {
+          BiddingUnit: '000001',
+          FirstTime: '',
+          FirstQuote: '未报价',
+          SecondTime: '',
+          SecondQuote: '未报价'
+        },
+        {
+          BiddingUnit: '000001',
+          FirstTime: '',
+          FirstQuote: '未报价',
+          SecondTime: '',
+          SecondQuote: '未报价'
+        },
       ]
     }
   },
@@ -83,11 +183,6 @@ export default {
   height: 100%;
 }
 
-.el-table-column {
-  height: 40px;
-  padding: 0;
-}
-
 .baseInfo {
   position: absolute;
   /* background-color: black; */
@@ -95,44 +190,63 @@ export default {
   margin-top: 1%;
   height: 360px;
   width: 420px;
-  box-shadow:0 0 5px 1px #999 ;
-  border-radius: 10px;
-  padding: 1%;
 }
 
 .biddingInfo {
   position: absolute;
   /* background-color: black; */
-  margin-left: 28%;
+  margin-left: 32%;
   margin-top: 1%;
-  height: 80px;
-  width: 600px;
+  height: 120px;
+  width: 550px;
 }
 
 .ruleInfo {
   position: absolute;
-  background-color: black;
-  margin-left: 28%;
-  margin-top: 8%;
-  height: 120px;
-  width: 600px;
+  /* background-color: black; */
+  margin-left: 32%;
+  margin-top: 11.4%;
+  height: 135px;
+  width: 550px;
 }
 
 .resultInfo {
   position: absolute;
-  background-color: black;
+  /* background-color: black; */
   margin-left: 1%;
-  margin-top: 28%;
-  height: 250px;
-  width: 400px;
+  margin-top: 27.3%;
+  height: 150px;
+  width: 420px;
 }
 
 .processInfo {
   position: absolute;
-  background-color: black;
-  margin-left: 28%;
-  margin-top: 16.5%;
-  height: 390px;
-  width: 890px;
+  /* background-color: black; */
+  margin-left: 32%;
+  margin-top: 22.8%;
+  height: 250px;
+  width: 780px;
+}
+
+.bg {
+  box-shadow: 0 0 5px 1px #999;
+  border-radius: 10px;
+  padding: 1%;
+}
+
+.countDown {
+  position: absolute;
+  margin-left: 76%;
+  margin-top: 3%;
+  font-size: 40px;
+  color: red;
+}
+
+.msg {
+  position: absolute;
+  margin-left: 70.8%;
+  margin-top: 18%;
+  font-size: 40px;
+  color: red;
 }
 </style>