Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

Fixiaobai

2023-10-27 adb49a3e193b7b9cc71805a82d1d6afb8a4c339b

Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

 src/views/product/workbench/index.vue

@@ -49,6 +49,7 @@
          <el-image src="/img/workbench/icon_bg.png"></el-image>
          <span class="item-name">报工</span>
        </div>
        <!-- 工步 -->
        <!-- <div
          v-show="isShowStepBusiness"
          :class="['wb-header-menu-item', stepShow ? 'item-show' : '']"

 src/views/technology/document/document-form.vue

@@ -633,7 +633,7 @@
                <img width="100%" :src="dialogStructureImageUrl" alt="" />
              </el-dialog>
            </el-card>
            <el-card class="document-flow">
            <!-- <el-card class="document-flow">
              <div slot="header">
                <span>流程图</span>
              </div>
@@ -666,7 +666,7 @@
                </el-select>
                <div id="demo" style="margin:5px auto;"></div>
              </div>
              <!--<el-upload
              <el-upload
                              class="upload-demo"
                              action="/mes/document/uploadLct"
                              :headers="headers"
@@ -686,11 +686,11 @@
                              <div slot="tip" class="el-upload__tip">
                                只能上传jpg图片，且不超过2MB
                              </div>
                            </el-upload>-->
                            </el-upload>
              <el-dialog :visible.sync="dialogFlowVisible">
                <img width="100%" :src="dialogFlowImageUrl" alt="" />
              </el-dialog>
            </el-card>
            </el-card> -->
          </el-tab-pane>
        </el-tabs>
      </div>
@@ -2053,6 +2053,9 @@
  padding: 10px 20px;
  box-sizing: border-box;
}
.el-card.is-always-shadow{
    width: 100%;
  }

.document-flow {
  background-color: #fff;