From 16f9c4065fc4a33cb5e0642e7a2480009f782d56 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 24 Oct 2023 08:32:35 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E4=BA=A7=E4=BA=A4=E5=85=AC=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                                    | 3 +--
 src/views/sunVillage_info/list_contract.vue        | 4 ++--
 src/views/sunVillage_info/list_contract_add.vue    | 2 +-
 src/views/sunVillage_info/list_contract_detail.vue | 2 +-
 src/views/sunVillage_info/list_contract_edit.vue   | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/index.js b/config/index.js
index a44a9c93..6b5beb1b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -12,9 +12,8 @@ module.exports = {
     proxyTable: {
       "/api": {
         // 请求的目标主机
-        //target: 'http://116.255.223.226:8081/nsgk_test/',
+        //target: 'http://116.255.223.226:8082/nsgk_test/',
         target: 'http://localhost:8080/',
-        //target: 'http://192.168.0.107:8080/',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''
diff --git a/src/views/sunVillage_info/list_contract.vue b/src/views/sunVillage_info/list_contract.vue
index 7ed41deb..12a85770 100644
--- a/src/views/sunVillage_info/list_contract.vue
+++ b/src/views/sunVillage_info/list_contract.vue
@@ -4,7 +4,7 @@
       class="header_main"
       :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
-      {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'政务':''}}公开
+      {{queryParams.otherType=='1'?'合同':queryParams.otherType=='2'?'党务':queryParams.otherType=='3'?'政务':queryParams.otherType=='4'?'产交':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn" @click="goAdd" v-show="showBtn"></div>
     </div>
@@ -104,7 +104,7 @@
       if (this.$route.query.type == 'code'){
         this.showBtn = false;
       }
-      document.title = this.$route.query.typeX=='1'?'合同公开':this.$route.query.typeX=='2'?'党务公开':this.$route.query.typeX=='3'?'政务公开':'';
+      document.title = this.$route.query.typeX=='1'?'合同公开':this.$route.query.typeX=='2'?'党务公开':this.$route.query.typeX=='3'?'政务公开':this.$route.query.typeX=='4'?'产交公开':'';
     },
     methods: {
       getList(){
diff --git a/src/views/sunVillage_info/list_contract_add.vue b/src/views/sunVillage_info/list_contract_add.vue
index d7d229c8..d7249928 100644
--- a/src/views/sunVillage_info/list_contract_add.vue
+++ b/src/views/sunVillage_info/list_contract_add.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      新增{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'政务':''}}公开
+      新增{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'政务':form.otherType=='4'?'产交':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>
diff --git a/src/views/sunVillage_info/list_contract_detail.vue b/src/views/sunVillage_info/list_contract_detail.vue
index c6a0f185..c65cfad8 100644
--- a/src/views/sunVillage_info/list_contract_detail.vue
+++ b/src/views/sunVillage_info/list_contract_detail.vue
@@ -4,7 +4,7 @@
       class="header_main"
        :style="`background-image:url(${require(showBtn?'@/assets/images/sunVillage_info/list_head.png':'@/assets/images/sunVillage_info/list_head_red.png')})`"
     >
-      查看{{otherType=='1'?'合同':otherType=='2'?'党务':otherType=='3'?'政务':''}}公开
+      查看{{otherType=='1'?'合同':otherType=='2'?'党务':otherType=='3'?'政务':otherType=='4'?'产交':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>
diff --git a/src/views/sunVillage_info/list_contract_edit.vue b/src/views/sunVillage_info/list_contract_edit.vue
index 8cef023b..031bcaf3 100644
--- a/src/views/sunVillage_info/list_contract_edit.vue
+++ b/src/views/sunVillage_info/list_contract_edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      修改{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'政务':''}}公开
+      修改{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'政务':form.otherType=='4'?'产交':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>

From 9653dba59d5cc05b52db7677ff20890dda880c1b Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 24 Oct 2023 09:38:24 +0800
Subject: [PATCH 2/8] logo

---
 .../images/sunVillage_info/index_block_22.png    | Bin 0 -> 3501 bytes
 .../images/sunVillage_info/index_code_btn_13.png | Bin 0 -> 7044 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/index_block_22.png
 create mode 100644 src/assets/images/sunVillage_info/index_code_btn_13.png

diff --git a/src/assets/images/sunVillage_info/index_block_22.png b/src/assets/images/sunVillage_info/index_block_22.png
new file mode 100644
index 0000000000000000000000000000000000000000..78ddc09ce0f49e3c08f904cd86bcc32825727145
GIT binary patch
literal 3501
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
Vx41b*d};Xy3Xj{4ec&FF{%;T{41E9q

literal 0
HcmV?d00001

diff --git a/src/assets/images/sunVillage_info/index_code_btn_13.png b/src/assets/images/sunVillage_info/index_code_btn_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcf6a8b490b591452da5b0f4ad4d479616f63a43
GIT binary patch
literal 7044
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

literal 0
HcmV?d00001


From 2116f27ba6a03d9dddcf575f689ab6504d5af4b8 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Tue, 24 Oct 2023 10:24:52 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E8=B6=85=E6=97=B6=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js | 62 +++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 6586238e..93c675f5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -211,37 +211,37 @@ router.beforeEach((to, from, next) => {
           // })
           next()
         }).catch(err => {
-          store.dispatch('LogOut').then(() => {
-            try {
-              let loginUrl = Cookies.get("_Login_url");
-              if (loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) {
-                next({ path: '/onlineHomeLogin' })
-                return;
-              }
-            } catch (e) { console.log(e); }
-            // Message.error(err)
-            if ('/authenticRight'.indexOf(to.path) !== -1) {
-              next({ path: '/authenticRight/login' })
-            } else if ('/homestead'.indexOf(to.path) !== -1) {
-              next({ path: '/homestead/login' })
-            } else if (to.path.indexOf('/onlineHome') !== -1) {
-              //next(`/onlineHomeLogin`)
-              next(`/zjdLogin`)
-            } else if (to.path.indexOf('/yinnong') !== -1) {
-              next(`/yinnongLogin`)
-            } else if (window.location.href.indexOf('/sunVillage_info/') != -1) {
-              window.location.href = '/sunVillage_info/login';
-            } else if (to.path.indexOf('/homesteadSurvey') !== -1) {
-              next(`/homesteadLogin`)
-            } else if (to.path.indexOf('/lawEnforcement') !== -1) {
-              next(`/lawEnforcement/login`)
-            } else if (to.path.indexOf('/sunVillage') !== -1) {
-              next(`/sunVillage/login`)
-            } else {
-              next(`/yinnongLogin`)
-              //next({ path: '/' })
-            }
-          })
+          // store.dispatch('LogOut').then(() => {
+          //   try {
+          //     let loginUrl = Cookies.get("_Login_url");
+          //     if (loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) {
+          //       next({ path: '/onlineHomeLogin' })
+          //       return;
+          //     }
+          //   } catch (e) { console.log(e); }
+          //   // Message.error(err)
+          //   if ('/authenticRight'.indexOf(to.path) !== -1) {
+          //     next({ path: '/authenticRight/login' })
+          //   } else if ('/homestead'.indexOf(to.path) !== -1) {
+          //     next({ path: '/homestead/login' })
+          //   } else if (to.path.indexOf('/onlineHome') !== -1) {
+          //     //next(`/onlineHomeLogin`)
+          //     next(`/zjdLogin`)
+          //   } else if (to.path.indexOf('/yinnong') !== -1) {
+          //     next(`/yinnongLogin`)
+          //   } else if (window.location.href.indexOf('/sunVillage_info/') != -1) {
+          //     window.location.href = '/sunVillage_info/login';
+          //   } else if (to.path.indexOf('/homesteadSurvey') !== -1) {
+          //     next(`/homesteadLogin`)
+          //   } else if (to.path.indexOf('/lawEnforcement') !== -1) {
+          //     next(`/lawEnforcement/login`)
+          //   } else if (to.path.indexOf('/sunVillage') !== -1) {
+          //     next(`/sunVillage/login`)
+          //   } else {
+          //     next(`/yinnongLogin`)
+          //     //next({ path: '/' })
+          //   }
+          // })
         })
       } else {
         next()

From 9e5a6d1cb1cc792d17709c22805bef9c414ad7b3 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 25 Oct 2023 16:09:33 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E9=87=8D=E5=A4=8D=E8=B6=85=E6=97=B6=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=A1=86=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 275 ++++++++++++++++++++++---------------------
 1 file changed, 143 insertions(+), 132 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index a4b60e5f..69c5697c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -14,145 +14,156 @@ const service = axios.create({
   // 超时
   timeout: 100000
 })
-// request拦截器
-service.interceptors.request.use(config => {
-  // Toast.loading({
-  //   message: '加载中...',
-  //   forbidClick: true,
-  //   duration: 0
-  // });
-  // 是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  if (getToken() && !isToken) {
-    config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  // get请求映射params参数
-  if (config.method === 'get' && config.params) {
-    let url = config.url + '?';
-    for (const propName of Object.keys(config.params)) {
-      const value = config.params[propName];
-      var part = encodeURIComponent(propName) + "=";
-      if (value !== null && typeof (value) !== "undefined") {
-        if (typeof value === 'object') {
-          for (const key of Object.keys(value)) {
-            let params = propName + '[' + key + ']';
-            var subPart = encodeURIComponent(params) + "=";
-            url += subPart + encodeURIComponent(value[key]) + "&";
+let  requestInterceptor;
+if(requestInterceptor === undefined){
+  // request拦截器
+  requestInterceptor  = service.interceptors.request.use(config => {
+    // Toast.loading({
+    //   message: '加载中...',
+    //   forbidClick: true,
+    //   duration: 0
+    // });
+    // 是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false
+    if (getToken() && !isToken) {
+      config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    // get请求映射params参数
+    if (config.method === 'get' && config.params) {
+      let url = config.url + '?';
+      for (const propName of Object.keys(config.params)) {
+        const value = config.params[propName];
+        var part = encodeURIComponent(propName) + "=";
+        if (value !== null && typeof (value) !== "undefined") {
+          if (typeof value === 'object') {
+            for (const key of Object.keys(value)) {
+              let params = propName + '[' + key + ']';
+              var subPart = encodeURIComponent(params) + "=";
+              url += subPart + encodeURIComponent(value[key]) + "&";
+            }
+          } else {
+            url += part + encodeURIComponent(value) + "&";
           }
-        } else {
-          url += part + encodeURIComponent(value) + "&";
         }
       }
+      url = url.slice(0, -1);
+      config.params = {};
+      config.url = url;
     }
-    url = url.slice(0, -1);
-    config.params = {};
-    config.url = url;
-  }
-  return config
-}, error => {
-  console.log(error)
-  Promise.reject(error)
-})
+    return config
+  }, error => {
+    console.log(error)
+    Promise.reject(error)
+  })
+}
+
 
 // 响应拦截器
-service.interceptors.response.use(res => {
-  Toast.clear();
-  // 未设置状态码则默认成功状态
-  const code = res.data.code || 200;
-  // 获取错误信息
-  const msg = errorCode[code] || res.data.msg || errorCode['default']
+let  responseInterceptor;
+let gqnum = 0;
+if(responseInterceptor === undefined){
+  responseInterceptor = service.interceptors.response.use(res => {
+console.info(responseInterceptor);
+      Toast.clear();
+      // 未设置状态码则默认成功状态
+      const code = res.data.code || 200;
+      // 获取错误信息
+      const msg = errorCode[code] || res.data.msg || errorCode['default']
+      console.info(gqnum);
+      if (code === 401 && gqnum === 0) {
+        console.info(11111111)
+        gqnum++;
+        Dialog.confirm({
+          title: '系统提示',
+          message: '登录状态已过期，请重新登录',
+          confirmButtonText: '重新登录',
+          cancelButtonText: '取消'
+        })
+          .then(() => {
+            store.dispatch('LogOut').then(() => {
+              try {
+                let loginUrl = Cookies.get("_Login_url");
+                if(loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) {
+                  window.location.href = loginUrl;
+                  return;
+                }
+              } catch (e) { console.log(e); }
+
+              if (window.location.href.indexOf('/lawEnforcement') != -1) {
+                // 农业执法
+                window.location.href = '/lawEnforcement/login';
+                return;
+              }else if (window.location.href.indexOf('/authenticRight') != -1) {
+                // 确权回头看
+                window.location.href = '/authenticRight/login';
+                return;
+              }else if (window.location.href.indexOf('/homesteadSurvey') != -1) {
+                // 宅基地调查
+                window.location.href = '/homesteadLogin';
+                return;
+              }else if (window.location.href.indexOf('/yinnong') != -1) {
+                // 事项审批
+                window.location.href = '/yinnongLogin';
+                return;
+              }else if (window.location.href.indexOf('/sunVillage_info/') != -1) {
+                // 阳光村务
+                window.location.href = '/sunVillage_info/login';
+                return;
+              }else if (window.location.href.indexOf('/homestead/') != -1) {
+                // 两清三化
+                window.location.href = '/homestead/login';
+                return;
+              }else if (window.location.href.indexOf('/agriculturalTrusteeship') != -1){
+                // 生产托管
+                window.location.href = '/agriculturalTrusteeship/login';
+                return;
+              } else if (window.location.href.indexOf('/contracted') != -1){
+                // 土地确权
+                window.location.href = '/contracted/login';
+                return;
+              }else{
+                // 产权交易
+                window.location.href = '/login';
+              }
 
-  if (code === 401) {
-    Dialog.confirm({
-      title: '系统提示',
-      message: '登录状态已过期，请重新登录',
-      confirmButtonText: '重新登录',
-      cancelButtonText: '取消'
+            })
+          })
+      } else if (code === 500) {
+        Dialog.alert({ type: 'warning', message: msg });
+        return Promise.reject(new Error(msg))
+      } else if (code !== 200 && code !== 401) {
+        Dialog.alert({ type: 'warning', message: msg });
+        return Promise.reject('error')
+      } else {
+        return res.data
+      }
+    },
+    error => {
+      console.log('err' + error)
+      let { message } = error;
+      if (message == "Network Error") {
+        message = "后端接口连接异常";
+      }
+      else if (message.includes("timeout")) {
+        message = "系统接口请求超时";
+      }
+      else if (message.includes("Request failed with status code")) {
+        message = "系统接口" + message.substr(message.length - 3) + "异常";
+      }
+      Toast.clear();
+      // Message({
+      //   message: message,
+      //   type: 'error',
+      //   duration: 5 * 1000
+      // })
+      Dialog.alert({ type: 'warning', message: message });
+      return Promise.reject(error)
     })
-      .then(() => {
-        store.dispatch('LogOut').then(() => {
-          try {
-            let loginUrl = Cookies.get("_Login_url");
-            if(loginUrl && loginUrl.indexOf("onlineHomeLogin") !== -1) {
-              window.location.href = loginUrl;
-              return;
-            }
-          } catch (e) { console.log(e); }
-          // 农业执法
-          if (window.location.href.indexOf('/lawEnforcement') != -1) {
-            window.location.href = '/lawEnforcement/login';
-            return;
-          }
-          // 确权回头看
-          if (window.location.href.indexOf('/authenticRight') != -1) {
-            window.location.href = '/authenticRight/login';
-            return;
-          }
-          // 宅基地调查
-          if (window.location.href.indexOf('/homesteadSurvey') != -1) {
-            window.location.href = '/homesteadLogin';
-            return;
-          }
-          // 事项审批
-          if (window.location.href.indexOf('/yinnong') != -1) {
-            window.location.href = '/yinnongLogin';
-            return;
-          }
-          // 阳光村务
-          if (window.location.href.indexOf('/sunVillage_info/') != -1) {
-            window.location.href = '/sunVillage_info/login';
-            return;
-          }
-          // 两清三化
-          if (window.location.href.indexOf('/homestead/') != -1) {
-            window.location.href = '/homestead/login';
-            return;
-          }
-          // 生产托管
-          if (window.location.href.indexOf('/agriculturalTrusteeship') != -1){
-            window.location.href = '/agriculturalTrusteeship/login';
-            return;
-          }
-          // 土地确权
-          if (window.location.href.indexOf('/contracted') != -1){
-            window.location.href = '/contracted/login';
-            return;
-          }
-          // 产权交易
-          window.location.href = '/login';
-        })
-      })
-  } else if (code === 500) {
-    Dialog.alert({ type: 'warning', message: msg });
-    return Promise.reject(new Error(msg))
-  } else if (code !== 200) {
-    Dialog.alert({ type: 'warning', message: msg });
-    return Promise.reject('error')
-  } else {
-    return res.data
-  }
-},
-  error => {
-    console.log('err' + error)
-    let { message } = error;
-    if (message == "Network Error") {
-      message = "后端接口连接异常";
-    }
-    else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    }
-    else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Toast.clear();
-    // Message({
-    //   message: message,
-    //   type: 'error',
-    //   duration: 5 * 1000
-    // })
-    Dialog.alert({ type: 'warning', message: message });
-    return Promise.reject(error)
-  }
-)
+}
+
+// // 取消请求拦截器
+// instance.interceptors.request.eject(requestInterceptor);
+// // 取消响应拦截器
+// instance.interceptors.response.eject(responseInterceptor);
 
 export default service

From c544e3d0fc8040450362c0c4e1f128fd208926a2 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 25 Oct 2023 16:25:29 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 69c5697c..7ce1caf9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -71,7 +71,6 @@ console.info(responseInterceptor);
       const msg = errorCode[code] || res.data.msg || errorCode['default']
       console.info(gqnum);
       if (code === 401 && gqnum === 0) {
-        console.info(11111111)
         gqnum++;
         Dialog.confirm({
           title: '系统提示',

From 9dfa6ca3e3ff3a54e9e5006767afabe25bdb89fe Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Wed, 25 Oct 2023 16:37:33 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 7ce1caf9..8118346e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -63,7 +63,6 @@ let  responseInterceptor;
 let gqnum = 0;
 if(responseInterceptor === undefined){
   responseInterceptor = service.interceptors.response.use(res => {
-console.info(responseInterceptor);
       Toast.clear();
       // 未设置状态码则默认成功状态
       const code = res.data.code || 200;

From fd5c9ff8951f756489372a2a4298792046d1eca1 Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Thu, 26 Oct 2023 11:08:53 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=85=AC=E5=BC=80=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/sunVillage_info/fixedAssets.js        |   9 +++++
 .../images/sunVillage_info/list_icon_copy.png | Bin 0 -> 4345 bytes
 src/views/sunVillage_info/list_contract.vue   |  20 ++++++++--
 .../sunVillage_info/list_contract_edit.vue    |  35 +++++++++++++-----
 4 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 src/assets/images/sunVillage_info/list_icon_copy.png

diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js
index 08bafaac..35f3a26a 100644
--- a/src/api/sunVillage_info/fixedAssets.js
+++ b/src/api/sunVillage_info/fixedAssets.js
@@ -94,6 +94,15 @@ export function otherEdit(data) {
   })
 }
 
+// 复制公开信息
+export function otherCopy(data) {
+  return request({
+    url: '/subcontract/other/copy',
+    method: 'post',
+    data: data
+  });
+}
+
 // 查询合同信息列表
 export function contractionList(query) {
   return request({
diff --git a/src/assets/images/sunVillage_info/list_icon_copy.png b/src/assets/images/sunVillage_info/list_icon_copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4cdfb847d1631eada844f6a36f4a4d0a2f5b01
GIT binary patch
literal 4345
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
H?bd$*qw36~

literal 0
HcmV?d00001

diff --git a/src/views/sunVillage_info/list_contract.vue b/src/views/sunVillage_info/list_contract.vue
index 12a85770..cad78de0 100644
--- a/src/views/sunVillage_info/list_contract.vue
+++ b/src/views/sunVillage_info/list_contract.vue
@@ -41,7 +41,10 @@
             </div>
             <div class="operation" v-show="showBtn">
               <!-- delete 删除 edit编辑 view查看 list榜单 -->
-              <div class="opera_btn edit" @click="goEdit(item.id)">
+              <div class="opera_btn edit" @click="goEdit(item.id, 'update')">
+                <i class="icon "></i>
+              </div>
+              <div class="opera_btn copy" @click="goEdit(item.id, 'copy')">
                 <i class="icon "></i>
               </div>
               <div class="opera_btn delete" @click="goRemove(item.id,index)">
@@ -176,8 +179,8 @@
       goDetail(id){
         this.$router.push({path:'/sunVillage_info/list_contract_detail',query: {id:id,type:this.$route.query.typeX,showBtn:this.showBtn}})
       },
-      goEdit(id){
-        this.$router.push({path:'/sunVillage_info/list_contract_edit',query: {id:id,type:this.$route.query.typeX}})
+      goEdit(id, operation){
+        this.$router.push({path:'/sunVillage_info/list_contract_edit',query: {id:id,type:this.$route.query.typeX,operation: operation}})
       },
       goRanking(id,time){
         this.$router.push({path:'/sunVillage_info/list_tourists_ranking',query: {id:id,time:time}})
@@ -413,6 +416,17 @@
                 display: block;
               }
             }
+            &.copy{
+              background: #79cf13;
+              margin-left: 10PX;
+              .icon {
+                width: 25px;
+                height: 25px;
+                background: url('../../assets/images/sunVillage_info/list_icon_copy.png') no-repeat;
+                background-size: 100% 100%;
+                display: block;
+              }
+            }
           }
         }
       }
diff --git a/src/views/sunVillage_info/list_contract_edit.vue b/src/views/sunVillage_info/list_contract_edit.vue
index 031bcaf3..c48eb610 100644
--- a/src/views/sunVillage_info/list_contract_edit.vue
+++ b/src/views/sunVillage_info/list_contract_edit.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="home_wrapper">
     <div class="header_main">
-      修改{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'政务':form.otherType=='4'?'产交':''}}公开
+      {{operation==='update'?'修改':'复制'}}{{form.otherType=='1'?'合同':form.otherType=='2'?'党务':form.otherType=='3'?'政务':form.otherType=='4'?'产交':''}}公开
       <div class="return_btn" @click="onClickLeft"></div>
       <div class="add_btn"></div>
     </div>
@@ -128,7 +128,7 @@
 </template>
 
 <script>
-  import {commonUpload, otherPublicDetail, otherEdit} from "@/api/sunVillage_info/fixedAssets";
+  import {commonUpload, otherPublicDetail, otherEdit, otherCopy} from "@/api/sunVillage_info/fixedAssets";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
@@ -155,6 +155,8 @@
         },
         openFile2:[],
         openPic2:[],
+        // 操作类型：update或copy
+        operation: '',
       };
     },
     created() {
@@ -162,6 +164,7 @@
         this.otherGkTypeOptions = response.data;
       });
       this.type = this.$route.query.type;
+      this.operation = this.$route.query.operation;
       this.queryParams.bookId = Cookies.get('bookId');
       this.queryParams.deptId = Cookies.get('deptId');
       this.queryParams.id = this.$route.query.id;
@@ -208,14 +211,26 @@
         that.form.openFile = that.openFile2.join(',')
         that.form.openPic = that.openPic2.join(',')
         this.form.deptName = Cookies.get('deptName');
-        otherEdit(that.form).then((r1) => {
-          if (r1.code == 200){
-            that.$notify({ type: 'success', message: '修改成功' });
-            setTimeout(function(){
-              history.back(-1);
-            },2000)
-          }
-        })
+        if (that.operation === 'update') {
+          otherEdit(that.form).then((r1) => {
+            if (r1.code == 200){
+              that.$notify({ type: 'success', message: '修改成功' });
+              setTimeout(function(){
+                history.back(-1);
+              },1000)
+            }
+          })
+        } else if (that.operation === 'copy') {
+          that.form.id = null;
+          otherCopy(that.form).then(res => {
+            if (res.code === 200) {
+              that.$notify({ type: 'success', message: '复制成功'});
+              setTimeout(function(){
+                history.back(-1);
+              },1000)
+            }
+          });
+        }
       },
       onConfirmOpenNy(data){
         this.form.openAt = this.format(data,'yyyy-MM-dd');

From fe1e6ef5f052cd6d47129645ac3216eaacdc7341 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Fri, 27 Oct 2023 14:03:02 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=86=85=E7=BD=91=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/index.js b/config/index.js
index 6b5beb1b..a6a51a11 100644
--- a/config/index.js
+++ b/config/index.js
@@ -12,7 +12,8 @@ module.exports = {
     proxyTable: {
       "/api": {
         // 请求的目标主机
-        //target: 'http://116.255.223.226:8082/nsgk_test/',
+        // target: 'http://116.255.223.226:8082/nsgk_test/',  // 公网测试环境
+        // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境
         target: 'http://localhost:8080/',
         changeOrigin: true,
         pathRewrite: {