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

shuishen

2021-01-29 f819a98f13666c0dc732d3abbfbcaed5758fdf72

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

 src/api/system/dept.js

@@ -1,4 +1,5 @@
import request from '@/router/axios';
import Message from "element-ui/packages/message/src/main";

export const getList = (current, size, params) => {
  return request({
@@ -86,8 +87,10 @@
}
// 封装api get请求
export const fetch = (path, params) => {
  let axios;
  return axios.get(path, {params: params}).then(res => {
    if (res.data.code === 403) {
      let router;
      router.push({
        path: '/'
      });
@@ -103,4 +106,3 @@
    return Promise.reject(err);
  })
}


 src/page/login/codelogin.vue

@@ -187,6 +187,7 @@
        var z = document.querySelector('.z');
        z.style.display = 'none';
        this.clearValidate('loginForm')
        this.clearValidate('loginForm')
      },
      gb() {
        this.loginForm.phone=""

 src/views/realTimePolice/real.vue

@@ -64,90 +64,97 @@
      <el-form :model="form" label-position="right" size="mini" label-width="100px">
        <el-row>
          <el-col span="12">
        <el-form-item label="报警人" :label-width="formLabelWidth">
        <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="联系电话" :label-width="formLabelWidth">
        <el-form-item label="联系电话" >
          <el-input disabled="true" v-model="form.phoneNumber" autocomplete="off"></el-input>
        </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="行政区" :label-width="formLabelWidth">
            <el-form-item label="行政区" >
              <el-input disabled="true" v-model="form.district" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="事发地址" :label-width="formLabelWidth">
            <el-form-item label="事发地址" >
              <el-input disabled="true" v-model="form.place" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="警情类别" :label-width="formLabelWidth">
            <el-form-item label="警情类别" >
              <el-input disabled="true" v-model="form.waringType" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="设备编号" :label-width="formLabelWidth">
            <el-form-item label="设备编号" >
              <el-input disabled="true" v-model="form.deviceNumber" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="接警人" :label-width="formLabelWidth">
            <el-form-item label="接警人" >
              <el-input disabled="true" v-model="form.galarmPeople" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="接警时间" :label-width="formLabelWidth">
            <el-form-item label="接警时间" >
              <el-input disabled="true" v-model="form.jjTime" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="报警时间" :label-width="formLabelWidth">
            <el-form-item label="报警时间" >
              <el-input disabled="true" v-model="form.alarmTime" autocomplete="off"></el-input>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="设备历史警情" :label-width="formLabelWidth">

            <el-form-item label="历史视频" >
              <el-button type="primary">查看视频</el-button>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
            <el-form-item label="报警内容" :label-width="formLabelWidth">
            <el-form-item label="报警内容" >
              <el-input disabled="true" v-model="form.content" autocomplete="off"></el-input>
            </el-form-item>
        </el-row>
        <el-row>
          <el-col span="12">
            <el-form-item label="要求处置时间" :label-width="formLabelWidth">
              <el-input v-model="form.Cztime" autocomplete="off"></el-input>
            <el-form-item label="要求处置时间" >
              <el-date-picker
                v-model="form.czTime"
                type="datetime"
                placeholder="选择日期时间">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col span="12">
            <el-form-item label="备注" :label-width="formLabelWidth">
              <el-input v-model="form.name" autocomplete="off"></el-input>
            <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="功能" :label-width="formLabelWidth">
        <el-row :align='center'>
          <el-col :offset="4">
            <el-form-item >
              <el-button type="success">一件呼叫</el-button>
              <el-button type="success">视频对讲</el-button>
              <el-button type="primary">生成警单</el-button>
              <el-button type="warning">警情撤销</el-button>
              <el-button type="danger">推送110</el-button>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogTableVisible = false">取 消</el-button>
        <el-button type="primary" @click="submitForm(form)">提 交</el-button>
      </div>
    </el-dialog>

    <el-drawer
@@ -569,9 +576,6 @@
      },
      handleManage(row){
        this.form = row;
        this.dialogTableVisible = true;
      },
      submitForm(row){
        this.dialogTableVisible = true;
      }
    }

 src/views/suser/suser.vue

@@ -113,56 +113,23 @@
              prop: "wd",
            },
            {
              label: "地址",
              // hide:true,
              // width:250,
              prop: "address",
              rules: [{
                required: true,
                message: "请输入地址",
                trigger: "blur"
              }]
            },
            // {
            //   label: "行政区",
            //   width:80,
            //   prop: "addvcd",
            //   searchSpan: 4,
            //   search: true,
            //   type: "select",
            //   dicUrl: "/api/blade-jfpts/district/district/selectd",
            //   props: {
            //     label: "addvnm",
            //     value: "addvcds"
            //   },
            // },
            {
              label: "等级",
              searchSpan: 4,
            /*  search: true,*/
              width:60,
              prop: "dj",
            },
            {
              label: "营业信息",
              component: 'AvueUeditor',
              width:350,
              prop: "information",
              rules: [{
                required: true,
                message: "请输入营业信息",
                trigger: "blur"
              }],
              minRows: 6,
              span: 24,
            },
            {
              label: "提交日期",
              width:110,
              type: "datetime",
              format: "yyyy-MM-dd",
              prop: "createtime",
              display: false,
              label: "类型",
              searchSpan: 4,
              search: true,
              width:70,
              prop: "type",
              type: "select",
              dicUrl: "/api/blade-jfpts/lx/lx/seleclx",
              props: {
                label: "types",
                value: "tnumber"
              },
            },
            {
              label: '省份',
@@ -188,7 +155,6 @@
                label: 'name',
                value: 'code'
              },
              dicFlag: false,
              dicUrl: '/api/blade-system/region/select?code={{key}}',
              span: 8,
            },
@@ -202,28 +168,41 @@
                label: 'name',
                value: 'code'
              },
              dicFlag: false,
              dicUrl: '/api/blade-system/region/select?code={{key}}',
              span: 8,
            },
            {
              label: "类型",
              searchSpan: 4,
              search: true,
              width:70,
              prop: "type",
              type: "select",
              dicUrl: "/api/blade-jfpts/lx/lx/seleclx",
              props: {
                label: "types",
                value: "tnumber"
              },
              label: "地址",
              hide:true,
              prop: "address",
              rules: [{
                required: true,
                message: "请输入地址",
                trigger: "blur"
              }]
            },
        /*   {
              label: "空间坐标",
               display: false,
              prop: "coordinate",
            },*/
            {
              label: "营业信息",
              hide:true,
              component: 'AvueUeditor',
              width:350,
              prop: "information",
              rules: [{
                required: true,
                message: "请输入营业信息",
                trigger: "blur"
              }],
              minRows: 6,
              span: 24,
            },
            {
              label: "提交日期",
              width:110,
              type: "datetime",
              format: "yyyy-MM-dd",
              prop: "createtime",
              display: false,
            },
          ]
        },
        data: []