fix:更换端口和API名称和修复bug

admin-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 岑溪人民医院随访系统
 ENV = 'production'
 
 # 岑溪人民医院随访系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/api'

admin-ui/public/index.html

@@ -207,6 +207,6 @@
         <div class="load_title">正在加载系统资源，请耐心等待</div>
       </div>
     </div>
-    <script src="/houtai/tinymce/tinymce.min.js"></script>
+    <script src="/admin/tinymce/tinymce.min.js"></script>
   </body>
 </html>

admin-ui/src/layout/components/Navbar.vue

@@ -88,7 +88,7 @@ export default {
       })
         .then(() => {
           this.$store.dispatch('LogOut').then(() => {
-            location.href = '/houtai/index';
+            location.href = '/admin/index';
           });
         })
         .catch(() => {});

admin-ui/src/router/index.js

@@ -171,7 +171,7 @@ Router.prototype.push = function push(location) {
 }
 
 export default new Router({
-  base: "/houtai",
+  base: "/admin",
   mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes

admin-ui/src/utils/request.js

@@ -77,7 +77,7 @@ service.interceptors.response.use(res => {
 				}).then(() => {
 					isRelogin.show = false;
 					store.dispatch('LogOut').then(() => {
-						location.href = '/houtai/index';
+						location.href = '/admin/index';
 					})
 				}).catch(() => {
 					isRelogin.show = false;

admin-ui/src/views/index.vue

@@ -64,7 +64,7 @@
                   <div class="rint" style="background-color: rgb(237 246 254)">
                     <div class="icon" style="color: #489afd">&#xe62f;</div>
                     <div class="rcon">
-                      <div class="rtt">回访记录</div>
+                      <div class="rtt">随访记录</div>
                       <div class="rdesc">{{ data.count.record || 0 }}</div>
                     </div>
                   </div>
@@ -145,8 +145,8 @@ export default {
           icon: '&#xe6b6;',
           color: '#607D8B',
           name: '患者信息',
-          url: '/patient',
-          hasPermi: 'work:patient:list'
+          url: '/visit',
+          hasPermi: 'work:visit:list'
         },
         {
           icon: '&#xe716;',
@@ -158,14 +158,14 @@ export default {
         {
           icon: '&#xe62f;',
           color: '#FF5722',
-          name: '回访记录',
+          name: '随访记录',
           url: '/follow/record',
           hasPermi: 'work:record:list'
         },
         {
           icon: '&#xe60b;',
           color: '#4CAF50',
-          name: '回访模板',
+          name: '随访模板',
           url: '/follow/template',
           hasPermi: 'work:template:list'
         },

admin-ui/src/views/work/follow/record/detail.vue

@@ -0,0 +1,49 @@
+<template>
+  <div class="cmain">
+    <div class="div-mc">
+      <div class="mttv">{{ form.templateName }}</div>
+      <div class="message-bubble-received" v-if="form.type == 0">{{ form.op }}</div>
+      <div class="items" v-for="(item, index) in op" :key="index">
+        <div class="vtitle" style="font-weight: normal; font-size: 14px">
+          <span class="ifnull" v-if="item.ifnull == '必填'">*</span>
+          <span class="index">{{ index + 1 }},</span>
+          <span class="tm">{{ item.name }} ({{ item.input }})</span>
+        </div>
+        <div class="mts">
+          <input v-if="item.input == '填空'" v-model="item.s_value" :disabled="true" />
+          <textarea v-if="item.input == '多行文本'" :disabled="true" v-model="item.s_value"></textarea>
+          <input type="number" v-if="item.input == '数字'" v-model="item.s_value" :disabled="true" />
+          <div class="ops">
+            <div v-for="(op, i) in item.selects" :key="op.name">
+              <div class="op" :class="{active:op.check}">{{ op.name }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectPatient from './selectPatient';
+export default {
+  data() {
+    return {
+      form: {
+        patientList: []
+      },
+      op: []
+    };
+  },
+  mounted() {
+    if (this.param.id) {
+      this.ajax({ url: '/work/record/detail/' + this.param.id }).then((response) => {
+        this.form = response.data;
+        this.op = JSON.parse(response.data.op);
+      });
+    }
+  },
+  methods: {}
+};
+</script>
+<style lang="scss" scoped></style>

admin-ui/src/views/work/follow/record/index.vue

@@ -52,6 +52,7 @@
 
 <script>
 import edit from './edit';
+import detail from './detail';
 export default {
   name: 'Record',
   data() {
@@ -96,7 +97,7 @@ export default {
         this.iframe({ obj: edit, param: { id: row.id, type: this.queryParams.type, patientName: row.patientName }, title: '编辑', width: '55%', height: '77%' });
       }
       if (tag == 'detail') {
-        this.iframe({ obj: edit, param: { id: row.id, detail: true, patientName: row.patientName }, title: '查看详情', width: '55%', height: '77%' });
+        this.iframe({ obj: detail, param: { id: row.id, detail: true, patientName: row.patientName }, title: '查看详情', width: '45%', height: '70%' });
       }
     },
     del(row) {

admin-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '广安市红十字会管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '岑溪人民医院随访系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -18,7 +18,7 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/houtai/" : "/houtai/",
+  publicPath: process.env.NODE_ENV === "production" ? "/admin/" : "/admin/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: 'dist',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:9191`,
+        target: `http://localhost:9292`,
         //target: `https://gahsz.com/prod-api`,
         changeOrigin: true,
         pathRewrite: {

app/common/http.js

@@ -1,6 +1,6 @@
 //const ip = 'http://127.0.0.1:9191';
-//const ip = 'https://chenglantimes.com/prod-api';
-const ip = 'http://192.168.1.19:9191';
+const ip = 'https://chenglantimes.com/api';
+//const ip = 'http://192.168.1.24:9292';
 /**
  * 封装的http请求
  */
@@ -43,8 +43,8 @@ const request = (opt) => {
 					content: res.data.msg,
 					showCancel: false,
 					success: () => {
-						uni.removeStorageSync('user');
 						if (res.data.code === 401) {
+							uni.removeStorageSync('user');
 							uni.navigateTo({
 								url: '/pages/user/login'
 							})

app/pages/knowledge/index.vue

@@ -108,6 +108,9 @@ export default {
 		margin-bottom: 10px;
 		overflow: hidden;
 		border-bottom: 1px solid $line;
+		&:last-child{
+			border: 0px;
+		}
 		.title {
 			font-size: 15px;
 			font-weight: bold;

ruoyi-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9191
+  port: 9292
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-admin/src/main/resources/mapper/work/KnowledgeMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tb_knowledge
         WHERE
         state =0
-            <if test="type != null "> AND type = #{type}</if>
+            <if test="type != null and type != ''"> AND type = #{type}</if>
             <if test="title != null  and title != ''"> AND title LIKE concat('%', #{title}, '%')</if>
         ORDER BY id DESC
     </select>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusMetaObjectHandler.java

@@ -17,7 +17,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
                 this.setFieldValByName("deptId", SecurityUtils.getLoginUser().getDeptId(), metaObject);
             }
             this.setFieldValByName("userId", SecurityUtils.getLoginUser().getUserId(), metaObject);
-            this.setFieldValByName("createBy", SecurityUtils.getLoginUser().getUsername(), metaObject);
+            this.setFieldValByName("createBy", SecurityUtils.getLoginUser().getUser().getNickName(), metaObject);
         }
     }