Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

shuishen

2021-03-13 554fb60559702a2b15d59fc51fe566109ec29572

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 src/page/login/userlogin.vue

@@ -5,7 +5,7 @@
           ref="loginForm"
           :model="loginForm"
           label-width="0">
    <el-form-item v-if="tenantMode" prop="tenantId">
    <el-form-item hidden v-if="tenantMode" prop="tenantId">
      <el-input size="small"
                @keyup.enter.native="handleLogin"
                v-model="loginForm.tenantId"
@@ -78,9 +78,9 @@
          //租户ID
          tenantId: "963841",
          //用户名
          username: "system",
          username: "",
          //密码
          password: "admin123",
          password: "",
          //账号类型
          type: "account",
          //验证码的值

 src/views/policeTracking/policeTracking.vue

@@ -1,13 +1,15 @@
<template>
  <el-row>
    <el-col :span="12">
      <div style="background: #fff;height: 100%;">
      <el-card class="trackClass">
        <el-tabs type="border-card">
          <el-tabs type="card">
          <el-tab-pane label="警情信息">
            <el-form
              :model="form"
              label-position="right"
              size="mini"
                class="policeForm"
              label-width="100px"
              style="background: #fff; margin-top: 20px;margin-left: 10px; margin-right: 10px; height: calc(100% - 40px); width: calc(100% - 20px)"
            >
@@ -47,17 +49,19 @@
                  </el-form-item
                  >
                </el-col>

                <el-col span="12"
                >
                  <el-form-item label="行政区">
                    <el-form-item label="设备编号">
                    <el-input
                      disabled="true"
                      v-model="form.addvnm"
                        v-model="form.deviceNumber"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item
                  >
                </el-col>

              </el-row>
              <el-row>
                <el-col span="12"
@@ -83,13 +87,14 @@
                  >
                </el-col>
              </el-row>

              <el-row>
                <el-col span="12"
                >
                  <el-form-item label="警情级别">
                    <el-form-item label="处置时间">
                    <el-input
                      disabled="true"
                      v-model="form.level"
                        v-model="form.czTime"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item
@@ -97,34 +102,25 @@
                </el-col>
                <el-col span="12"
                >
                  <el-form-item label="警情类别">
                    <el-form-item label="备注">
                    <el-input
                      disabled="true"
                      v-model="form.waringType"
                        v-model="form.bz"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item
                  >
                </el-col>
              </el-row>


              <el-row>
                <el-col span="12"
                >
                  <el-form-item label="是否上报110">
                    <el-form-item label="警情类型">
                    <el-input
                      disabled="true"
                      v-model="form.alarmPeople"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item
                  >
                </el-col>
                <el-col span="12"
                >
                  <el-form-item label="设备编号">
                    <el-input
                      disabled="true"
                      v-model="form.deviceNumber"
                        v-model="form.waringType"
                      autocomplete="off"
                    ></el-input>
                  </el-form-item
@@ -217,6 +213,7 @@
              </el-row>
            </el-form>
          </el-tab-pane>

          <el-tab-pane label="警情反馈">
            <el-row :gutter="20">
              <el-col :span="16">
@@ -232,8 +229,14 @@
            </el-row>

            <div class="demo-image__placeholder">

              <span class="demonstration">警情反馈</span>
                <div role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
                     aria-describedby="el-collapse-content-823">
                  <div role="button" tabindex="0"
                       class="el-collapse-item__header focusing is-active">
                    <div class="avue-group__header avue-group"><i class="el-icon-s-custom avue-group__icon"></i>
                      <h1 class="avue-group__title">警情反馈</h1></div>
                  </div>
                </div>
              <el-input
                disabled="true"
                type="textarea"
@@ -242,7 +245,14 @@
              ></el-input>

              <div class="block">
                <span class="demonstration">现场拍照</span>
                  <div style="margin-top: 20px;" role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
                       aria-describedby="el-collapse-content-823">
                    <div role="button" tabindex="0"
                         class="el-collapse-item__header focusing is-active">
                      <div class="avue-group__header avue-group"><i class="el-icon-camera-solid avue-group__icon"></i>
                        <h1 class="avue-group__title">现场图片</h1></div>
                    </div>
                  </div>
                <div>
                  <el-image :src="src" style="width: 200px;margin-left: 5px"></el-image>
                  <el-image :src="src" style="width: 200px;margin-left: 5px"></el-image>
@@ -250,7 +260,14 @@
                </div>
              </div>
              <div class="block">
                <span class="demonstration">现场视频</span>
                  <div style="margin-top: 20px;" role="tab" aria-expanded="true" aria-controls="el-collapse-content-823"
                       aria-describedby="el-collapse-content-823">
                    <div role="button" tabindex="0"
                         class="el-collapse-item__header focusing is-active">
                      <div class="avue-group__header avue-group"><i class="el-icon-video-camera-solid avue-group__icon"></i>
                        <h1 class="avue-group__title">现场视频</h1></div>
                    </div>
                  </div>
                <div>
                  <el-image :src="src" style="width: 200px;margin-left: 5px">
                    <div slot="placeholder" class="image-slot">
@@ -261,17 +278,16 @@
              </div>
            </div>
          </el-tab-pane>

          <el-row :align="center">
            <el-col :offset="10">
              <el-button type="danger">处理完成</el-button>
            </el-col>
          </el-row>
        </el-tabs>


      </el-card>

        <el-row :align="center">
          <el-col :offset="10">
            <el-button onclick="" style="position: absolute;bottom: 40px" type="danger">处理完成</el-button>
          </el-col>
        </el-row>
      </div>
    </el-col>

    <el-col :span="12">