apply-clients 7.1.36-yuchuan-30 → 7.1.36-yuchuan-32

package/build/dev-server.js

@@ -6,16 +6,18 @@ var proxyMiddleware = require('http-proxy-middleware')
 var app = express()
 var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
-var ldap = 'http://193.168.1.44:8600'
+// var ldap = 'http://193.168.1.5:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
 // var ldap = 'http://193.168.1.64:8082'
-// var ldap = 'http://61.134.61.238:8655'
-// var applyinstall = 'http://61.134.61.238:8655'
-var applyinstall = 'http://193.168.1.44:8600'
-var fadada = 'http://193.168.1.44:8600'
-// var fadada = 'http://61.134.61.238:8655'
-// var fadada = 'http://127.0.0.1:8080/'
+var ldap = 'http://61.134.61.238:8655'
+var applyinstall = 'http://61.134.61.238:8655'
+// var applyinstall = 'http://193.168.1.5:8400'
+// var fadada = 'http://193.168.1.5:8400'
+var fadada = 'http://61.134.61.238:8655'
 var proxyTable = {
+  '/baojianFile': {
+    target: fadada
+  },
   '/testfiles': {
     target: fadada
   },
@@ -127,10 +129,10 @@ var proxyTable = {
   '/rs': {
     target: applyinstall
   },
-  '/ws': {
-    target: applyinstall,
-    ws: true // 代理webSocket
-  }
+  // '/ws': {
+  //   target: applyinstall,
+  //   ws: true // 代理webSocket
+  // }
 }
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-30",
+  "version": "7.1.36-yuchuan-32",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -66,16 +66,17 @@
                 <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_meter_style }}</p>
               </div>
               <div class="row text-right">
-                <button class="btn btn-info"
-                        @click.prevent="$parent.$parent.$parent.openModal(row)">
-                  {{$parent.mark === 1 ? '查看' : '修正'}}
-                </button>
                 <button class="btn btn-danger"
                         @click="$parent.$parent.$parent.deleteUserinfo(row)"
-                        v-if="$parent.showDeleteUserInfo"
+                        v-if="$parent.$parent.$parent.DeleteUserInfo"
                         :disabled="$parent.mark === 1 || row.f_user_state === '正常'">
                   销户
                 </button>
+                <button class="btn btn-info"
+                        @click.prevent="$parent.$parent.$parent.openModal(row)">
+                  {{$parent.mark === 1 ? '查看' : '修正'}}
+                </button>
+
               </div>
             </div>
           </div>
@@ -408,7 +409,8 @@ export default {
       showUserInformation: {},
       scanCodeConfig: null,
       gasbrandDisable: false,
-      showDeleteModel: false
+      showDeleteModel: false,
+      DeleteUserInfo: false,
     }
   },
   ready () {
@@ -417,8 +419,14 @@ export default {
     this.getMeterBrand()
     this.getAreaList()
     this.getScanCodeConfig()
+    this.showDeleteUserInfo()
   },
   methods: {
+   showDeleteUserInfo () {
+     if(this.selectdata.f_apply_type === '民用报建' && (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')){
+       this.DeleteUserInfo=true
+     }
+    },
     copydata(){
       if(!isEmpty(this.selectdata.f_building)){
         this.$refs.cp.$refs.cri.model.f_building=this.selectdata.f_building
@@ -931,10 +939,7 @@ export default {
   events: {
   },
   computed: {
-    showDeleteUserInfo () {
-      return this.selectdata.f_apply_type === '民用报建' &&
-        (this.selectdata.defname === '报建受理' || this.selectdata.defname === '现场勘察')
-    },
+
     showAddress () {
       return this.selectdata.f_apply_type === '民用报建' || this.selectdata.f_apply_type === '设备拆除'
     },

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -130,8 +130,16 @@ export default {
     downloadfile(filepath){
       var link = document.createElement('a');
       link.href = filepath;
-      link.target='_blank'
-      link.dispatchEvent(new MouseEvent('click'));
+      // 设置下载属性，使得点击时触发下载
+      link.download = filepath.split('/').pop(); // 获取文件名并设置为下载时的文件名
+      // 隐藏链接（非必需，但避免不必要的视觉干扰）
+      link.style.display = 'none';
+      // 将链接添加到文档中
+      document.body.appendChild(link);
+      // 触发点击事件开始下载
+      link.click();
+      // 下载后移除链接（可选，为了保持DOM清洁）
+      document.body.removeChild(link);
     },
     // 关闭文件上传对话框
     close () {
@@ -182,6 +190,7 @@ export default {
           getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
         }
       }
+      debugger
       this.fileInfoData = []
       this.fileInfoData = getFile.data
     },

package/src/main.js

@@ -13,7 +13,7 @@ import apply from './apply'
 all()
 weixinManage('yuchuan', 'test')
 apply()
-ldap('zhoukou')
+ldap("zhoukou")
 sale()
 material()
 system(false, 'yuchuan')