shuishen
2021-07-14 824e60d65da4e54de2af4f424c3931e970357399
Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfptweb-publicSecurity
3 files modified
13 ■■■■ changed files
src/views/policeTracking/policeTracking.vue 6 ●●●● patch | view | raw | blame | history
src/views/realTimePolice/real.vue 4 ●●●● patch | view | raw | blame | history
vue.config.js 3 ●●●● patch | view | raw | blame | history
src/views/policeTracking/policeTracking.vue
@@ -17,7 +17,7 @@
            >
              <div class="avue-group__header avue-group">
                <i class="el-icon-message-solid avue-group__icon"></i>
                <h1 class="avue-group__title">警情信息</h1>
                <h1 class="avue-group__title">任务信息</h1>
              </div>
            </div>
          </div>
@@ -40,7 +40,7 @@
            >
              <el-row>
                <el-col span="12">
                  <el-form-item label="警情类型">
                  <el-form-item label="任务类型">
                    <el-input
                      disabled="true"
                      v-model="form.alarmType"
@@ -187,7 +187,7 @@
            >
              <div class="avue-group__header avue-group">
                <i class="el-icon-s-order avue-group__icon"></i>
                <h1 class="avue-group__title">警情反馈</h1>
                <h1 class="avue-group__title">任务反馈</h1>
              </div>
            </div>
          </div>
src/views/realTimePolice/real.vue
@@ -168,7 +168,7 @@
          dialogClickModal: false,
          column: [
            {
              label: "警情类型",
              label: "任务类型",
              prop: "alarmType",
              search: false,
              searchSpan: 3,
@@ -185,7 +185,7 @@
                "/api/blade-system/dict-biz/child-list?parentId=1356523651644043266",
            },
            {
              label: "报警时间",
              label: "下发时间",
              type: "datetime",
              width: 160,
              format: "yyyy-MM-dd HH:mm:ss",
vue.config.js
@@ -36,9 +36,8 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://192.168.0.105:82/',
        target: 'http://s16s652780.51mypc.cn/api/',
        // target: 'https://web.byisf.com/api/',
        //target: 'https://web.byisf.com/api/',
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',
        ws: true,