Parcourir la source

update 审核意见

linweizeng il y a 3 ans
Parent
commit
4c672e6eed

+ 1 - 1
.editorconfig

@@ -1,6 +1,6 @@
 [*.{js,jsx,ts,tsx,vue}]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true

+ 3 - 1
.gitignore

@@ -1,4 +1,6 @@
 dist/
 node_modules/
 *.git
-
+package-lock.json
+.idea
+.history

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 22031
package-lock.json


+ 188 - 58
public/index.html

@@ -1,65 +1,195 @@
 <!DOCTYPE html>
 <html>
-  <head>
- 
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-	<!-- 将http转化为https -->
-	<!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <!-- 使用 CDN 加速的 CSS 文件,配置在 vue.config.js 下 -->
-    <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.css) { %>
+
+<head>
+
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <!-- 将http转化为https -->
+  <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <!-- 使用 CDN 加速的 CSS 文件,配置在 vue.config.js 下 -->
+  <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.css) { %>
     <link href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" rel="preload" as="style">
     <link href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" rel="stylesheet">
     <% } %>
-    <!-- 使用 CDN 加速的 JS 文件,配置在 vue.config.js 下 -->
-    <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %>
-    <link href="<%= htmlWebpackPlugin.options.cdn.js[i] %>" rel="preload" as="script">
-    <% } %>
-    <title><%= VUE_APP_TITLE %></title>
-<!-- 	<script type="text/javascript" src="http://192.168.48.129:9999/web-apps/apps/api/documents/api.js"></script> -->
-	<script type="text/javascript" src="https://www.mingjianlims.com/word/web-apps/apps/api/documents/api.js"></script>
-    <style>
-     html,body,#app{height:100%;margin:0;padding:0}
-     .ibps-home{background-color:#303133;height:100%;display:flex;flex-direction:column}
-     .ibps-home__main{user-select:none;width:100%;flex-grow:1;display:flex;justify-content:center;align-items:center;flex-direction:column}
-     .ibps-home__footer{width:100%;flex-grow:0;text-align:center;padding:1em 0}
-     .ibps-home__footer>a{font-size:12px;color:#ababab;text-decoration:none}
-     .ibps-home__loading{height:30px;width:30px;margin-bottom:10px}
-     .ibps-home__title{color:#FFF;font-size:14px;margin-bottom:20px}
-     .ibps-home__sub-title{color:#ababab;font-size:12px}[data-loader='circle-side']{position:relative;width:25px;height:25px;-webkit-animation:circle infinite .75s linear;-moz-animation:circle infinite .75s linear;-o-animation:circle infinite .75s linear;animation:circle infinite .75s linear;border:2px solid #fff;border-top-color:rgba(0,0,0,.2);border-right-color:rgba(0,0,0,.2);border-bottom-color:rgba(0,0,0,.2);border-radius:100%}@-webkit-keyframes circle{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);-o-transform:rotate(360deg);transform:rotate(360deg)}}@-moz-keyframes circle{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);-o-transform:rotate(360deg);transform:rotate(360deg)}}@-o-keyframes circle{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);-o-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes circle{0%{-webkit-transform:rotate(0);-ms-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(360deg);-ms-transform:rotate(360deg);-o-transform:rotate(360deg);transform:rotate(360deg)}}
-    </style>
-  </head>
-  <body>
-    <noscript>
-      <strong>
-        敬请期待
-      </strong>
-    </noscript>
-    <div id="app">
-      <div class="ibps-home">
-        <div class="ibps-home__main">
-            <div class="ibps-home__loading">
-                <div data-loader="circle-side"></div>
-            </div>
-            <div class="ibps-home__title">正在加载资源
-            </div>
-            <div class="ibps-home__sub-title">初次加载资源可能需要较多时间 请耐心等待</div>
-            </div>
-            <div class="ibps-home__footer">
-                <span
-                target="_blank">
-                2020©深圳市金源信通科技有限公司©版权所有
-                </span>
-            </div>
+      <!-- 使用 CDN 加速的 JS 文件,配置在 vue.config.js 下 -->
+      <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %>
+        <link href="<%= htmlWebpackPlugin.options.cdn.js[i] %>" rel="preload" as="script">
+        <% } %>
+          <title>
+            <%= VUE_APP_TITLE %>
+          </title>
+          <!-- 	<script type="text/javascript" src="http://192.168.48.129:9999/web-apps/apps/api/documents/api.js"></script> -->
+          <script type="text/javascript"
+            src="https://www.mingjianlims.com/word/web-apps/apps/api/documents/api.js"></script>
+          <style>
+            html,
+            body,
+            #app {
+              height: 100%;
+              margin: 0;
+              padding: 0
+            }
+
+            .ibps-home {
+              background-color: #303133;
+              height: 100%;
+              display: flex;
+              flex-direction: column
+            }
+
+            .ibps-home__main {
+              user-select: none;
+              width: 100%;
+              flex-grow: 1;
+              display: flex;
+              justify-content: center;
+              align-items: center;
+              flex-direction: column
+            }
+
+            .ibps-home__footer {
+              width: 100%;
+              flex-grow: 0;
+              text-align: center;
+              padding: 1em 0
+            }
+
+            .ibps-home__footer>a {
+              font-size: 12px;
+              color: #ababab;
+              text-decoration: none
+            }
+
+            .ibps-home__loading {
+              height: 30px;
+              width: 30px;
+              margin-bottom: 10px
+            }
+
+            .ibps-home__title {
+              color: #FFF;
+              font-size: 14px;
+              margin-bottom: 20px
+            }
+
+            .ibps-home__sub-title {
+              color: #ababab;
+              font-size: 12px
+            }
+
+            [data-loader='circle-side'] {
+              position: relative;
+              width: 25px;
+              height: 25px;
+              -webkit-animation: circle infinite .75s linear;
+              -moz-animation: circle infinite .75s linear;
+              -o-animation: circle infinite .75s linear;
+              animation: circle infinite .75s linear;
+              border: 2px solid #fff;
+              border-top-color: rgba(0, 0, 0, .2);
+              border-right-color: rgba(0, 0, 0, .2);
+              border-bottom-color: rgba(0, 0, 0, .2);
+              border-radius: 100%
+            }
+
+            @-webkit-keyframes circle {
+              0% {
+                -webkit-transform: rotate(0);
+                -ms-transform: rotate(0);
+                -o-transform: rotate(0);
+                transform: rotate(0)
+              }
+
+              100% {
+                -webkit-transform: rotate(360deg);
+                -ms-transform: rotate(360deg);
+                -o-transform: rotate(360deg);
+                transform: rotate(360deg)
+              }
+            }
+
+            @-moz-keyframes circle {
+              0% {
+                -webkit-transform: rotate(0);
+                -ms-transform: rotate(0);
+                -o-transform: rotate(0);
+                transform: rotate(0)
+              }
+
+              100% {
+                -webkit-transform: rotate(360deg);
+                -ms-transform: rotate(360deg);
+                -o-transform: rotate(360deg);
+                transform: rotate(360deg)
+              }
+            }
+
+            @-o-keyframes circle {
+              0% {
+                -webkit-transform: rotate(0);
+                -ms-transform: rotate(0);
+                -o-transform: rotate(0);
+                transform: rotate(0)
+              }
+
+              100% {
+                -webkit-transform: rotate(360deg);
+                -ms-transform: rotate(360deg);
+                -o-transform: rotate(360deg);
+                transform: rotate(360deg)
+              }
+            }
+
+            @keyframes circle {
+              0% {
+                -webkit-transform: rotate(0);
+                -ms-transform: rotate(0);
+                -o-transform: rotate(0);
+                transform: rotate(0)
+              }
+
+              100% {
+                -webkit-transform: rotate(360deg);
+                -ms-transform: rotate(360deg);
+                -o-transform: rotate(360deg);
+                transform: rotate(360deg)
+              }
+            }
+          </style>
+</head>
+
+<body>
+  <noscript>
+    <strong>
+      敬请期待
+    </strong>
+  </noscript>
+  <div id="app">
+    <div class="ibps-home">
+      <div class="ibps-home__main">
+        <div class="ibps-home__loading">
+          <div data-loader="circle-side"></div>
+        </div>
+        <div class="ibps-home__title">正在加载资源
         </div>
+        <div class="ibps-home__sub-title">初次加载资源可能需要较多时间 请耐心等待</div>
+      </div>
+      <div class="ibps-home__footer">
+        <span target="_blank">
+          2020©深圳市金源信通科技有限公司©版权所有
+        </span>
+      </div>
     </div>
-    <!-- 使用 CDN 加速的 JS 文件,配置在 vue.config.js 下 -->
-    <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %>
-      <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
-      <% } %>
-     <!-- built files will be auto injected -->
-  </body>
-</html>
+  </div>
+  <!-- 使用 CDN 加速的 JS 文件,配置在 vue.config.js 下 -->
+  <% for (var i in htmlWebpackPlugin.options.cdn&&htmlWebpackPlugin.options.cdn.js) { %>
+    <script src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
+    <% } %>
+      <!-- built files will be auto injected -->
+</body>
+
+</html>

+ 6 - 3
src/business/platform/bpmn/components/approval-opinion/index.vue

@@ -168,7 +168,7 @@ export default {
        watchKey:false,
        inputKey:"",
        dict_add:false,
-       data: '同意'
+       data: ''
     }
   },
   filters: { //定义过滤器
@@ -186,8 +186,11 @@ export default {
     },100)
   },
   watch: {
-    data(){
-      this.$emit('input', this.data)
+    data:{
+        handler(){
+          this.$emit('input', this.data)
+        },
+        immediate: true
     },
     value: {
       handler(val, oldVal) {

+ 17 - 17
src/plugins/ibps/index.js

@@ -54,26 +54,26 @@ export default {
     Vue.prototype.$buildTime = env.VUE_APP_BUILD_TIME
 
     Vue.prototype.$ibpsUrl = env.VUE_APP_BASE_API_0_0_TEST
-	/* 中汇瑞德检测中心 */
-	let downloadReport = (src,where)=> {
-		return  'https://www.mingjianlims.com/demo/reportServlet?action=6&file='+encodeURIComponent(src)+'.rpx&columns=0&srcType=file&paramString='+encodeURIComponent(where)
-	}
+    /* 中汇瑞德检测中心 */
+    let downloadReport = (src, where) => {
+      return 'https://www.mingjianlims.com/demo/reportServlet?action=6&file=' + encodeURIComponent(src) + '.rpx&columns=0&srcType=file&paramString=' + encodeURIComponent(where)
+    }
     let timer = setInterval(() => { //定时循环添加参数
-          if (getToken()) {
-              Vue.prototype.$reportPash = 'https://www.mingjianlims.com/demo/reportJsp/showReport.jsp?access_token = '+getToken()+'&rpx=中汇瑞德检测中心/' //报表路径
-              Vue.prototype.$getReportFile = downloadReport //通过方法函数,拼接url,并将字符串格式化
-              // Vue.prototype.$getSealUri = 'https://www.mingjianlims.com/getSealFile/' //微签 回显获取文件地址
-              Vue.prototype.$getSealUri = 'http://139.159.229.35:9999/no/getSealFile/' //微签 回显获取文件地址
-              Vue.prototype.$getFileDow = 'https://www.mingjianlims.com/ibps/platform/v3/file/download?attachmentId=' //文件下载地址
-              Vue.prototype.$getSealUploadingFile='https://www.mingjianlims.com/doSeal/' //微签 上传地址
-              Vue.prototype.$getSealPreFile = 'https://www.mingjianlims.com/preprocess/' //微签 手动签章-预处理
-              // Vue.prototype.$getSealPageFile = 'https://www.mingjianlims.com/manualSigPage/' //微签 手动签章-页面接口
-              Vue.prototype.$getSealPageFile = 'http://139.159.229.35:9999/manualSig/manualSigPage/' //微签 手动签章-页面接口( 微签服务器地址,非nginx转发)
-           clearInterval(timer) //添加成功后即删除定时任务
-            }
+      if (getToken()) {
+        Vue.prototype.$reportPash = 'https://www.mingjianlims.com/demo/reportJsp/showReport.jsp?access_token = ' + getToken() + '&rpx=中汇瑞德检测中心/' //报表路径
+        Vue.prototype.$getReportFile = downloadReport //通过方法函数,拼接url,并将字符串格式化
+        // Vue.prototype.$getSealUri = 'https://www.mingjianlims.com/getSealFile/' //微签 回显获取文件地址
+        Vue.prototype.$getSealUri = 'http://139.159.229.35:9999/no/getSealFile/' //微签 回显获取文件地址
+        Vue.prototype.$getFileDow = 'https://www.mingjianlims.com/ibps/platform/v3/file/download?attachmentId=' //文件下载地址
+        Vue.prototype.$getSealUploadingFile = 'https://www.mingjianlims.com/doSeal/' //微签 上传地址
+        Vue.prototype.$getSealPreFile = 'https://www.mingjianlims.com/preprocess/' //微签 手动签章-预处理
+        // Vue.prototype.$getSealPageFile = 'https://www.mingjianlims.com/manualSigPage/' //微签 手动签章-页面接口
+        Vue.prototype.$getSealPageFile = 'http://139.159.229.35:9999/manualSig/manualSigPage/' //微签 手动签章-页面接口( 微签服务器地址,非nginx转发)
+        clearInterval(timer) //添加成功后即删除定时任务
+      }
     }, 500)
 
-	// 获得用户设置的全局尺寸
+    // 获得用户设置的全局尺寸
     const size = await store.dispatch('ibps/db/get', {
       dbName: 'sys',
       path: 'size.value',

+ 3 - 3
src/views/platform/data/dataTemplate/template-list.vue

@@ -71,9 +71,9 @@ export default {
       immediate: true
     } */
    },
-  // created(){
-  //   this.loadDataTemplate()
-  // },
+  created(){
+    this.loadDataTemplate()
+  },
   methods: {
     loadDataTemplate() {
       const loading = this.$loading({

+ 16 - 44
src/views/system/login/page.vue

@@ -1,58 +1,32 @@
 <template>
     <div class="jbd-login-page-bg">
-        <div class="official">
-            <a href="https://www.mingjiantech.com" target="_blank">官网首页</a>
-        </div>
         <el-container class="login-container" @keyup.enter="handleLogin">
+            <div class="official">
+                <a href="https://www.mingjiantech.com" target="_blank">官网首页</a>
+            </div>
             <!-- <el-header style="width: 100%">
              <div style="width: 100%; height: 93px; text-align: center; position: relative; top: 10%; overflow: hidden">
                 <h1 class="login-info-title" style="font-size: 40px; color: #a73a3a">明鉴实验室信息管理系统</h1>
             </div>
         </el-header> -->
 
-            <el-main
-                style="width: 80%; height: 100%; overflow: hidden; border: 0px"
-            >
+            <el-main style="width: 80%; height: 100%; overflow: hidden; border: 0px">
                 <div class="login-border">
                     <!--                <div class="animated fadeIn jbd-login-page-main-img"></div> -->
 
                     <div class="login-main animated fadeIn jbd-login-page-main">
                         <!-- <h3> -->
                         <!-- <span>{{ $t('login.userLogin') }}</span> -->
-                        <div
-                            class="logo-box"
-                            style="width: 100%; margin: -0.0625rem"
-                        >
+                        <div class="logo-box" style="width: 100%; margin: -0.0625rem">
                             <p>
-                                <img
-                                    src="../../../assets/images/login/bg.png"
-                                    style="
-                                        height: 80px;
-                                        width: 387px;
-                                        background-size: 100% 100%;
-                                    "
-                                />
-                            </p>
-                            <p class="txt">
-                                欢迎登陆·明鉴细胞检测实验室信息管理系统
+                                <img src="../../../assets/images/login/bg.png" style="height: 80px; width: 387px; background-size: 100% 100%" />
                             </p>
+                            <p class="txt">欢迎登录·明鉴细胞检测实验室信息管理系统</p>
                         </div>
-                        <ibps-api-base-url-controller
-                            v-if="$nodeEnv === 'development'"
-                        >
-                            <el-tooltip
-                                effect="dark"
-                                :content="$t('navbar.switchEnvironment')"
-                                placement="bottom"
-                            >
-                                <el-button
-                                    type="text"
-                                    class="ibps-fr ibps-mr-5 btn-text can-hover"
-                                >
-                                    <ibps-icon
-                                        name="wifi"
-                                        style="font-size: 18px"
-                                    />
+                        <ibps-api-base-url-controller v-if="$nodeEnv === 'development'">
+                            <el-tooltip effect="dark" :content="$t('navbar.switchEnvironment')" placement="bottom">
+                                <el-button type="text" class="ibps-fr ibps-mr-5 btn-text can-hover">
+                                    <ibps-icon name="wifi" style="font-size: 18px" />
                                 </el-button>
                             </el-tooltip>
                         </ibps-api-base-url-controller>
@@ -75,13 +49,8 @@
                         </p> -->
                     <hr />
                     <span style="display: flex; justify-content: space-between">
-                        <a
-                            ><i class="el-icon-s-platform" />
-                            深圳市金源信通科技有限公司开发</a
-                        >
-                        <a href="https://beian.miit.gov.cn" target="_blank"
-                            >粤ICP备2022077950号</a
-                        >
+                        <a><i class="el-icon-s-platform" /> 深圳市金源信通科技有限公司开发</a>
+                        <a href="https://beian.miit.gov.cn" target="_blank">粤ICP备2022077950号</a>
                         <a></a>
                         <!-- <a
                             href="https://www.mingjiantech.com"
@@ -206,6 +175,9 @@ export default {
     margin-left: 10px;
     font-size: 26px;
     font-weight: bold;
+    position: absolute;
+    left: 0;
+    top: 0;
     a {
         // color: #8c92a4;
         color: black;

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff