Jelajahi Sumber

添加value判断各模块显示与否

Luolei 5 tahun lalu
induk
melakukan
bf56d2648e
3 mengubah file dengan 7 tambahan dan 20 penghapusan
  1. 0 14
      app.js
  2. 2 2
      build/webpack.dev.conf.js
  3. 5 4
      src/utils/tools.js

+ 0 - 14
app.js

@@ -1,14 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const express = require('express');
-const chalk = require('chalk')
-const app = express();
-app.use(express.static(path.resolve(__dirname, './')))
-
-app.get('*', function(req, res) {
-  const html = fs.readFileSync(path.resolve(__dirname, './index.html'), 'utf-8')
-  res.send(html)
-})
-app.listen(5080, res => {
-  console.log(chalk.yellow('Start Service On 5080'));
-});

+ 2 - 2
build/webpack.dev.conf.js

@@ -33,8 +33,8 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     // host: HOST || config.dev.host,
-    host: '192.168.3.6',
-    // host: '192.168.3.126',
+    // host: '192.168.3.6',
+    host: '192.168.3.126',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

+ 5 - 4
src/utils/tools.js

@@ -134,15 +134,16 @@ const moduleConfig = (config,modules) => {
   let activeModule = []
   for(let i = 0;i < config.length;i++){
     let tmpCode = config[i].code
+    let tmpVal = config[i].value
     for(let j = 0;j < modules.length;j++){
       let tmpType = modules[j].type
-      if(tmpCode=="symptoms_show"&&tmpType==moduleCP['symp']){
+      if(tmpCode=="symptoms_show"&&tmpType==moduleCP['symp']&&tmpVal==1){
         activeModule.push(modules[j])
-      }else if(tmpCode=="diagnosis_show"&&tmpType==moduleCP['diagT']){
+      }else if(tmpCode=="diagnosis_show"&&tmpType==moduleCP['diagT']&&tmpVal==1){
         activeModule.push(modules[j])
-      }else if(tmpCode=="omhistory_show"&&tmpType==moduleCP['other']){
+      }else if(tmpCode=="omhistory_show"&&tmpType==moduleCP['other']&&tmpVal==1){
         activeModule.push(modules[j])
-      }else if(tmpCode=="replenish_show"&&tmpType==moduleCP['suplement']){
+      }else if(tmpCode=="replenish_show"&&tmpType==moduleCP['suplement']&&tmpVal==1){
         activeModule.push(modules[j])
       }
     }