Administrator
2022-03-07 5eb0e4a1c4d345bbdc218b81e14f905976523878
用户证书审核申请菜单管理,民警版说明文档上传,附件上传类型调整
7 files modified
319 ■■■■■ changed files
public/map/index.html 177 ●●●● patch | view | raw | blame | history
public/map/widgets/clientManagement/ClientManagement.js 7 ●●●●● patch | view | raw | blame | history
src/page/index/top/userSManual.vue 121 ●●●● patch | view | raw | blame | history
src/views/rail/rail.vue 4 ●●●● patch | view | raw | blame | history
src/views/securityGuard/securityGuard.vue 2 ●●● patch | view | raw | blame | history
src/views/wel/index.vue 2 ●●● patch | view | raw | blame | history
src/views/wxpicture/wxpicture.vue 6 ●●●● patch | view | raw | blame | history
public/map/index.html
@@ -2,114 +2,113 @@
<html lang="zh">
<head>
  <meta charset="UTF-8" />
  <meta http-equiv="X-UA-Compatible" content="ie=edge" />
  <title>Document</title>
  <link rel="stylesheet" type="text/css"
    href="https://web.byisf.com/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/dijit/themes/tundra/tundra.css" />
  <link rel="stylesheet" type="text/css"
    href="https://web.byisf.com/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/esri/css/esri.css" />
  <link rel="stylesheet" href="./lib/layui/css/layui.css" />
  <link rel="stylesheet" href="./css/forestry-map.css" />
  <link type="text/css" rel="stylesheet" href="framework.css" />
  <link rel="stylesheet" href="./lib/zTree_v3//css/metroStyle/metroStyle.css">
  <style>
    .map_content {
      position: relative
    }
  </style>
  <script src="./lib/jquery.js"></script>
  <script src="./lib/js.cookie.min.js"></script>
  <script src="./js/request.js"></script>
  <script src="js/layer/layer.js"></script>
  <script src="js/laydate/laydate.js"></script>
  <script type="text/javascript" src="js/comm/heard.js"></script>
<!--  <script type="text/javascript" src="js/script.js"></script>-->
  <script src="./lib/layui/layui.js"></script>
  <script src="env.js"></script>
  <script type="text/javascript"
    src="https://web.byisf.com/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/init.js"></script>
  <script src='./lib/zTree_v3/js/jquery.ztree.all.js'></script>
  <script>
    var _framework = null;
    var _AppEvent = null;
    function getQueryStringByKey(key) {
      return (document.location.search.match(new RegExp("(?:^\\?|&)" + key + "=(.*?)(?=&|$)")) || ['', null])[1];
    }
    var ISinit = getQueryStringByKey('ISinit');
    var openId = getQueryStringByKey('openid');
    if(ISinit == null){
      init(openId,null);
    }
    function locations(res) {
      require(["dojo/topic"],
        function (topic) {
        topic.publish("location", res);
      }
      );
    }
    function init(openId,locationObj) {
      require(["base/framework", "base/AppEvent"],
        function (framework, AppEvent) {
          _framework = new framework();
          _framework.onSiderContainerShow();
          _framework.resize();
          _AppEvent = AppEvent;
          if (locationObj != null){
            //获取设备id
            window.clientID = locationObj.clientID;
          }
          _AppEvent.addAppEventListener("mapLoad", function(map){
            if (locationObj && locationObj != null) {
              map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 16);
            }
          });
          if (openId) showFun(openId);
    <meta charset="UTF-8" />
    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
    <title>Document</title>
    <link rel="stylesheet" type="text/css" href="https://web.byisf.com/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/dijit/themes/tundra/tundra.css" />
    <link rel="stylesheet" type="text/css" href="https://web.byisf.com/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/esri/css/esri.css" />
    <link rel="stylesheet" href="./lib/layui/css/layui.css" />
    <link rel="stylesheet" href="./css/forestry-map.css" />
    <link type="text/css" rel="stylesheet" href="framework.css" />
    <link rel="stylesheet" href="./lib/zTree_v3//css/metroStyle/metroStyle.css">
    <style>
        .map_content {
            position: relative
        }
      );
    }
    </style>
    <script src="./lib/jquery.js"></script>
    <script src="./lib/js.cookie.min.js"></script>
    <script src="./js/request.js"></script>
    <script src="js/layer/layer.js"></script>
    <script src="js/laydate/laydate.js"></script>
    <script type="text/javascript" src="js/comm/heard.js"></script>
    <!--  <script type="text/javascript" src="js/script.js"></script>-->
    <script src="./lib/layui/layui.js"></script>
    <script src="env.js"></script>
    function showFun(id) {
      _AppEvent.dispatchAppEvent(_AppEvent.RUN_WIDGET, id);
    }
    <script type="text/javascript" src="https://web.byisf.com/arcgis_js_v318_api/arcgis_js_api/library/3.18/3.18/init.js"></script>
    <script src='./lib/zTree_v3/js/jquery.ztree.all.js'></script>
    <script>
        var _framework = null;
        var _AppEvent = null;
        function getQueryStringByKey(key) {
            return (document.location.search.match(new RegExp("(?:^\\?|&)" + key + "=(.*?)(?=&|$)")) || ['', null])[1];
        }
        var ISinit = getQueryStringByKey('ISinit');
        var openId = getQueryStringByKey('openid');
        if (ISinit == null) {
            init(openId, null);
        }
  </script>
        function locations(res) {
            require(["dojo/topic"],
                function(topic) {
                    topic.publish("location", res);
                }
            );
        }
        function init(openId, locationObj) {
            require(["base/framework", "base/AppEvent"],
                function(framework, AppEvent) {
                    _framework = new framework();
                    _framework.onSiderContainerShow();
                    _framework.resize();
                    _AppEvent = AppEvent;
                    if (locationObj != null) {
                        //获取设备id
                        window.clientID = locationObj.clientID;
                    }
                    _AppEvent.addAppEventListener("mapLoad", function(map) {
                        if (locationObj && locationObj != null) {
                            map.centerAndZoom(new esri.geometry.Point(locationObj.x, locationObj.y, new esri.SpatialReference({
                                wkid: 4326
                            })), 16);
                        }
                    });
                    if (openId) showFun(openId);
                }
            );
        }
        function showFun(id) {
            _AppEvent.dispatchAppEvent(_AppEvent.RUN_WIDGET, id);
        }
    </script>
</head>
<body>
  <div class="map_content">
    <div class="map_content">
    <div id="mapTool" class="map_tool">
        <div id="mapTool" class="map_tool">
      <div id="app_content">
        <div id="tabcontainer"></div>
        <div id="mapcontentClass"></div>
      </div>
            <div id="app_content">
                <div id="tabcontainer"></div>
                <div id="mapcontentClass"></div>
            </div>
      <div class="map_tool_monitor">
            <div class="map_tool_monitor">
        <div class="monitorClose">
          <img id="monitorClose" src="./images/map-close.png" alt="" />
          <p>关闭</p>
        </div>
                <div class="monitorClose">
                    <img id="monitorClose" src="./images/map-close.png" alt="" />
                    <p>关闭</p>
                </div>
        <div class="mon-title" id="monTitle"><span></span></div>
        <div class="map_tool_monitor_content" id="map_tool_monitor_content">
                <div class="mon-title" id="monTitle"><span></span></div>
                <div class="map_tool_monitor_content" id="map_tool_monitor_content">
                </div>
            </div>
        </div>
      </div>
    </div>
  </div>
</body>
<script src="./js/monitor.js"></script>
<script src="./js/forestry-map.js"></script>
</html>
</html>
public/map/widgets/clientManagement/ClientManagement.js
@@ -152,17 +152,16 @@
            this._map.addLayer(this.addOneEntitys);
        },
        startup: function() {
            console.log(111111111111111);
            objThis._map.addLayer(objThis._siteLayer);
            var that = this;
        },
        open: function() {
            var that = this;
            $.ajax({
                url: '/api/equipment/equipment/pageDept?deviceName='+ window.clientID,
                url: '/api/equipment/equipment/pageDept?deviceName=' + window.clientID,
                type: 'get',
                dataType: 'JSON',
                success: function(data) {
@@ -258,4 +257,4 @@
    });
    return Widget;
});
});
src/page/index/top/userSManual.vue
@@ -2,13 +2,6 @@
  <div class="userSManual">
    <!-- {{ form.link }} -->
    <basic-container id="PDFmain">
      <!-- <embed :src="form.link" type="application/pdf" width="800" height="800" /> -->
      <!-- <object
        :data="form.link"
        type="application/pdf"
        width="800"
        height="800"
      ></object> -->
      <iframe
        id="PDFmainIFRAM"
        src="/pfd/build/generic/web/viewer.html"
@@ -30,6 +23,7 @@
        :option="option"
        v-model="form"
        @submit="handleSubmit"
        @tab-click="handleTabClick"
        :upload-before="uploadBefore"
        :upload-after="uploadAfter"
      ></avue-form>
@@ -40,6 +34,7 @@
<script>
import { mapGetters } from "vuex";
import { add, getDetails } from "@/api/resource/attach";
import func from "@/util/func";
export default {
  data() {
    return {
@@ -99,6 +94,54 @@
              },
            ],
          },
          {
            label: "上传用户手册-民警版",
            prop: "info",
            column: [
              {
                label: "用户手册",
                type: "upload",
                // listType: "picture-img",
                propsHttp: {
                  res: "data",
                  url: "link",
                },
                // canvasOption: {
                //   text: " ",
                //   ratio: 0.1,
                // },
                action: "/api/blade-resource/oss/endpoint/put-file",
                // action: "/api/blade-resource/oss/endpoint/put-file-attach",
                // tip: "只能上传jpg/png用户头像,且不超过500kb",
                span: 24,
                row: true,
                prop: "link",
                labelWidth: 180,
              },
              {
                label: "首次上传时间",
                span: 24,
                row: true,
                prop: "createTime",
                labelWidth: 180,
                type: "datetime",
                disabled: true,
                format: "yyyy-MM-dd HH:mm:ss",
                valueFormat: "yyyy-MM-dd HH:mm:ss",
              },
              {
                label: "上次更新时间",
                span: 24,
                row: true,
                prop: "updateTime",
                labelWidth: 180,
                type: "datetime",
                disabled: true,
                format: "yyyy-MM-dd HH:mm:ss",
                valueFormat: "yyyy-MM-dd HH:mm:ss",
              },
            ],
          },
        ],
      },
      form: {},
@@ -109,12 +152,17 @@
    ...mapGetters(["userInfo"]),
  },
  created() {
    if (this.userInfo.role_name == "民警") {
      this.index = 1;
    }
    this.handleWitch();
    if (this.userInfo.role_name == "administrator") {
      this.userSManual_upBut = "block";
    } else {
      this.userSManual_upBut = "none";
    }
  },
  methods: {
    openUps() {
@@ -141,8 +189,34 @@
      if (this.index === 0) {
        form["type"] = 10;
        form["link"] = this.link;
        // console.log(form);
        // return;
        add(form).then(
          (res) => {
            if (res.data.success) {
              this.handleWitch();
              this.$message({
                type: "success",
                message: "用户手册上传成功!",
              });
            } else {
              this.$message({
                type: "error",
                message: res.data.msg,
              });
            }
            done();
            this.link = "";
            this.form = {};
            this.openUp = false;
          },
          (error) => {
            window.console.log(error);
            done();
          }
        );
      }
      if (this.index === 1) {
        form["type"] = 11;
        form["link"] = this.link;
        add(form).then(
          (res) => {
            if (res.data.success) {
@@ -181,19 +255,15 @@
      this.intime = setInterval(() => {
        let havePdf = this.havepdf();
        if (havePdf) {
          //   console.log("已加载完");
          havePdf.setUrl(url);
          //   console.log(this.intime, 1);
          clearInterval(this.intime);
          //   console.log(this.intime, 2);
          this.intime = "";
          //   console.log(this.intime, 3);
        } else {
          //   console.log("没加载玩");
        }
        // var pdf = document.getElementById("PDFmainIFRAM").contentWindow;
        // pdf.setUrl(url);
      }, 500);
    },
    handleTabClick(tabs) {
      this.index = func.toInt(tabs.index);
      this.handleWitch();
    },
    handleWitch() {
      if (this.index === 0) {
@@ -213,6 +283,23 @@
          };
        });
      }
      if (this.index === 1) {
        getDetails(11).then((res) => {
          const att = res.data.data;
          if (this.intime) {
            clearInterval(this.intime);
            this.setUrl(att.link);
          } else {
            this.setUrl(att.link);
          }
          this.form = {
            id: att.id,
            link: att.link,
            createTime: att.createTime,
            updateTime: att.updateTime,
          };
        });
      }
    },
  },
};
src/views/rail/rail.vue
@@ -47,7 +47,7 @@
      </template>
      <!-- 地图插入 -->
      <template slot-scope="{ type, disabled }" slot="lineForm">
        <div class="mapClassMain" style="width: 860px; height: 400px">
        <div class="mapClassMain" style="width: 1000px; height: 400px">
          <Map ref="modalForm" />
        </div>
      </template>
@@ -412,7 +412,7 @@
}
.mapClassMain {
  padding-left: 25px !important;
  padding-left: 5rem !important;
}
.lod {
src/views/securityGuard/securityGuard.vue
@@ -223,7 +223,7 @@
                  icon="el-icon-money"
                  :size="size"
                  :type="type"
                  v-if="permission.securityGuard_check"
                  v-if="permission.securityGuard_check_apply"
                  @click.stop="rowCheckApply(row)"
                  >证件核实申请
                </el-button>
src/views/wel/index.vue
@@ -70,7 +70,7 @@
    if(this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "administrator" || this.userInfo.role_name == "民警"){
      this.isImg = true;
      //查询图片
      getDetails(10).then((res) => {
      getDetails(12).then((res) => {
        const att = res.data.data;
        this.img = att.link;
      });
src/views/wxpicture/wxpicture.vue
@@ -36,7 +36,7 @@
                },
                canvasOption: {
                  text: " ",
                  ratio: 0.1,
                  ratio: 1,
                },
                action: "/api/blade-resource/oss/endpoint/put-file",
                tip: "只能上传jpg/png用户头像,且不超过500kb",
@@ -129,7 +129,7 @@
      if (this.index === 0) {
        form["type"] = 9;
      }else{
        form["type"] = 10;
        form["type"] = 12;
      }
      add(form).then(
          (res) => {
@@ -165,7 +165,7 @@
          };
        });
      }else {
        getDetails(10).then((res) => {
        getDetails(12).then((res) => {
          const att = res.data.data;
          this.form = {
            id: att.id,