样式修改

haoxuan

2023-08-19 576cfb49d7a8244f9a018d9c31b58b664737817b

 src/views/visualization.vue

@@ -4,7 +4,7 @@
    <template v-if="Object.keys(taskData).length > 0">
      <div class="left">
          <p class="title">
            设A423生产管理看板
          生产管理看板
            <span
              class="font el-icon-setting set-title"
              style="float: right"
@@ -14,9 +14,7 @@
          <div class="statelist">
            <span class="title-item"
              >订单编号:
              <span class="color_4efefa">{{
                taskData.Order.orderId || ""
              }}</span>
            <span class="color_4efefa">{{ taskData.Order.orderId || "" }}</span>
            </span>
            <span class="title-item"
              >当前工序:
@@ -25,14 +23,18 @@
              }}</span>
            </span>
            <span class="title-item"
              >后道工序: <span class="color_4efefa">
            >后道工序:
            <span class="color_4efefa">
                <!-- {{
                taskData.NextProcedure.procedure.procedureName || "--"
              }} -->
              </span>
            </span>
            <span class="title-item"
              >工作人数: <span class="color_4efefa">{{ taskData.Procedure.procedure.workers.length || 0}}人</span>
            >工作人数:
            <span class="color_4efefa"
              >{{ taskData.Procedure.procedure.workers.length || 0 }}人</span
            >
            </span>
          </div>
          <div class="content">
@@ -41,7 +43,9 @@
                <div class="small_title">当前完成</div>
                <div class="content_leftBttom">
                  <dl>
                    <dd style="font-size: 26px; font-weight: 600">{{ finishNumber }}{{  taskData.Order.unit }}</dd>
                  <dd style="font-size: 26px; font-weight: 600">
                    {{ finishNumber }}{{ taskData.Order.unit }}
                  </dd>
                  </dl>
                </div>
              </div>
@@ -49,9 +53,9 @@
                <div class="small_title">正品生产</div>
                <div class="content_leftBttom">
                  <dl>
                    <dd style="font-size: 26px; font-weight: 600">{{
                  taskData.Order.amount || 0
                }}{{  taskData.Order.unit }}</dd> 
                  <dd style="font-size: 26px; font-weight: 600">
                    {{ taskData.Order.amount || 0 }}{{ taskData.Order.unit }}
                  </dd>
                  </dl>
                </div>
              </div>
@@ -61,46 +65,49 @@
                <el-descriptions-item label="产品名称">{{
                  taskData.Order.productName || ""
                }}</el-descriptions-item>
                <el-descriptions-item label="数量">{{
                  taskData.Order.amount || 0
                }}{{  taskData.Order.unit }}</el-descriptions-item>
              <el-descriptions-item label="数量"
                >{{ taskData.Order.amount || 0
                }}{{ taskData.Order.unit }}</el-descriptions-item
              >
                <el-descriptions-item label="交货日期">{{
                  taskData.Order.deliverDate || ""
                }}</el-descriptions-item>
                <el-descriptions-item label="工时">
                  {{ taskData.Procedure.procedure.workHours || "" }}
                </el-descriptions-item>
                <el-descriptions-item label="起止时间">{{
              <el-descriptions-item label="起止时间"
                >{{
                  formatDate(taskData.Procedure.procedure.startTime)  || ""
                }}  - {{ formatDate(taskData.Procedure.procedure.endTime) }}</el-descriptions-item>
                <el-descriptions-item label="货物描述"
                  >{{
                }}
                -
                {{
                  formatDate(taskData.Procedure.procedure.endTime)
                }}</el-descriptions-item
              >
              <el-descriptions-item label="货物描述">{{
                  taskData.Order.orderAttr || ""
                }}</el-descriptions-item
                >
                <el-descriptions-item label="客户名称"
                  >{{
              }}</el-descriptions-item>
              <el-descriptions-item label="客户名称">{{
                  taskData.Order.customer || ""
                }}</el-descriptions-item
                >
                <el-descriptions-item label="参数要求"
                  >{{
              }}</el-descriptions-item>
              <el-descriptions-item label="参数要求">{{
                  taskData.Order.parameter || ""
                }}</el-descriptions-item
                >
              }}</el-descriptions-item>
              </el-descriptions>
              <el-descriptions :column="1" :colon="true">
                <el-descriptions-item label="完成度" style="width: 100%">
                  <!--:text-format="format"  -->
                  <el-progress
                    define-back-color="#007101"
                    color="#00CC66"
                  define-back-color="#133EAF"
                  color="#09E5ED"
                    :text-inside="true"
                    :stroke-width="30"
                    :percentage="parseInt(finishNumber/taskData.Order.amount)"
                    
                    ></el-progress
                  >
                  :percentage="
                    finishNumber && taskData.Order.amount
                      ? parseInt(finishNumber / taskData.Order.amount)
                      : 0
                  "
                ></el-progress>
                </el-descriptions-item>
                <!-- <el-descriptions-item label="合格率" style="width: 100%">
                  <el-progress
@@ -116,12 +123,7 @@
          </div>
          <div class="bottom">
            <div class="bottom_list">
              <div class="bottom-title">
                输入资源
                <el-button type="primary" class="color_f70f83" size="small">
                  物料呼叫</el-button
                >
              </div>
            <div class="bottom-title">输入资源</div>
              <el-carousel
                direction="vertical"
                height="calc(100% -  0px)"
@@ -137,15 +139,9 @@
                  :key="index"
                  v-for="(item, index) in inputMaterials"
                >
                  <div
                    class="card"
                    :key="index2"
                    v-for="(list, index2) in item"
                  >
                <div class="card" :key="index2" v-for="(list, index2) in item">
                    <div class="card_content">
                      <div class="card_contentLeft">
                        {{ list.materialId}}
                      </div>
                    <div class="card_contentLeft">{{ list.materialId }}</div>
                    </div>
                    <div class="card_top">
                      <div>
@@ -158,38 +154,37 @@
                      </div>
                    </div>
                    <div class="card_top2">
                      <div style="line-height:45px;text-align:center;">
                      {{  list.amount}} {{ list.unit }}</div>
                    <div style="line-height: 45px; text-align: center">
                      {{ list.amount }} {{ list.unit }}
                    </div>
                      <!-- <span class="card-top-r-t">生产完成</span>
                      <span class="card-top-r-b">12月28日 08:24</span> -->
                    </div>
                  </div>
                </el-carousel-item>
              </el-carousel>
            <el-button type="primary" class="color_f70f83">
              <i class="el-icon-phone-outline" />物料呼叫</el-button
            >
            </div>
            <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
            <div class="bottom_list">
              <div class="bottom-title">当前工序:{{
                taskData.Procedure.procedure.procedureName || ""
              }}</div>
            <div class="bottom-title">
              当前工序:{{ taskData.Procedure.procedure.procedureName || "" }}
            </div>
              <el-carousel
                direction="vertical"
                height="calc(100% -  0px)"
                :interval="500"
                class="card-box"
                ref="cardBox2"
                v-if="
                  taskData.Procedure.procedure &&
                  procedureList
                "
              v-if="taskData.Procedure.procedure && procedureList"
              >
                <el-carousel-item
                  :key="index"
                  v-for="(item, index) in procedureList"
                >
                  <div class="card" 
                  :key="index2"
                    v-for="(list, index2) in item">
                <div class="card" :key="index2" v-for="(list, index2) in item">
                    <template v-if="list.name=='工序'">
                      <div class="card_content">
                        <div class="card_contentLeft color_blue">
@@ -198,50 +193,71 @@
                        </div>
                      </div>
                      <div class="card_top-3">
                        <span class="card-top-r-t">完成进度：{{ parseInt(finishNumber/taskData.Order.amount)||0 }}</span>
                      <span class="card-top-r-t"
                        >完成进度：{{
                          parseInt(finishNumber / taskData.Order.amount) || 0
                        }}</span
                      >
                        <span class="card-top-r-b">
                       
                          <el-progress
                            define-back-color="#007101"
                            color="#00CC66"
                          define-back-color="#133EAF"
                          color="#09E5ED"
                            :text-inside="true"
                            :stroke-width="10"
                            :percentage="parseInt(finishNumber/taskData.Order.amount)"
                          :percentage="
                           parseInt(finishNumber / taskData.Order.amount)
                          "
                            :show-text="false"
                          ></el-progress>
                        </span>
                      </div>
                      <div class="card_top-2">
                        <div style="line-height:45px;text-align:center;">
                        生产中</div>
                      <div style="line-height: 45px; text-align: center">
                        生产中
                      </div>
                        <!-- <span class="card-top-r-t">完成进度：50%</span>
                        <span class="card-top-r-b">12月28日 08:24</span> -->
                      </div>
                    </template>
                    <template v-else>
                      <div class="card_content">
                          <div class="card_contentLeft color_blue">
                            工艺编号：{{ list.number }}
                          </div>
                        </div>
                        <div class="card_top-4">
                         工艺的具体信息请点击控制查看！
                        </div>
                    <!-- <div class="card_content">
                      
                    </div> -->
                    <div class="card_top-4"><div>工艺编号：{{ list.number }}</div>
                      <div style="font-size:14px;color:#cfcfcf;line-height:20px">工艺的具体信息请点击控制查看！</div></div>
                    </template>
                  </div>
                </el-carousel-item>
              </el-carousel>
              
              <p
                style="font-size: 22px; margin-left: 12px; margin-top: 50px"
              ></p>
            <p style="font-size: 22px; margin-left: 12px; margin-top: 50px"></p>
            <div class="right-small-btn">
              <el-button type="primary"> 打印</el-button>
              <el-popover
                placement="top-end"
                width="160"
                class="button-finish"
                v-model="finishShow"
                trigger="click"
              >
                <p>请确认是否已完成该生产任务?</p>
                <div style="text-align: right; margin: 0">
                  <el-button size="mini" @click="finishShow = false">
                    取消</el-button
                  >
                  <el-button type="primary" size="mini" @click="finishClick">
                    确定</el-button
                  >
                </div>
                <el-button type="primary" slot="reference"> 完成</el-button>
              </el-popover>
            </div>
            </div>
            <i class="el-icon-arrow-right font-arrow-20 color_4efefa"></i>
            <div class="bottom_list">
              <div class="bottom-title">
                <span>输出资源</span>
                <el-button type="primary" class="color_organge" size="small">
                  运输呼叫</el-button
                >
              </div>
              <el-carousel
                direction="vertical"
@@ -263,9 +279,7 @@
                  :key="index2"
                  v-for="(list, index2) in item"
                >
                  <div
                    class="card"
                  >
                  <div class="card">
                    <div class="card_content">
                      <div class="card_contentLeft">{{  list.materialId}}</div>
                    </div>
@@ -280,11 +294,11 @@
                      </div>
                    </div>
                    <div class="card_top2">
                      <div style="line-height:45px;text-align:center;">
                      {{  list.amount}} {{ list.unit }}</div>
                      <div style="line-height: 45px; text-align: center">
                        {{ list.amount }} {{ list.unit }}
                      </div>
                      <!-- <span class="card-top-r-t">生产完成</span>
                      <span class="card-top-r-b">12月28日 08:24</span> -->
                      
                    </div>
                    <!-- <div class="card-info-box">预计10分钟送达</div> -->
                  </div>
@@ -311,6 +325,9 @@
                </div>
                </el-carousel-item>
                </el-carousel>
            <el-button type="primary" class="color_f70f83">
              <i class="el-icon-phone-outline" />运输呼叫</el-button
            >
            </div>
          </div>
      </div>
@@ -341,22 +358,27 @@
        </div>
        <div class="right_dutyLst">
          <div class="right-small-title">当前值班</div>
          <div class='right-person-box'>
          <dl class="right-small-person" v-for="(item,index) in taskData.Procedure.procedure.workers" :key="index">
          <div class="right-person-box">
            <dl
              class="right-small-person"
              v-for="(item, index) in taskData.Procedure.procedure.workers"
              :key="index"
            >
            <dt>
              <!-- <el-avatar
                class="img-class"
                src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"
              ></el-avatar> -->
              <i class="el-icon-s-custom color_green" style='margin:10px;font-size:40px; '/>
                <i
                  class="el-icon-s-custom"
                  style="margin: 10px; font-size: 40px"
                />
            </dt>
            <span
              style="font-size: 20px; font-weight: 600; margin-right: 10px"
              >{{ item.workerName || "" }}</span
            >
            <span style="color: #666">{{
              item.phoneNum || ""
            }}</span>
              <span style="color: #666">{{ item.phoneNum || "" }}</span>
          </dl>
          </div>
          <!-- <div
@@ -371,32 +393,14 @@
          >
            编号：{{ taskData.Procedure.procedure.workers.workerId || "" }}
          </div> -->
          <div class="right-small-btn">
            <el-button type="primary"> 打印</el-button>
            <el-popover
              placement="top-end"
              width="160"
              class="button-finish"
              v-model="finishShow"
              trigger="click"
            >
              <p>请确认是否已完成该生产任务?</p>
              <div style="text-align: right; margin: 0">
                <el-button size="mini" @click="finishShow = false">
                  取消</el-button
                >
                <el-button type="primary" size="mini" @click="finishClick">
                  确定</el-button
                >
              </div>
              <el-button type="primary" slot="reference"> 完成</el-button>
            </el-popover>
          </div>
        </div>
        <div class="right_base">
          <div class="right-small-title" style="line-height:40px;">知识库</div>
          <Knowledge />
          <div class="right-base-btn call">
            <el-button type="primary"> 红灯呼叫</el-button>
            <el-button type="primary"
              ><i class="el-icon-phone-outline" /> 红灯呼叫</el-button
            >
          </div>
        </div>
      </div>
@@ -455,9 +459,26 @@
      finishNumber:0,
      // 右侧完成
      finishShow: false,
      inputMaterials: [],
      inputMaterials: [
        {
          amount: 1,
          materialId: 1,
          materialName: 1,
        },
      ],
      outputMaterials:[],
      procedureList:[],
      procedureList: [
        [
        {
            number:10,
            name:'工序'
          },
          {
            number:10,
          },
          
        ]
      ],
      taskData: {
        Order: {
          amount: "",
@@ -477,7 +498,13 @@
          procedure: {
            deviceId: "",
            endTime: "",
            inputMaterials: [],
            inputMaterials: [
              {
                amount: 1,
                materialId: 1,
                materialName: 1,
              },
            ],
            outputMaterials: [],
            procedureId: "",
            procedureName: "",
@@ -503,34 +530,33 @@
    // }, 3000);
    this.getTaskInfo();
    setInterval(() => {
      this.getProgressInfo()
      this.getProgressInfo();
    }, 60000);
  },

  methods: {
    getProgressInfo(){
      getProgress().then(res=>{
      getProgress().then((res) => {
              if(res.code==200){
               
              }
            })
      });
    },
    getDateObj (ms) {
    const now = ms ? new Date(ms) : new Date()
    const y = now.getFullYear()
    let m = now.getMonth() + 1
    m = m > 9 ? m : '0' + m
    let d = now.getDate()
    d = d > 9 ? d : '0' + d
    return { y, m, d }
      const now = ms ? new Date(ms) : new Date();
      const y = now.getFullYear();
      let m = now.getMonth() + 1;
      m = m > 9 ? m : "0" + m;
      let d = now.getDate();
      d = d > 9 ? d : "0" + d;
      return { y, m, d };
  },
    // 格式化时间 ==> yyyy-mm-dd
  formatDate (value, str) {
    if (value) {
      const dateObj = this.getDateObj(value)
       return '' + dateObj.y + '-' + dateObj.m + '-' + dateObj.d
        const dateObj = this.getDateObj(value);
        return "" + dateObj.y + "-" + dateObj.m + "-" + dateObj.d;
    } else {
      return ''
        return "";
    }
  },
    setInterCard(value, name) {
@@ -570,23 +596,28 @@
      getTaskInfo().then((res) => {
        if (res.code == 200) {
          this.taskData=res.data;
          this.procedureList.push([{
            name:'工序',
            ...this.taskData.Procedure.procedure
          }])
          this.procedureList.push([
            {
              name: "工序",
              ...this.taskData.Procedure.procedure,
            },
          ]);
          if(this.taskData.Procedure.ID){
            startTask({id:this.taskData.Procedure.ID}).then(res=>{
            startTask({ id: this.taskData.Procedure.ID }).then((res) => {
              if(res.code==200){
                // res.data.number
                this.procedureList[0].push({number:res.data.number,name:'工艺'})
                this.procedureList[0].push({
                  number: res.data.number,
                  name: "工艺",
                });
              }
            })
            });
          }
          console.log(this.procedureList,'===1111procedureList')
          console.log(this.procedureList, "===1111procedureList");
          // setTimeout(() => {
            this.setInterCard("inputMaterials", "cardBox1");
            // this.setInterCard('procedureList','cardBox2')
            this.setInterCard('outputMaterials','cardBox3')
          this.setInterCard("outputMaterials", "cardBox3");
          // }, 5000);
        }
      });
@@ -607,9 +638,8 @@
      finishTask({ id: this.taskData.Procedure.ID }).then((res) => {
        if (res.code == 200) {
          this.finishShow=false;
          this.getTaskInfo()
          this.getTaskInfo();
          this.$message.success("操作成功！");
         
        }
      });
    },
@@ -628,6 +658,11 @@
  font-size: 30px;
  font-weight: 700;
}
.el-button--primary {
  border: 0;
  font-weight: 700 !important;
  font-size: 16px !important;
}
.color_4efefa {
  color: #4efefa;
}
@@ -644,26 +679,31 @@
  background: #f76c0f !important;
}
.color_f70f83 {
  background: #f70f83 !important;
  background: #09e5ed !important;
  color: #333 !important;
}
.bottom_list {
  position: relative;
  padding: 10px;
  width: 30%;
  height: 100%;
  background: #111438;
  border-radius: 6px;
  background: rgb(22 72 173);
  // float:left;
  .bottom-title {
    font-weight: 600;
    font-size: 16px;
    font-size: 22px;
    height: 30px;
    line-height: 30px;
    margin-bottom: 10px;
    margin-bottom: 30px;
    .el-button--primary {
      color: #fff;
      float: right;
      border: 0 !important;
    }
  }
  .el-button--primary {
    width: 100%;
  }
  .call {
    background: #4efefa;
@@ -696,27 +736,56 @@
  }
  .card-box {
    width: 100%;
    height: calc(100% - 40px);
    height: calc(100% - 50px - 50px);
    // overflow:auto;
    // height:300px;
  }
}

.small_title {
  font-size: 20px;
  font-size: 24px;
  font-weight: 600;
  margin-bottom: 10px;
}
.right-small-btn {
  margin-top: 10px;
  width: calc(100% - 20px);
  margin:0 auto;
  position: absolute;
  bottom: 10px;
  left: 10px;
  overflow: hidden;
  .el-button--primary {
    width: 46%;
    background: #09e5ed;
    float: left;
    border-radius: 6px;
    color: #333;
    font-weight: 700;
    font-size: 18px;
  }
  .button-finish {
    width: 46%;
    float: right;
    .el-button--primary {
      width: 100%;
      background: red;
      color: #fff;
      border: 0;
    }
  }
}
.home {
  width: 100%;
  height: 100%;
  color: #fff;
  background: rgba(2, 10, 38, 1);
  background: rgb(19 35 90);
  overflow: hidden;
  .left {
    width: calc(78% - 60px);
    height: 100%;
    min-height: 100%;
    background: rgba(2, 10, 38, 1);
    background: rgb(19 35 90);
    float: left;
    padding: 30px;
    padding-top: 20px;
@@ -731,40 +800,45 @@
      width: 100%;
      margin: 0 auto;
      height: 50px;
      display: flex;
      flex-wrap: nowrap;
      align-content: center;
      justify-content: space-around;
      align-items: center;
      .title-item {
        width: 20%;
        width: calc(25% - 50px);
        float: left;
        margin-right: 10px;
        padding: 15px 20px;
        text-align: center;
        border-radius: 4px;
        display: inline-block;
        background: rgba(12, 79, 218, 1);
        background: rgb(22 72 173);
        font-size: 16px;
        font-weight: 600;
        &:nth-last-child(1) {
          margin-right: 0;
        }
      }
    }
    .content {
      width: 100%;
      height: 240px;
      margin: 20px 0px;
      margin: 30px 0px;
      overflow: hidden;
      .content_left {
        width: 22%;
        width: 24%;
        height: 100%;
        float: left;
        // padding:2%;
        .content-top {
          background: hsl(225, 85%, 67%);
          height: calc(50% - 25px);
          background: rgb(22 72 173);
          height: calc(50% - 30px);
          padding-top: 20px;
          text-align: center;
          line-height: 30px;
          border-radius: 6px;
          &:nth-of-type(1) {
            margin-bottom: 10px;
            margin-bottom: 20px;
          }
        }
        .content_leftBttom {
@@ -788,9 +862,12 @@
        height: 100%;
        float: right;
        padding: 0 10px;
        background: rgb(22 72 173);
        border-radius: 6px;
        // background: #233b9e;
        .el-descriptions__body {
          background: transparent;
          font-size: 18px;
        }
        .el-descriptions__table {
          width: 100%;
@@ -810,7 +887,7 @@

    .bottom {
      width: 100%;
      height: calc(100% - 470px);
      height: calc(100% - 500px);
      display: flex;
      flex-wrap: nowrap;
      align-content: center;
@@ -823,9 +900,9 @@
          width: 100%;
          height: 70px;
          // border: 1px solid #ccc;
          background: #ffff;
        background: #6b83ff;
          border-radius: 5px;
          margin-top: 10px;
        margin-top: 20px;
          color: #333;
          position: relative;
          .card_top-2,
@@ -833,8 +910,9 @@
            width: 50%;
            height: 45px;
            border-radius: 5px;
            background: #fff;
          background: #6b83ff;
            font-size: 12px;
          color: #fff;
            float: left;
            .card-top-r-t {
              width: 100%;
@@ -853,7 +931,7 @@
            }
          }
          .card_top-3 {
            background: #f2f2f2;
          color: #fff;
            .card-top-r-t {
              width: 90%;

@@ -874,7 +952,8 @@
            width: 50%;
            height: 45px;
            border-radius: 5px;
            background: #f2f2f2;
          background: #6b83ff;
          color: #fff;
            font-size: 12px;
            line-height: 45px;
            float: left;
@@ -893,7 +972,12 @@
          .card_top-4 {
            width: calc(100% - 20px);
            padding: 0 10px;
            line-height: 20px;
          height: 70px;

          line-height: 40px;
          color: #fff;
          background: rgb(19, 35, 90);
          font-size:20px;
          }
          .card-info-box {
            position: absolute;
@@ -916,8 +1000,9 @@
              line-height: 25px;
              font-size: 12px;
              padding: 0 5px;
            color: #fff;
              border-radius: 5px 5px 0 0;
              background: #ffcc33;
            background: rgb(19, 35, 90);
            }

            .card_contentRight {
@@ -997,8 +1082,8 @@
      width: 100%;
      .el-button--primary {
        width: 100%;
        background: #fff;
        color: #4765c0;
        background: #09e5ed;
        color: #333;
        font-weight: 700;
        font-size: 18px;
      }
@@ -1009,23 +1094,23 @@
      border-radius: 4px;
      line-height: 30px;
      overflow: hidden;
      background: #00cc66;
      // background: #00cc66;
      margin-top: 10px;
      padding: 5px 10px;
      position:relative;
      .right-small-title {
        width: auto;
        padding: 5px;
        font-size: 14px;
        float: right;
        font-size: 18px;
        // float: left;
        border-radius: 8px;
        background: #007101;
        // background: #007101;
      }
      .right-person-box{
        width:100%;
        height:calc(100% - 100px);
        height: calc(100% - 40px);
        overflow:auto;
        margin-top:20px;
        margin-top: -10px;
      }
      .right-small-person {
        width: 100%;
@@ -1033,9 +1118,8 @@
        line-height: 60px;
        margin-bottom:10px;
        border-radius: 10px;
        background: #fff;
        color: #333;
       
        background: rgb(19, 35, 90);
        color: #fff;

        dt {
          float: left;
@@ -1049,30 +1133,6 @@
        span {
          // background: pink;
          padding-top: 10px;
        }
      }
      .right-small-btn {
        margin-top: 10px;
        width: 100%;
        position:absolute;
        bottom:10px;
        left:0;
        overflow: hidden;
        .el-button--primary {
          width: 46%;
          background: #fff;
          float: left;
          border-radius: 6px;
          color: #4765c0;
          font-weight: 700;
          font-size: 18px;
        }
        .button-finish {
          width: 46%;
          float: right;
          .el-button--primary {
            width: 100%;
          }
        }
      }
    }