代码更新 2/24

minggao/config/index.js

@@ -14,7 +14,7 @@ module.exports = {
       '/api': {
         target: 'http://192.168.1.17:12345', //翟毅飞
         // target: 'http://192.168.1.77:12345', //曹世祥
-        target:"http://114.115.147.140:12345",
+        // target:"http://114.115.147.140:12345",
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口

minggao/src/main.js

@@ -55,6 +55,7 @@ const Qs = require('qs')
 
 Vue.prototype.$imghost = 'http://www.hnyfwlw.com:8006/projectimg' // 线上图片服务器路径常量
 Vue.prototype.$insectHost = 'https://images.weserv.nl/?url=' // 线上图片服务器路径常量
+Vue.prototype.$wsUrl = Vue.prototype.wsUrl  // 实时通信服务器url 
 Vue.prototype.$deriveData = Vue.prototype.DOMIN // 导出
 // Vue.prototype.$deriveData = 'http://192.168.1.112:8002' // 导出
 Vue.prototype.$faultvideo = 'http://192.168.1.3:8000' //售后视频地址前缀

minggao/src/page/commandCenter/realTime.vue

@@ -395,7 +395,9 @@ export default {
       input: "", //发送框
       iconShow: true,
       // 文本消息功能
-      url: "ws://192.168.1.17:12345/api/api_gateway?method=control_center.real_time.im_message",
+      url:
+        // "ws://192.168.1.17:12345/api/api_gateway?method=control_center.real_time.im_message",
+        "ws" + this.$wsUrl + "/api/api_gateway?method=control_center.real_time.im_message",
       websock: null,
       getUserObj: {}, // 获取到当前点击的行数据
       msgList: [], //当前点击的账号消息列表
@@ -911,6 +913,8 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
+    // console.log("ws" + this.$wsUrl + ":12345/api/api_gateway?method=control_center.real_time.im_message")
+
     this.loading = true;
     this.loading2 = true;
     this.organizationData(); //获取左侧组织列表

minggao/src/page/forecasting/cbd/cbdDataPhotos.vue

@@ -591,9 +591,9 @@
     <!-- 查看大图 -->
 
     <!-- 测试 -->
-    <ul
+    <!-- <ul
       class="newImgOperation"
-      style="display: flex"
+      style="display: flex;"
       id="iconBox"
       v-show="iconShow"
     >
@@ -623,7 +623,7 @@
         />
         <span>网格显示</span>
       </li>
-    </ul>
+    </ul> -->
     <!-- 测试 -->
 
     <div id="reseau"></div>
@@ -1465,7 +1465,20 @@ export default {
       // if (val == false) {
       //   this.addFunData = {}
       // }
+<<<<<<< HEAD
     },
+=======
+
+      if (val == false) {
+        this.imgShow = true
+
+        // this.$nextTick(() => {
+        //   // this.$refs['aiPanel-editor'].getMarker().clearData();
+        //   // this.imgDiscern = ""
+        // });
+      }
+    }
+>>>>>>> d9153c93674a2b211f20166e3674d4a966a95b36
   },
 
   methods: {
@@ -3271,7 +3284,11 @@ export default {
           this.renderData(JSON.parse(data.mark));
         });
       } else {
-        this.imgShow = true;
+
+        this.$nextTick(() => {
+           this.imgShow = true;
+        });
+        // this.imgShow = true;
         // this.imgDiscern = data.indentify_photo || data.addr;
         // this.imgDiscern = data.addr;
       }

minggao/src/page/superviseModule/superviseModule.vue

@@ -81,6 +81,8 @@
         <el-table-column prop="ind" label="序号" width="180"> </el-table-column>
         <el-table-column prop="supervisor_user" label="监督人" width="180">
         </el-table-column>
+         <el-table-column prop="actual_supervisor" label="实际监督人" width="180">
+        </el-table-column>
         <el-table-column prop="supervisor_type" label="监督形式" width="180">
         </el-table-column>
         <el-table-column prop="supervisor_depa" label="监督单位" width="180">

minggao/src/page/systemmanger/customsManger.vue

@@ -30,6 +30,7 @@
       <!-- 列表 -->
       <tree-table
         v-loading="loading"
+        v-if="treeDataSource.length > 0"
         :style="'height:' + 42 * 15 + 'px;' + 'overflow-y: auto'"
         ref="recTree"
         :list.sync="treeDataSource"
@@ -40,6 +41,9 @@
         @orderByFunc="orderByFunc"
       ></tree-table>
 
+      <!-- 暂无数据 -->
+      <div :style="'height:' + 42 * 15 + 'px;' + 'overflow-y: auto;' + 'color: #aba8a8;' + 'text-align: center;' + 'font-size: 20px;' + 'line-height: 30;'" v-if="treeDataSource.length == 0">暂无数据</div>
+
       <!-- 分页 -->
       <el-pagination
         :page-size="20"

minggao/src/page/systemmanger/motif.vue

@@ -67,7 +67,7 @@
             multiple
             :show-file-list="false"
           >
-            <img v-if="form.img" :src="form.img" class="avatar" />
+            <img v-if="form.img" :src="this.$deriveData + form.img" class="avatar" />
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
@@ -223,7 +223,7 @@ export default {
 
     // 按钮编辑
     btnEdit() {
-      this.form.img = this.$deriveData + this.objData.logo_url;
+      this.form.img = this.objData.logo_url;
       this.form.name = this.objData.sys_name;
       this.form.role_describe = this.objData.copyright_info;
       this.redactVisible = true;

minggao/src/util/http.js

@@ -1,7 +1,8 @@
 import axios from 'axios'
 import {
   DOMIN,
-  mapJson
+  mapJson,
+  wsUrl
 } from './server.js'
 import router from '@/router'
 import {
@@ -11,6 +12,7 @@ import qs from 'qs'
 
 import Vue from 'vue'
 Vue.prototype.DOMIN = DOMIN
+Vue.prototype.wsUrl = wsUrl // 实时通信Url
 Vue.prototype.mapJson = mapJson //请求地图json,不带端口号
 // console.log(DOMIN)
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';

minggao/src/util/server.js

@@ -18,12 +18,14 @@
 // var mapJson=DOMIN.slice(0,-5) //请求地图json
 // export {DOMIN,mapJson}
 var DOMIN = ""; //服务端接口访问跟路径
+var wsUrl = "";
 var mapJson = "";
 const origin = location.origin //当前访问域名
 mapJson = origin
-DOMIN = 'http://114.115.147.140' + ':12345'
-// DOMIN = origin
+DOMIN = origin
+wsUrl = origin.split('http')[1]
 export {
   DOMIN,
-  mapJson
+  mapJson,
+  wsUrl
 }