修改

shuishen

2021-03-17 d266294dd3929fcc71fbcb7943527559c13a2b8a

 src/page/index/logo.vue

@@ -20,6 +20,10 @@
        :append-to-body="true"
        :close-on-press-escape="false"
        :close-on-click-modal="false"
<<<<<<< HEAD
=======
        :show-close="false"
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
        @close="closeDialog"
      >
        <el-form
@@ -64,6 +68,7 @@
                  disabled="true"
                  v-model="form.phoneNumber"
                  autocomplete="off"
<<<<<<< HEAD
                  style="width: calc(100% - 110px)"
                ></el-input>
                <el-button
@@ -79,6 +84,9 @@
                  <i class="el-icon-phone-outline"></i>
                  联系负责人
                </el-button>
=======
                ></el-input>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
              </el-form-item>
            </el-col>
          </el-row>
@@ -153,6 +161,7 @@
              </el-form-item>
            </el-col>
            <el-col span="12">
<<<<<<< HEAD
              <el-form-item label="监控视频">
                <el-button type="success" @click.stop="queryOldVideo(form)"
                  >视频通话
@@ -162,16 +171,38 @@
                </el-button>
              </el-form-item>
            </el-col>
=======
              <el-form-item label="备注">
                <el-input v-model="form.bz" autocomplete="off"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-form-item label="报警内容">
              <el-input
                disabled="true"
                v-model="form.content"
                autocomplete="off"
              ></el-input>
            </el-form-item>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
          </el-row>

          <el-row>
            <el-col span="12">
<<<<<<< HEAD
              <el-form-item label="报警内容">
                <el-input
                  disabled="true"
                  v-model="form.content"
                  autocomplete="off"
                ></el-input>
=======
              <el-form-item label="视频通话">
                <el-button type="primary" @click.stop="queryOldVideo(form)"
                  >查看视频
                </el-button>
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
              </el-form-item>
            </el-col>
            <el-col span="12">
@@ -186,6 +217,7 @@
          <el-row :align="center">
            <el-col class="opt-btn">
              <el-form-item>
<<<<<<< HEAD
                <el-button type="success" @click.stop="revoke(form)"
                  >办结</el-button
                >
@@ -199,6 +231,14 @@
                  alt=""
                />

=======
                <el-button type="warning" @click.stop="revoke(form)"
                  >办结</el-button
                >
                <el-button type="danger" class="push-nmb-btn"
                  >推送110</el-button
                >
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
                <el-button type="primary" @click.stop="generate(form)"
                  >派发保安</el-button
                >
@@ -604,7 +644,11 @@
  bottom: 0 !important;
  left: 0 !important;
  right: 400px !important;
<<<<<<< HEAD
  height: 558px !important;
=======
  height: 630px !important;
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
  border-radius: 10px 10px 10px 10px;
}

@@ -625,7 +669,11 @@
  right: 0 !important;
  bottom: 0 !important;
  margin: auto !important;
<<<<<<< HEAD
  height: 558px;
=======
  height: 630px;
>>>>>>> c14b0e9e0d82dacc0a9ceea2d10721dcb891d40c
}

.ss-video-dialog .el-dialog .el-dialog__body {