Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-06 9e8d1bd0b6fb495920921214775b84d490e032a3

 src/views/system/work-order/threshold/index.vue

@@ -13,9 +13,9 @@
    <!--        </el-button>-->
    <!--      </el-col>-->
    <!--    </el-row>-->
    <el-row>
      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
        <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
    <div style="display: flex;overflow-x: auto;" >
      <div>
        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
          <div style="display: flex; justify-content: space-between">
            <div class="header—text">视频</div>
            <div>
@@ -102,9 +102,9 @@
            </div>
          </div>
        </el-card>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
        <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
      </div>
      <div>
        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
          <div style="display: flex; justify-content: space-between">
            <div class="header—text">人脸</div>
            <div>
@@ -191,10 +191,10 @@
              </div>
            </div>
          </div>
        </el-card></el-col
        </el-card></div
      >
      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
        <el-card style="margin-bottom: 20px; height: 450px; margin-right: 20px;color: #656565;">
      <div>
        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
          <div style="display: flex; justify-content: space-between">
            <div class="header—text">车辆</div>
            <div>
@@ -230,13 +230,13 @@
                  font-size: small;
                  display: flex;
                  flex-direction: row-reverse;
                  width: 232px;
                  width: 206px;
                "
              >
                工单阈值
              </div>
              <div>
                <el-form ref="form" label-width="180px">
                <el-form ref="form" label-width="160px">
                  <el-form-item
                    v-for="(item, index) in thresholdList.car"
                    :label="item.name + '：'"
@@ -280,9 +280,8 @@
              </div>
            </div>
          </div>
        </el-card></el-col
      >
    </el-row>
        </el-card></div>
    </div>
  </div>
</template>

@@ -774,6 +773,7 @@

.header—text {
  font-weight: bold;
  font-size: large;
}
::v-deep .el-form-item {
  margin-bottom: 0px; /* 根据需求调整这个值 */