Merge remote-tracking branch 'origin/master'

2 years ago · b71303730e
38 changed files with 81 additions and 77 deletions
--- a/supervise-business-ui/src/layout/components/Navbar.vue
+++ b/supervise-business-ui/src/layout/components/Navbar.vue
@ -1,14 +1,14 @@
 <template>
  <div>
    <div class="navbar">
-    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;">汇融云仓贷后监管平台
      <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
-      <div class="right-menu">
+      </p><div class="right-menu">
        <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
        <p>欢迎您，{{ name }}</p>
        <img src="@/assets/images/info.png">
        <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
-        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
+        <span class="backToHome" @click="logout"><i class="el-icon-back" />返回首页</span>
      </div>
    </div>
    <el-footer class="footer" height="40px">Copyright © {{ year }} 技术支持集团 All Rights Reserved</el-footer>
--- a/supervise-business-ui/src/settings.js
+++ b/supervise-business-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-business-ui/vue.config.js
+++ b/supervise-business-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-crm-ui/src/layout/components/Navbar.vue
+++ b/supervise-crm-ui/src/layout/components/Navbar.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台</p>
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云仓贷后监管平台</p>
     <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
      <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
@ -11,7 +11,7 @@
        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
      </div>
    </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓贷后监管平台 All Rights Reserved</el-footer>
  </div>
 </template>

--- a/supervise-crm-ui/src/settings.js
+++ b/supervise-crm-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-crm-ui/vue.config.js
+++ b/supervise-crm-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台' // page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-customer-ui/src/layout/components/Navbar.vue
+++ b/supervise-customer-ui/src/layout/components/Navbar.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
+     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云仓贷后监管平台
        <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
           <div class="right-menu">
     <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
@ -11,7 +11,7 @@
        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
      </div>
    </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台ll Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓贷后监管平台ll Rights Reserved</el-footer>
  </div>
 </template>

--- a/supervise-customer-ui/src/settings.js
+++ b/supervise-customer-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-customer-ui/vue.config.js
+++ b/supervise-customer-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-flowable-ui/vue.config.js
+++ b/supervise-flowable-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-message-ui/src/layout/components/Navbar.vue
+++ b/supervise-message-ui/src/layout/components/Navbar.vue
@ -1,14 +1,14 @@
 <template>
  <div>
    <div class="navbar">
-   <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;">汇融云仓贷后监管平台
      <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
-      <div class="right-menu">
+      </p><div class="right-menu">
        <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
        <p>欢迎您，{{ name }}</p>
        <img src="@/assets/images/info.png">
        <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
-        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
+        <span class="backToHome" @click="logout"><i class="el-icon-back" />返回首页</span>
      </div>
    </div>
    <el-footer class="footer" height="40px">Copyright © {{ year }} 技术支持集团 All Rights Reserved</el-footer>
--- a/supervise-message-ui/src/settings.js
+++ b/supervise-message-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-message-ui/vue.config.js
+++ b/supervise-message-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-organizational-ui/src/layout/components/Navbar.vue
+++ b/supervise-organizational-ui/src/layout/components/Navbar.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <div class="navbar">
-      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云仓贷后监管平台
      <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
      <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
--- a/supervise-organizational-ui/src/settings.js
+++ b/supervise-organizational-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-organizational-ui/vue.config.js
+++ b/supervise-organizational-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-report-ui/src/layout/components/Navbar.vue
+++ b/supervise-report-ui/src/layout/components/Navbar.vue
@ -2,7 +2,7 @@
  <div>
    <div class="navbar">
      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
-          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云眼贷后监管平台</p>
+          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云仓贷后监管平台</p>
      <div class="right-menu">
        <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
        <p>欢迎您，{{name}}</p>
--- a/supervise-report-ui/src/settings.js
+++ b/supervise-report-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-report-ui/vue.config.js
+++ b/supervise-report-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台' // page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-risk-ui/src/layout/components/Navbar.vue
+++ b/supervise-risk-ui/src/layout/components/Navbar.vue
@ -2,7 +2,7 @@
  <div>
    <div class="navbar">
      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
-          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云眼贷后监管平台</p>
+          style="width: 45px;height: 45px;margin-right: 10px;" />汇融云仓贷后监管平台</p>
      <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
      <div class="right-menu">
        <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
--- a/supervise-risk-ui/src/settings.js
+++ b/supervise-risk-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-risk-ui/vue.config.js
+++ b/supervise-risk-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/supervise-work-ui/src/layout/components/Navbar.vue
+++ b/supervise-work-ui/src/layout/components/Navbar.vue
@ -1,7 +1,7 @@
 <template>
  <div>
    <div class="navbar">
-    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台
+    <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云仓贷后监管平台
    <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
      <div class="right-menu">
 <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
--- a/supervise-work-ui/src/settings.js
+++ b/supervise-work-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/supervise-work-ui/vue.config.js
+++ b/supervise-work-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台'// page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台'// page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/warehousing-system/project_web/public/index.html
+++ b/warehousing-system/project_web/public/index.html
@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>汇融云眼贷后监管平台</title>
+    <title>汇融云仓贷后监管平台</title>
  </head>
  <body>
    <noscript>
--- a/warehousing-system/project_web/src/components/Home.vue
+++ b/warehousing-system/project_web/src/components/Home.vue
@ -11,7 +11,7 @@
              margin-right: 10px;
              margin-top: 2px;
            "
-          />汇融云眼贷后监管平台
+          />汇融云仓贷后监管平台
        </p>
        <!-- <h3 class="breadcrumb-container">汇融供应链贷后监管平台h3> -->
        <div class="right-menu">
--- a/yxt-portal-ui/src/layout/components/Navbar.vue
+++ b/yxt-portal-ui/src/layout/components/Navbar.vue
@ -1,16 +1,16 @@
 <template>
  <div>
    <div class="navbar">
-     <p class="breadcrumb-container">汇融云眼贷后监管平台</p>
+      <p class="breadcrumb-container">汇融云仓贷后监管平台</p>
      <div class="right-menu">
        <!--      <p>{{Orgname}}  欢迎, {{name}}</p> &lt;!&ndash;{{departmentName}}&ndash;&gt;-->
        <p>欢迎您，{{ pNameAndDepartmentNameAndPostName }} {{ name }}</p>
        <img src="@/assets/images/info.png">
        <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
-      <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
+        <span class="backToHome" @click="logout"><i class="el-icon-back" />返回首页</span>
      </div>
    </div>
-  <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓贷后监管平台 All Rights Reserved</el-footer>
  </div>
 </template>

@ -22,7 +22,7 @@ export default {
 			departmentName: '',
 			name: '',
      year: '',
-      pNameAndDepartmentNameAndPostName:'',
+      pNameAndDepartmentNameAndPostName: ''
 		}
 	},
 	mounted() {
--- a/yxt-portal-ui/src/settings.js
+++ b/yxt-portal-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/yxt-portal-ui/src/views/Home/Home.vue
+++ b/yxt-portal-ui/src/views/Home/Home.vue
@ -2,7 +2,7 @@
  <div style="height: 100%;">
    <div class="header">
      <p class="title">
-        汇融云眼贷后监管平台
+        汇融云仓贷后监管平台
      </p>
      <div class="head_info">
        <p>欢迎您：</p>
@ -80,7 +80,7 @@
          <p>{{ item.title }}</p>
        </li>
      </ul>
-      <p class="copy">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</p>
+      <p class="copy">Copyright © {{ year }} 汇融云仓贷后监管平台 All Rights Reserved</p>
    </div>
    <!--<ul class="nav-box">-->
    <!--<li style="background-color: #e87861;" @click="toNavbar('http://39.104.100.138:8081/')">
--- a/yxt-portal-ui/vue.config.js
+++ b/yxt-portal-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台' // page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/resources/application.yml
@ -13,8 +13,8 @@ spring:
 #          brokers: localhost:9092 #kafka的网络位置
 #          auto-create-topics: true
  profiles:
-#    active: devv
-    active: test
+    active: devv
+#    active: test
  messages:
    # 国际化资源文件路径
    basename: i18n/messages
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Navbar.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/layout/components/Navbar.vue
@ -1,17 +1,17 @@
 <template>
  <div>
    <div class="navbar">
-     <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融云眼贷后监管平台</p>
+      <p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;">汇融云仓贷后监管平台</p>
      <!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
      <div class="right-menu">
        <!--        <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
        <p>欢迎您，{{ name }}</p>
        <img src="@/assets/images/info.png">
        <!-- <img src="@/assets/images/dy.png" @click="logout"> -->
-        <span class="backToHome" @click="logout"><i class="el-icon-back"></i>返回首页</span>
+        <span class="backToHome" @click="logout"><i class="el-icon-back" />返回首页</span>
      </div>
    </div>
-    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云眼贷后监管平台 All Rights Reserved</el-footer>
+    <el-footer class="footer" height="40px">Copyright © {{ year }} 汇融云仓贷后监管平台 All Rights Reserved</el-footer>
  </div>
 </template>

--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/settings.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/settings.js
@ -1,6 +1,6 @@
 module.exports = {

-  title: '汇融云眼贷后监管平台',
+  title: '汇融云仓贷后监管平台',

  /**
   * @type {boolean} true | false
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/vue.config.js
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/vue.config.js
@ -6,7 +6,7 @@ function resolve(dir) {
  return path.join(__dirname, dir)
 }

-const name = defaultSettings.title || '汇融云眼贷后监管平台' // page title
+const name = defaultSettings.title || '汇融云仓贷后监管平台' // page title

 // 如果端口设置为80，
 // 使用管理员权限执行命令行。
--- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application.yml
+++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/resources/application.yml
@ -15,8 +15,8 @@ spring:
 #          brokers: localhost:9092 #kafka的网络位置
 #          auto-create-topics: true
  profiles:
-#    active: devv
-    active: test
+    active: devv
+#    active: test
  messages:
    # 国际化资源文件路径
    basename: i18n/messages
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeMapper.java
@ -9,6 +9,7 @@ import com.supervise.rms.api.risktype.RiskTypeVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;

 import java.util.List;

@ -27,4 +28,7 @@ public interface RiskTypeMapper extends BaseMapper<RiskType> {

    @Delete("delete from risk_type where parentSid = #{parentSid}")
    void del(@Param("parentSid") String parentSid);
+
+    @Select("select * from risk_type where sid = #{sid}")
+    RiskType selectRiskTypeBySid(@Param("sid") String sid);
 }
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risktype/RiskTypeService.java
@ -34,7 +34,7 @@ public class RiskTypeService extends MybatisBaseService<RiskTypeMapper, RiskType
            baseMapper.insert(riskType);
        }else {
            //更新
-            RiskType riskType = fetchBySid(dto.getSid());
+            RiskType riskType = baseMapper.selectRiskTypeBySid(dto.getSid());
            if(riskType == null){
                return rb.setMsg("该条记录不存在");
            }