Explorar el Código

Merge branch 'master' of http://124.221.234.135:13000/zklt-CD/orbit-ch-web

otmself hace 4 meses
padre
commit
9dd090200f

+ 2 - 1
public/config.js

@@ -1,6 +1,7 @@
 window.mapUrl = "http://192.168.1.188:9109/map/?z={z}&x={x}&y={y}"; //地图服务地址
 //window.baseUrl = "http://127.0.0.1:9999/"; //谢建电脑服务地址
-window.baseUrl = "http://192.168.3.33:9999/"; //谢建电脑服务地址
+// window.baseUrl = "http://192.168.3.33:9999/"; //谢建电脑服务地址
+window.baseUrl = "http://192.168.31.188:9999/"; //谢建电脑服务地址
 // window.baseUrl = "http://192.168.1.129:1003/"; //景辉电脑服务地址
 // window.baseUrl = "http://192.168.1.77:9999/"; //伍汭服务地址
 // window.baseUrl = "http://192.168.1.55:9999/"; //博文服务地址

+ 160 - 0
src/components/tables/xqch_CHplanTable.vue

@@ -109,8 +109,94 @@
           width="80"
           align="center">
           </el-table-column>
+          <el-table-column
+          label="操作"
+          width="170"
+          align="center">
+            <template slot-scope="scope">
+              <el-button
+              type="text"
+              size="mini"
+              @click="estimateDialog">方案评估</el-button>
+              <el-button
+              type="text"
+              size="mini"
+              @click="rollbackDialog">方案回滚</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
+
+      <el-dialog class="fakedata-custom-dialog" title="方案评估" :visible.sync="estimateDialogVis" width="40%"
+      :close-on-click-modal="false">
+        <div style="margin-bottom: 10px;">需求满足度评估</div>
+        <el-table
+          :data="satisfactionData"
+          max-height="200">
+          <el-table-column
+          v-for="(col, i) in satisfactionCols"
+          :key="i"
+          :prop="col.prop"
+          :label="col.label"
+          align="center">
+          </el-table-column>
+        </el-table>
+        <div style="margin-bottom: 10px;">资源利用率评估</div>
+        <el-table
+          :data="utilizationData"
+          max-height="200">
+          <el-table-column
+          v-for="(col, i) in utilizationCols"
+          :key="i"
+          :prop="col.prop"
+          :label="col.label"
+          align="center">
+          </el-table-column>
+        </el-table>
+        <div style="margin-bottom: 10px;">方案适配度评估:</div>
+        <el-table
+          :data="adaptationData"
+          max-height="200">
+          <el-table-column
+          v-for="(col, i) in adaptationCols"
+          :key="i"
+          :prop="col.prop"
+          :label="col.label"
+          align="center">
+          </el-table-column>
+        </el-table>
+
+      </el-dialog>
+
+      <el-dialog class="fakedata-custom-dialog" title="方案回滚" :visible.sync="rollbackDialogVis" width="40%"
+      :close-on-click-modal="false">
+        <div style="margin-bottom: 10px;">筹划方案调整</div>
+        <el-table
+          :data="adjustData"
+          max-height="200">
+          <el-table-column
+          v-for="(col, i) in adjustCols"
+          :key="i"
+          :prop="col.prop"
+          :label="col.label"
+          align="center">
+          </el-table-column>
+        </el-table>
+        <div style="margin-bottom: 10px;">筹划算法回滚</div>
+        <el-table
+          :data="algorithmData"
+          max-height="200">
+          <el-table-column
+          v-for="(col, i) in algorithmCols"
+          :key="i"
+          :prop="col.prop"
+          :label="col.label"
+          align="center">
+          </el-table-column>
+        </el-table>
+      </el-dialog>
+
+
       <!-- <div class="pagination-div">
         <el-pagination
         @size-change="handleSizeChange"
@@ -148,9 +234,71 @@ export default{
 
         normalBackground: 'rgba(160, 160, 160, 0.3)',
         xqchSelecedItems: [],
+
+        estimateDialogVis: false,
+        rollbackDialogVis: false,
+        satisfactionCols: [
+          {prop:'a1', label:'绝对满足数量'},
+          {prop:'a2', label:'优先满足数量'},
+          {prop:'a3', label:'来源满足数量'},
+        ],
+        satisfactionData:[
+          {a1:10,a2:12,a3:13},
+          {a1:22,a2:13,a3:14},
+        ],
+        utilizationCols: [
+          {prop:'a1', label:'工作时间'},
+          {prop:'a2', label:'频次'},
+          {prop:'a3', label:'样式'},
+          {prop:'a4', label:'效率'},
+        ],
+        utilizationData:[
+          {a1:1,a2:2,a3:3,a4:4},
+          {a1:2,a2:3,a3:4,a4:5},
+        ],
+        adaptationCols: [
+          {prop:'a1', label:'约束适配'},
+          {prop:'a2', label:'筹划适配'},
+        ],
+        adaptationData:[
+          {a1:1,a2:2},
+          {a1:2,a2:3},
+        ],
+
+        adjustCols: [
+          {prop:'a0', label:'方案名称'},
+          {prop:'a1', label:'人在回路'},
+          {prop:'a2', label:'关联度分析'},
+        ],
+        adjustData:[
+          {a0:'方案1',a1:'12',a2:'已分析'},
+          {a0:'方案2',a1:'21',a2:'未分析'},
+        ],
+
+        algorithmCols: [
+          {prop:'a0', label:'方案名称'},
+          {prop:'a1', label:'筹划断点'},
+          {prop:'a2', label:'回滚重筹划'},
+        ],
+        algorithmData: [
+          {a0:'方案1',a1:'129',a2:'已分析'},
+          {a0:'方案2',a1:'132',a2:'未分析'},
+        ]
       }
     },
     methods: {
+      estimateDialog(){
+        console.log("方案评估");
+        this.estimateDialogVis = true;
+      },
+      rollbackDialog(){
+        console.log("方案回滚");
+        this.rollbackDialogVis = true;
+      },
+
+
+
+
       handleRowStyle(row){
         console.log("@@@row.row.stepId",row.row.stepId);
         console.log("@@@this.$store.state.xqchPGandCHsameId:",this.$store.state.xqchPGandCHsameId);
@@ -317,4 +465,16 @@ export default{
 /deep/ .btn-next, /deep/ .btn-prev{
     padding: 0 2px;
 }
+</style>
+
+<style lang="scss">
+.fakedata-custom-dialog {
+  .el-dialog__title{
+    color: #fff;
+  }
+  .el-dialog__header,.el-dialog__body {
+    color: #fff;
+    background-color: #18304f;
+  }
+}
 </style>

+ 3 - 3
src/components/xqchComponents/estimatePlan.vue

@@ -126,7 +126,7 @@ export default {
   }
 
   .CHplan-area {
-    width: 1200px;
+    width: 1510px;
     height: 300px;
     background: url('@/assets/ClipImage/dikuang/chouhuafangan.png');
     background-size: 100% 100%;
@@ -134,7 +134,7 @@ export default {
     margin: 0 auto;
 
     .CHplan-title {
-      width: 1200px;
+      width: 1510px;
       height: 38px;
       background: url('@/assets/ClipImage/biaoti/chouhuafangan.png');
       background-size: 100% 100%;
@@ -143,7 +143,7 @@ export default {
     }
 
     .CHplan-table {
-      width: 1200px;
+      width: 1510px;
       height: 300px;
       box-sizing: border-box;
       padding: 10px;