合并代码并更改环境

Squashed commit of the following:

commit bf08847a4f5104bdcd0c4facbdd619724f4c3060
Author: liucf <liucf@zjlantone.com>
Date:   Wed Jul 10 15:36:17 2019 +0800

    合并development分支

commit 7b4d2b7b39905403b1d2291a82a5cc534a096dc9
Merge: 39113f2 528de93
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 9 19:32:53 2019 +0800

    Merge branch 'development' into byll

commit 39113f251e86e6a2fd2f32ac158a916d8731a1a8
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 9 19:20:36 2019 +0800

    README.md

commit cbdf8d48f24b5bb3cb0779c024e9889377730190
Author: Luolei <16657115156@163.com>
Date:   Tue Jul 9 19:13:20 2019 +0800

    环境切换

commit 528de93f2e75bf3746f4c3ea6b77db95cd6284bf
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jul 8 20:32:12 2019 +0800

    多选数据处理及诊疗

commit ef957e1efb30367dc50ed54ebd75d006c2095d59
Author: liucf <liucf@zjlantone.com>
Date:   Mon Jul 8 14:34:17 2019 +0800

    test build

commit 379f8dd0adbc97944ab2fdc49bbccd2e319b19fe
Author: liucf <liucf@zjlantone.com>
Date:   Sat Jul 6 17:38:52 2019 +0800

    合并dev
    Squashed commit of the following:

    commit 6c1978b3cf95d01b6979fc8d2e558db73ea6699c
    Merge: 2817f6f 29702b2
    Author: Luolei <16657115156@163.com>
    Date:   Sat Jul 6 13:51:22 2019 +0800

        Merge branch 'development' into dev

    commit 2817f6fe89bbc72b5b85f996b054ae959a6d715c
    Author: Luolei <16657115156@163.com>
    Date:   Sat Jul 6 13:26:30 2019 +0800

        改回配置

    commit 99fd5c92c83ff78da644fceb2e73d9646d63eaad
    Author: Luolei <16657115156@163.com>
    Date:   Fri Jul 5 17:10:57 2019 +0800

        多列填写，预览

    commit 54aa3aad2d6163449bff54abd5fbee53f8010941
    Merge: 9b50ae5 ea78834
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jul 3 20:22:00 2019 +0800

        Merge remote-tracking branch 'remotes/origin/development' into dev

    commit 9b50ae5cf4fb61577133d0ff0f0470f86c3da87d
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jul 3 19:43:27 2019 +0800

        新增文本域组件

    commit c49d6a90ceb0a9f4166b1bb787c8b36171d6db41
    Author: Luolei <16657115156@163.com>
    Date:   Wed Jul 3 09:56:18 2019 +0800

        添加补充内容页面

    commit db3d558cc2e8292c65bb8e460a206c40b44e4f75
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue Jul 2 11:38:56 2019 +0800

        Squashed commit of the following:

        commit abb05f77689576a0834513d2a21f5f05b321e495
        Author: liucf <liucf@zjlantone.com>
        Date:   Tue Jul 2 11:36:51 2019 +0800

            增加图片

        commit 1a3e1b96d9dfd09cf7c9b5d05001db5a12cc2ac4
        Author: liucf <liucf@zjlantone.com>
        Date:   Mon Jul 1 20:44:08 2019 +0800

            新增弹窗，单选，多选，待完善

        commit 565f06729383a7df1bfde511faacb5979432a7da
        Author: liucf <liucf@zjlantone.com>
        Date:   Fri Jun 28 17:36:42 2019 +0800

            患者信息页完成

commit 41fb3a249052d8beac52da5923b5718a6a758d3d
Author: liucf <liucf@zjlantone.com>
Date:   Sat Jul 6 17:33:09 2019 +0800

    症状情况数据处理

.babelrc

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    ["env", {
+      "modules": false,
+      "targets": {
+        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
+      }
+    }],
+    "stage-2"
+  ],
+  "plugins": ["transform-vue-jsx", "transform-runtime"]
+}

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.eslintignore

@@ -0,0 +1,4 @@
+/build/
+/config/
+/dist/
+/*.js

.eslintrc.js

@@ -0,0 +1,29 @@
+// https://eslint.org/docs/user-guide/configuring
+
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  env: {
+    browser: true,
+  },
+  extends: [
+    // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
+    // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
+    'plugin:vue/essential', 
+    // https://github.com/standard/standard/blob/master/docs/RULES-en.md
+    'standard'
+  ],
+  // required to lint *.vue files
+  plugins: [
+    'vue'
+  ],
+  // add your custom rules here
+  rules: {
+    // allow async-await
+    'generator-star-spacing': 'off',
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+  }
+}

.gitignore

@@ -1,32 +1,14 @@
-# Logs
-logs
-*.log
+.DS_Store
+node_modules/
+/dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-icssfront.iml
-package-lock.json
-yarn.lock
-*-bak.*
 
-# Dependency directories
-node_modules/
-package-lock.json
-# Optional eslint cache
-.eslintcache
-/.DS_Store
-dist/
-dist
+# Editor directories and files
 .idea
-
 .vscode
-/.idea
-/dist
-
-
-# node
-app/
-app/package-lock.json
-app/yarn.lock
-app/logs
-app/node_modules
+*.suo
+*.ntvs*
+*.njsproj
+*.sln

.postcssrc.js

@@ -0,0 +1,10 @@
+// https://github.com/michael-ciniawsky/postcss-load-config
+
+module.exports = {
+  "plugins": {
+    "postcss-import": {},
+    "postcss-url": {},
+    // to edit target browsers: use "browserslist" field in package.json
+    "autoprefixer": {}
+  }
+}

README.md

@@ -0,0 +1,21 @@
+# mobilediag
+
+> A Vue.js project
+
+## Build Setup
+
+``` bash
+# install dependencies
+npm install
+
+# serve with hot reload at localhost:8082
+npm run dev
+
+# build for production with minification
+npm run build
+
+# build for production and view the bundle analyzer report
+npm run build --report
+```
+
+For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

app.js

@@ -0,0 +1,14 @@
+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'));
+});

build/build.js

@@ -0,0 +1,41 @@
+'use strict'
+require('./check-versions')()
+
+process.env.NODE_ENV = 'production'
+
+const ora = require('ora')
+const rm = require('rimraf')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
+
+const spinner = ora('building for production...')
+spinner.start()
+
+rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
+  if (err) throw err
+  webpack(webpackConfig, (err, stats) => {
+    spinner.stop()
+    if (err) throw err
+    process.stdout.write(stats.toString({
+      colors: true,
+      modules: false,
+      children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
+      chunks: false,
+      chunkModules: false
+    }) + '\n\n')
+
+    if (stats.hasErrors()) {
+      console.log(chalk.red('  Build failed with errors.\n'))
+      process.exit(1)
+    }
+
+    console.log(chalk.cyan('  Build complete.\n'))
+    console.log(chalk.yellow(
+      '  Tip: built files are meant to be served over an HTTP server.\n' +
+      '  Opening index.html over file:// won\'t work.\n'
+    ))
+  })
+})

build/check-versions.js

@@ -0,0 +1,54 @@
+'use strict'
+const chalk = require('chalk')
+const semver = require('semver')
+const packageConfig = require('../package.json')
+const shell = require('shelljs')
+
+function exec (cmd) {
+  return require('child_process').execSync(cmd).toString().trim()
+}
+
+const versionRequirements = [
+  {
+    name: 'node',
+    currentVersion: semver.clean(process.version),
+    versionRequirement: packageConfig.engines.node
+  }
+]
+
+if (shell.which('npm')) {
+  versionRequirements.push({
+    name: 'npm',
+    currentVersion: exec('npm --version'),
+    versionRequirement: packageConfig.engines.npm
+  })
+}
+
+module.exports = function () {
+  const warnings = []
+
+  for (let i = 0; i < versionRequirements.length; i++) {
+    const mod = versionRequirements[i]
+
+    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
+      warnings.push(mod.name + ': ' +
+        chalk.red(mod.currentVersion) + ' should be ' +
+        chalk.green(mod.versionRequirement)
+      )
+    }
+  }
+
+  if (warnings.length) {
+    console.log('')
+    console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    console.log()
+
+    for (let i = 0; i < warnings.length; i++) {
+      const warning = warnings[i]
+      console.log('  ' + warning)
+    }
+
+    console.log()
+    process.exit(1)
+  }
+}

build/utils.js

@@ -0,0 +1,102 @@
+'use strict'
+const path = require('path')
+const config = require('../config')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const packageConfig = require('../package.json')
+
+exports.assetsPath = function (_path) {
+  const assetsSubDirectory = process.env.NODE_ENV === 'production'
+    ? config.build.assetsSubDirectory
+    : config.dev.assetsSubDirectory
+
+  return path.posix.join(assetsSubDirectory, _path)
+}
+
+exports.cssLoaders = function (options) {
+  options = options || {}
+
+  const cssLoader = {
+    loader: 'css-loader',
+    options: {
+      sourceMap: options.sourceMap
+    }
+  }
+
+  const postcssLoader = {
+    loader: 'postcss-loader',
+    options: {
+      sourceMap: options.sourceMap
+    }
+  }
+
+  // generate loader string to be used with extract text plugin
+  function generateLoaders (loader, loaderOptions) {
+    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+
+    if (loader) {
+      loaders.push({
+        loader: loader + '-loader',
+        options: Object.assign({}, loaderOptions, {
+          sourceMap: options.sourceMap
+        })
+      })
+    }
+
+    // Extract CSS when that option is specified
+    // (which is the case during production build)
+    if (options.extract) {
+      return ExtractTextPlugin.extract({
+        use: loaders,
+        fallback: 'vue-style-loader',
+        publicPath:'../../'             //配置背景图片地址
+      })
+    } else {
+      return ['vue-style-loader'].concat(loaders)
+    }
+  }
+
+  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
+  return {
+    css: generateLoaders(),
+    postcss: generateLoaders(),
+    less: generateLoaders('less'),
+    sass: generateLoaders('sass', { indentedSyntax: true }),
+    scss: generateLoaders('sass'),
+    stylus: generateLoaders('stylus'),
+    styl: generateLoaders('stylus')
+  }
+}
+
+// Generate loaders for standalone style files (outside of .vue)
+exports.styleLoaders = function (options) {
+  const output = []
+  const loaders = exports.cssLoaders(options)
+
+  for (const extension in loaders) {
+    const loader = loaders[extension]
+    output.push({
+      test: new RegExp('\\.' + extension + '$'),
+      use: loader
+    })
+  }
+
+  return output
+}
+
+exports.createNotifierCallback = () => {
+  const notifier = require('node-notifier')
+
+  return (severity, errors) => {
+    if (severity !== 'error') return
+
+    const error = errors[0]
+    const filename = error.file && error.file.split('!').pop()
+
+    notifier.notify({
+      title: packageConfig.name,
+      message: severity + ': ' + error.name,
+      subtitle: filename || '',
+      icon: path.join(__dirname, 'logo.png')
+    })
+  }
+}

build/vue-loader.conf.js

@@ -0,0 +1,22 @@
+'use strict'
+const utils = require('./utils')
+const config = require('../config')
+const isProduction = process.env.NODE_ENV === 'production'
+const sourceMapEnabled = isProduction
+  ? config.build.productionSourceMap
+  : config.dev.cssSourceMap
+
+module.exports = {
+  loaders: utils.cssLoaders({
+    sourceMap: sourceMapEnabled,
+    extract: isProduction
+  }),
+  cssSourceMap: sourceMapEnabled,
+  cacheBusting: config.dev.cacheBusting,
+  transformToRequire: {
+    video: ['src', 'poster'],
+    source: 'src',
+    img: 'src',
+    image: 'xlink:href'
+  }
+}

build/webpack.base.conf.js

@@ -0,0 +1,87 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const config = require('../config')
+const vueLoaderConfig = require('./vue-loader.conf')
+
+function resolve (dir) {
+  return path.join(__dirname, '..', dir)
+}
+
+
+
+module.exports = {
+  context: path.resolve(__dirname, '../'),
+  entry:["babel-polyfill", "./src/main.js"],
+  output: {
+    path: config.build.assetsRoot,
+    filename: '[name].js',
+    publicPath: process.env.NODE_ENV === 'production'
+      ? config.build.assetsPublicPath
+      : config.dev.assetsPublicPath
+  },
+  resolve: {
+    extensions: ['.js', '.vue', '.json'],
+    alias: {
+      'vue$': 'vue/dist/vue.esm.js',
+      '@': resolve('src'),
+      '@components':resolve('./src/components'),
+      '@less':resolve('./src/less'),
+      '@utils':resolve('./src/utils')
+    }
+  },
+  module: {
+    rules: [
+      {
+        test: /\.vue$/,
+        loader: 'vue-loader',
+        options: vueLoaderConfig
+      },
+      /*{
+        test: /\.less$/,
+        loader: "style-loader!css-loader!less-loader",
+      },*/
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
+      },
+      {
+        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('img/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('media/[name].[hash:7].[ext]')
+        }
+      },
+      {
+        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+        loader: 'url-loader',
+        options: {
+          limit: 10000,
+          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+        }
+      }
+    ]
+  },
+  node: {
+    // prevent webpack from injecting useless setImmediate polyfill because Vue
+    // source contains it (although only uses it if it's native).
+    setImmediate: false,
+    // prevent webpack from injecting mocks to Node native modules
+    // that does not make sense for the client
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty'
+  }
+}

build/webpack.dev.conf.js

@@ -0,0 +1,96 @@
+'use strict'
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const path = require('path')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const portfinder = require('portfinder')
+
+const HOST = process.env.HOST
+const PORT = process.env.PORT && Number(process.env.PORT)
+
+const devWebpackConfig = merge(baseWebpackConfig, {
+  module: {
+    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+  },
+  // cheap-module-eval-source-map is faster for development
+  devtool: config.dev.devtool,
+
+  // these devServer options should be customized in /config/index.js
+  devServer: {
+    clientLogLevel: 'warning',
+    historyApiFallback: {
+      rewrites: [
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
+      ],
+    },
+    hot: true,
+    openPage:'?hospitalCode=A001&hospitalDeptCode=D01&doctorCode=YS001&patientCode=1600&recordId=44',//携带参数
+    contentBase: false, // since we use CopyWebpackPlugin.
+    compress: true,
+    host: HOST || config.dev.host,
+    port: PORT || config.dev.port,
+    open: config.dev.autoOpenBrowser,
+    overlay: config.dev.errorOverlay
+      ? { warnings: false, errors: true }
+      : false,
+    publicPath: config.dev.assetsPublicPath,
+    proxy: config.dev.proxyTable,
+    quiet: true, // necessary for FriendlyErrorsPlugin
+    watchOptions: {
+      poll: config.dev.poll,
+    }
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': require('../config/dev.env')
+    }),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
+    new webpack.NoEmitOnErrorsPlugin(),
+    // https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      template: 'index.html',
+      inject: true
+    }),
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.dev.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
+  ]
+})
+
+module.exports = new Promise((resolve, reject) => {
+  portfinder.basePort = process.env.PORT || config.dev.port
+  portfinder.getPort((err, port) => {
+    if (err) {
+      reject(err)
+    } else {
+      // publish the new Port, necessary for e2e tests
+      process.env.PORT = port
+      // add port to devServer config
+      devWebpackConfig.devServer.port = port
+
+      // Add FriendlyErrorsPlugin
+      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
+        compilationSuccessInfo: {
+          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
+        },
+        onErrors: config.dev.notifyOnErrors
+        ? utils.createNotifierCallback()
+        : undefined
+      }))
+
+      resolve(devWebpackConfig)
+    }
+  })
+})

build/webpack.prod.conf.js

@@ -0,0 +1,145 @@
+'use strict'
+const path = require('path')
+const utils = require('./utils')
+const webpack = require('webpack')
+const config = require('../config')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+const ExtractTextPlugin = require('extract-text-webpack-plugin')
+const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+
+const env = require('../config/prod.env')
+
+const webpackConfig = merge(baseWebpackConfig, {
+  module: {
+    rules: utils.styleLoaders({
+      sourceMap: config.build.productionSourceMap,
+      extract: true,
+      usePostCSS: true
+    })
+  },
+  devtool: config.build.productionSourceMap ? config.build.devtool : false,
+  output: {
+    path: config.build.assetsRoot,
+    filename: utils.assetsPath('js/[name].[chunkhash].js'),
+    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+  },
+  plugins: [
+    // http://vuejs.github.io/vue-loader/en/workflow/production.html
+    new webpack.DefinePlugin({
+      'process.env': env
+    }),
+    new UglifyJsPlugin({
+      uglifyOptions: {
+        compress: {
+          warnings: false
+        }
+      },
+      sourceMap: config.build.productionSourceMap,
+      parallel: true
+    }),
+    // extract css into its own file
+    new ExtractTextPlugin({
+      filename: utils.assetsPath('css/[name].[contenthash].css'),
+      // Setting the following option to `false` will not extract CSS from codesplit chunks.
+      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
+      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
+      allChunks: true,
+    }),
+    // Compress extracted CSS. We are using this plugin so that possible
+    // duplicated CSS from different components can be deduped.
+    new OptimizeCSSPlugin({
+      cssProcessorOptions: config.build.productionSourceMap
+        ? { safe: true, map: { inline: false } }
+        : { safe: true }
+    }),
+    // generate dist index.html with correct asset hash for caching.
+    // you can customize output by editing /index.html
+    // see https://github.com/ampedandwired/html-webpack-plugin
+    new HtmlWebpackPlugin({
+      filename: config.build.index,
+      template: 'index.html',
+      inject: true,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeAttributeQuotes: true
+        // more options:
+        // https://github.com/kangax/html-minifier#options-quick-reference
+      },
+      // necessary to consistently work with multiple chunks via CommonsChunkPlugin
+      chunksSortMode: 'dependency'
+    }),
+    // keep module.id stable when vendor modules does not change
+    new webpack.HashedModuleIdsPlugin(),
+    // enable scope hoisting
+    new webpack.optimize.ModuleConcatenationPlugin(),
+    // split vendor js into its own file
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'vendor',
+      minChunks (module) {
+        // any required modules inside node_modules are extracted to vendor
+        return (
+          module.resource &&
+          /\.js$/.test(module.resource) &&
+          module.resource.indexOf(
+            path.join(__dirname, '../node_modules')
+          ) === 0
+        )
+      }
+    }),
+    // extract webpack runtime and module manifest to its own file in order to
+    // prevent vendor hash from being updated whenever app bundle is updated
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'manifest',
+      minChunks: Infinity
+    }),
+    // This instance extracts shared chunks from code splitted chunks and bundles them
+    // in a separate chunk, similar to the vendor chunk
+    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
+    new webpack.optimize.CommonsChunkPlugin({
+      name: 'app',
+      async: 'vendor-async',
+      children: true,
+      minChunks: 3
+    }),
+
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.build.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
+  ]
+})
+
+if (config.build.productionGzip) {
+  const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+  webpackConfig.plugins.push(
+    new CompressionWebpackPlugin({
+      asset: '[path].gz[query]',
+      algorithm: 'gzip',
+      test: new RegExp(
+        '\\.(' +
+        config.build.productionGzipExtensions.join('|') +
+        ')$'
+      ),
+      threshold: 10240,
+      minRatio: 0.8
+    })
+  )
+}
+
+if (config.build.bundleAnalyzerReport) {
+  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
+  webpackConfig.plugins.push(new BundleAnalyzerPlugin())
+}
+
+module.exports = webpackConfig

config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  host:'http://192.168.2.236:5050',      //后台接口地址
-};

config/dev.env.js

@@ -0,0 +1,7 @@
+'use strict'
+const merge = require('webpack-merge')
+const prodEnv = require('./prod.env')
+
+module.exports = merge(prodEnv, {
+  NODE_ENV: '"development"'
+})

config/index.js

@@ -0,0 +1,77 @@
+'use strict'
+// Template version: 1.3.1
+// see http://vuejs-templates.github.io/webpack for documentation.
+
+const path = require('path')
+// const proxy_path = 'http://192.168.2.236:80';
+const proxy_path = 'http://192.168.2.236:5050';
+
+module.exports = {
+  dev: {
+    // Paths
+    assetsSubDirectory: 'static',
+    assetsPublicPath: '/',
+    proxyTable: {
+      '/api': {
+        target: proxy_path,
+        changeOrigin: true,
+        secure: false
+      }
+    },
+
+    // Various Dev Server settings
+    host: 'localhost', // can be overwritten by process.env.HOST
+    // host: '192.168.3.126', // can be overwritten by process.env.HOST
+    port: 8082, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    autoOpenBrowser: true,
+    errorOverlay: true,
+    notifyOnErrors: true,
+    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
+
+
+    /**
+     * Source Maps
+     */
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'cheap-module-eval-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    cssSourceMap: true
+  },
+
+  build: {
+    // Template for index.html
+    index: path.resolve(__dirname, '../dist/index.html'),
+
+    // Paths
+    assetsRoot: path.resolve(__dirname, '../dist'),
+    assetsSubDirectory: 'static',
+    assetsPublicPath: './',
+
+    /**
+     * Source Maps
+     */
+
+    productionSourceMap: false,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: '#source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+}

config/prod.env.js

@@ -0,0 +1,4 @@
+'use strict'
+module.exports = {
+  NODE_ENV: '"production"'
+}

package.json

@@ -1,60 +1,71 @@
 {
-  "name": "preliminary",
-  "sideEffects": false,
+  "name": "mobilediag",
   "version": "1.0.0",
-  "description": "移动端预诊h5",
-  "main": "index.js",
+  "description": "A Vue.js project",
+  "author": "Luolei <16657115156@163.com>",
+  "private": true,
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "webpack --config webpack.prod.js",
-    "watch": "webpack --watch",
-    "dev": "webpack-dev-server --open --config webpack.dev.js",
-    "server": "node server.js"
+    "dev": "webpack-dev-server --inline --hot --progress --config build/webpack.dev.conf.js",
+    "start": "npm run dev",
+    "build": "node build/build.js"
   },
-  "repository": {
-    "type": "git",
-    "url": "http://192.168.2.236:10080/zhouna/preliminary.git"
-  },
-  "author": "zhouna",
-  "license": "ISC",
   "dependencies": {
-    "axios": "^0.19.0",
-    "jquery": "^3.4.1",
-    "lodash": "^4.17.11",
-    "qs": "^6.7.0",
-    "vue": "^2.6.10",
+    "axios": "^0.18.0",
+    "babel-polyfill": "^6.26.0",
+    "better-scroll": "^1.13.2",
+    "fastclick": "^1.0.6",
+    "less": "^3.8.1",
+    "less-loader": "^4.1.0",
+    "lib-flexible": "^0.3.2",
+    "vue": "^2.5.2",
+    "vue-router": "^3.0.1",
     "vue-photo-preview": "^1.1.3",
     "vuex": "^3.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
-    "@vue/babel-preset-jsx": "^1.0.0",
-    "autoprefixer": "^9.6.0",
-    "babel-loader": "^8.0.6",
-    "clean-webpack-plugin": "^3.0.0",
-    "css-loader": "^3.0.0",
-    "express": "^4.17.1",
-    "file-loader": "^4.0.0",
-    "html-webpack-plugin": "^3.2.0",
-    "less": "^3.9.0",
-    "less-loader": "^5.0.0",
-    "mini-css-extract-plugin": "^0.7.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "postcss-loader": "^3.0.0",
-    "style-loader": "^0.23.1",
-    "terser-webpack-plugin": "^1.3.0",
-    "uglifyjs-webpack-plugin": "^2.1.3",
-    "vue-loader": "^15.7.0",
-    "vue-router": "^3.0.6",
-    "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.33.0",
-    "webpack-cli": "^3.3.4",
-    "webpack-dev-middleware": "^3.7.0",
-    "webpack-dev-server": "^3.7.1",
-    "webpack-merge": "^4.2.1",
-    "xml-loader": "^1.2.1"
-  }
+    "autoprefixer": "^7.1.2",
+    "babel-core": "^6.22.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-plugin-transform-vue-jsx": "^3.5.0",
+    "babel-preset-env": "^1.3.2",
+    "babel-preset-stage-2": "^6.22.0",
+    "chalk": "^2.0.1",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.0",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^1.1.4",
+    "friendly-errors-webpack-plugin": "^1.6.1",
+    "html-webpack-plugin": "^2.30.1",
+    "node-notifier": "^5.1.2",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
+    "ora": "^1.2.0",
+    "portfinder": "^1.0.13",
+    "postcss-import": "^11.0.0",
+    "postcss-loader": "^2.0.8",
+    "postcss-url": "^7.2.1",
+    "rimraf": "^2.6.0",
+    "semver": "^5.3.0",
+    "shelljs": "^0.7.6",
+    "uglifyjs-webpack-plugin": "^1.1.1",
+    "url-loader": "^0.5.8",
+    "vue-loader": "^13.3.0",
+    "vue-style-loader": "^3.0.1",
+    "vue-template-compiler": "^2.5.2",
+    "webpack": "^3.6.0",
+    "webpack-bundle-analyzer": "^2.9.0",
+    "webpack-dev-server": "^2.9.1",
+    "webpack-merge": "^4.1.0"
+  },
+  "engines": {
+    "node": ">= 6.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
 }

src/App.vue

@@ -4,9 +4,12 @@
     </div>
 </template>
 <script>
-  import '@/less/index.less';
   export default {
     name:'App'
   }
 </script>
+<style lang="less">
+  @import "./less/index.less";
+</style>
+
 

src/common/CheckBox.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="check-wrap" v-if="item">
-    <p class="quest">{{indx + '.' + item.name}}</p>
-    <img :src="item.url.replace('{imageUrlPrefix}',imgUrl)" v-if="item.url">
-    <p v-for="(it,index) in item.questionDetailList" class="list">
-      <img :src="checkId.includes(it.id)?check:defaultPic" @click="handleClick(it,index)">
-      <span :class="{'check':checkId.includes(it.id)}">{{it.name}}</span>
+    <img :src="datas.url.replace('{imageUrlPrefix}',imgUrl)" v-if="datas.url">
+    <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list" @click="handleClick(it,index)">
+      <img :src="it.select==1?check:defaultPic">
+      <span :class="{'check':it.select==1}">{{it.name}}</span>
     </p>
   </div>
 </template>
@@ -19,30 +18,35 @@ import checkIcon from '../images/check.png'
         imgUrl:tools.imageUrlPrefix,
         defaultPic:icon,
         check:checkIcon,
-        checkId:[]
+        datas:{},
+        checkTxt:[]
       }
     },
     props:['item','indx'],
+    created(){
+      this.datas = JSON.parse(JSON.stringify(this.item));
+    },
     methods:{
-      handleClick(it){
-        const id = it.id;
-        let ids = this.checkId;
-        if(ids.includes(id)){
-          this.checkId.splice(ids.indexOf(id),1);
+      handleClick(it,index){
+        const list = this.datas;
+        let data = list.questionDetailList&&list.questionDetailList.slice(0);
+        let value = "";
+        if(data[index].select){
+          data[index].select = 0;
+          this.checkTxt.splice(index,1);
         }else{
-          this.checkId.push(id);
+          data[index].select = 1;
+          this.checkTxt[index] = data[index].name;
         }
+        value = this.checkTxt.filter(item=>item).join('，');
+        const newData = Object.assign({},this.datas,{questionDetailList:data},{value:value})
+        this.$emit("updata",newData);
       }
     }
   }
 </script>
 <style lang="less" scoped>
   .check-wrap{
-    font-size: .3rem;
-    .quest{
-      color:#000;
-      margin-bottom: .2rem;
-    }
     img{
       width:100%;
     }

src/common/ComTextArea.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="comArea">
-    <textarea @input="changeVal" :style={width:width,height:height} v-model="txt" placeholder="请输入"></textarea>
+    <textarea @input="changeVal" 
+            :style="{width:width,height:height}" 
+            v-model="txt" 
+            placeholder="请输入"
+            @blur="blur"></textarea>
   </div>
 </template>
 
@@ -16,15 +20,24 @@ export default {
       default: '2rem',
       type: String
     },
+    item:{
+      type:Object,
+      require: true
+    }
   },
   data() {
     return {
-      txt:''
+      txt:this.item.value || '' //回读用
+      // txt:'' 
     }
   },
   methods:{
     changeVal(){
       this.$emit('changeAreaVal',this.txt)
+    },
+    blur(){
+      const newData = Object.assign({},this.item,{value:this.txt});
+      this.$emit("updata",newData);
     }
   }
 }
@@ -32,6 +45,7 @@ export default {
 <style lang="less" scoped>
   .comArea {
     textarea {
+      color: #4F50FF;
       resize: none;
       box-shadow: none;
       font-size: 0.3rem;
@@ -40,6 +54,7 @@ export default {
       border-radius: .08rem /* 8/100 */;
       -webkit-appearance: none;
       padding: .16rem /* 16/100 */ .3rem /* 30/100 */;
+      margin-bottom: .3rem;
     }
   }
 </style>

src/common/Input.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="inp-wrap">
+    <input :type="item.controlType==6?'text':'number'" 
+          :class="{'change':borColor}" 
+          v-model="val" 
+          @input="changeVal" 
+          @blur="blur">
+  </div>
+</template>
+<script type="text/javascript">
+  export default {
+    name:'Input',
+    data(){
+      return{
+        msg:"输入框",
+        val:this.item.value || '',
+        borColor:false,
+      }
+    },
+    props:['item'],
+    methods:{
+      changeVal(){
+        this.borColor = true;
+      },
+      blur(){
+        this.borColor = false;
+        const newData = Object.assign({},this.item,{value:this.val});
+        this.$emit("updata",newData);
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .inp-wrap{
+    input{
+      width: 100%;
+      color: #4F50FF;
+      font-size: .3rem;
+      border-bottom: 1px solid #7C828E;
+      margin-bottom: .3rem;
+    }
+    .change{
+      border-color:  #4F50FF;
+    }
+  }
+</style>

src/common/Label.vue

@@ -0,0 +1,109 @@
+<template>
+  <div class="label-wrap" v-if="item">
+    <p class="quest">{{datas.name}}</p>
+    <span v-for="(it,index) in datas.questionMapping" :key="it.id" :class="['symp',{'check':it.select==1}]" @click="handleClick(it,index)">
+      <i>{{it.name}}</i>
+      <i v-if="it.select==1" @click="deletSymp($event,it,index)"><img src="../images/delete.png" alt=""></i>
+    </span>
+    <Toast :message="delText" 
+          :show="showToast"
+          @comfirn="comfirnDel" 
+          @cancel="cancelDel"/>
+  </div>
+</template>
+<script type="text/javascript">
+import Toast from '../common/Toast.vue';
+  export default{
+    name:'Label',
+    data(){
+      return{
+        datas:{},
+        checkTxt:[],
+        showToast:false,
+        delText:"是否取消当前选中内容？",
+        tempItem:{}
+      }
+    },
+    props:['item','indx','moduleType','ppId'],
+    created(){
+      this.datas = JSON.parse(JSON.stringify(this.item));
+    },
+    components:{
+      Toast
+    },
+    methods:{
+      handleClick(it,index){
+        // store更新数据
+        // this.$emit('updateOrig');
+        const newItem = Object.assign({},it,{select:1});
+        const origMapping = this.item.questionMapping;
+        let mapping = this.datas.questionMapping;
+        for(let i in origMapping){
+          if(origMapping[i].id==it.id){
+            mapping.splice(i,1,newItem)
+          }
+        }
+        // 存值到store
+        this.$store.commit('setOrigin',{type:this.moduleType,data:newItem,pId:this.datas.id});
+        this.$store.commit('setText',{type:this.moduleType,text:it.name,pId:it.id});
+        if(it.questionMapping&&it.questionMapping.length>0){//有明细
+          this.$emit("setDetail",{detail:it,ppId:this.ppId})
+        }
+      },
+      deletSymp(e,it,index){
+        e.stopPropagation();
+        this.showToast = true;
+        this.tempItem = it;
+      },
+      comfirnDel(){
+        const temp = this.tempItem;
+        const newItem = Object.assign({},temp,{select:0});
+        const origMapping = this.item.questionMapping;
+        let mapping = this.datas.questionMapping;
+        for(let i in origMapping){
+          if(origMapping[i].id==temp.id){
+            mapping.splice(i,1,newItem)
+          }
+        }
+        this.$store.commit('setOrigin',{type:this.moduleType,data:newItem,pId:this.datas.id});
+        this.$store.commit('delText',{type:this.moduleType,pId:temp.id});
+        this.cancelDel();
+      },
+      cancelDel(){
+        this.showToast = false;
+        this.tempItem = {};
+      }
+    }
+  }
+</script>
+<style lang="less" scoped>
+  .label-wrap{
+    font-size: .3rem;
+    .quest{
+      color: #000;
+      margin-bottom: .36rem;
+      font-weight: 700;
+    }
+    img{
+      width:.56rem;
+      height: .70rem;
+      vertical-align: top;
+      z-index: 22;
+    }
+    i{
+      display: inline-block;
+      vertical-align: top;
+    }
+    i:first-child{
+      min-width:1.34rem;
+      height: .72rem;
+      line-height: .72rem;
+      text-align: center;
+    }
+    .check{
+      color: #fff;
+      background: linear-gradient(-270deg, #4F4FFF, #4F8BFF);
+      box-shadow: 0 .08rem .16rem 0 rgba(79,129,255,0.40);
+    }
+  }
+</style>

src/common/Radio.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="radio-wrap" v-if="item">
-    <p class="quest">{{indx + '.' + item.name}}</p>
-    <img :src="item.url.replace('{imageUrlPrefix}',imgUrl)" v-if="item.url">
-    <p v-for="(it,index) in item.questionDetailList" :key="it.id" class="list">
-      <img :src="index==current||it.select==1?check:defaultPic" @click="handleClick(it,index)">
-      <!-- <img :src="it.select?check:defaultPic" @click="handleClick(it,index)"> -->
-      <span :class="{'check':index==current}">{{it.name}}</span>
+    <img :src="datas.url.replace('{imageUrlPrefix}',imgUrl)" v-if="datas.url">
+    <p v-for="(it,index) in datas.questionDetailList" :key="it.id" class="list" @click="handleClick(it,index)">
+      <img :src="it.select==1?check:defaultPic">
+      <span :class="{'check':it.select==1}">{{it.name}}</span>
     </p>
   </div>
 </template>
@@ -19,17 +17,17 @@ import {deepClone} from '@utils/tools.js'
       return{
         defaultPic:icon,
         check:checkIcon,
-        current:null,
         datas:{}
       }
     },
-    props:['item','indx','pId'],
+    props:['item','indx'],
+    created(){
+      this.datas = JSON.parse(JSON.stringify(this.item));
+    },
     methods:{
-      handleClick(it,index){console.log("单选：",this.item)
-        this.current = index;
-        const list = JSON.parse(JSON.stringify(this.item));
-        let data = list.questionDetailList.slice(0); //数组深拷贝？
-        // let data = deepClone(list);
+      handleClick(it,index){
+        const list = this.datas;
+        let data = list.questionDetailList&&list.questionDetailList.slice(0); //数组深拷贝？
         let value = "";
         for(let i=0;i<data.length; i++){
           data[i].select = 0
@@ -38,20 +36,14 @@ import {deepClone} from '@utils/tools.js'
             value = data[i].name;
           }
         }
-        const newData = Object.assign({},this.item,{questionDetailList:data},{value:value})
-        this.$store.commit('setDatas',{data:newData,pId:this.pId,type:"1"});
-        this.$store.commit('getUpdate'); //更新数据
+        const newData = Object.assign({},this.datas,{questionDetailList:data},{value:value})
+        this.$emit("updata",newData);
       }
     }
   }
 </script>
 <style lang="less" scoped>
   .radio-wrap{
-    font-size: .3rem;
-    .quest{
-      color:#000;
-      margin-bottom: .2rem;
-    }
     img{
       width:100%;
     }

src/common/Toast.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="toast-wrap" v-if="show">
     <div class="content">
-      <div class="text">
-        {{message||msg}}
+      <div class="text" v-html="message||msg">
+        <!-- {{message||msg}} -->
       </div>
       <div class="btn">
         <span @click="comfirn">确定</span>
@@ -49,8 +49,9 @@
       .text{
         color:#000;
         text-align: center;
-        height: 1.45rem;
+        height: 1.25rem;
         overflow-y: auto;
+        padding-top: .2rem;
       }
       .btn{
         margin-top: .20rem;

src/components/AddContent.vue

@@ -6,6 +6,7 @@
           <p class="question">{{idx+1 + '. ' +item.name}}</p>
           <ComTextArea
             v-if="item.controlType == 6"
+            :item="item"
             @changeAreaVal="changeAreaVal($event,idx)"
           ></ComTextArea>
           <template

src/components/Detail.vue

@@ -1,45 +1,85 @@
 <template>
   <div class="detail-wrap">
-    <div v-for="(item,index) in datas">
+    <!-- <div v-for="(item,index) in datas"> -->
+    <div v-for="(item,index) in checkDatas.questionMapping">
+      <p class="quest">{{index + 1 +'.' + item.name}}</p>
       <Radio v-if="item.controlType==1" 
             :item="item" 
-            :indx="index+1" 
-            :pId="id"
+            :indx="index+1"
             :key="item.id"
             @updata="updataData"/>
-      <CheckBox v-if="item.controlType==2" :item="item" :indx="index+1"/>
+      <CheckBox v-if="item.controlType==2" 
+            :item="item" 
+            :indx="index+1"
+            :key="item.id"
+            @updata="updataData"/>
+      <!-- 文本域 -->
+      <ComTextArea v-if="item.controlType == 5"
+            :item="item"
+            @updata="updataData"/>
       <!-- 输入框 -->
-      <div class="inp" v-if="item.controlType==6">
-        <p class="name">{{index+1+'.'+item.name}}</p>
-        <input type="" name="">
-      </div>
+      <Input v-if="item.controlType==6 || item.controlType==7"
+            :item="item"
+            :key="item.id"
+            @updata="updataData"/>
     </div>
   </div>
 </template>
 <script type="text/javascript">
 import Radio from '../common/Radio.vue';
 import CheckBox from '../common/CheckBox.vue';
+import Input from '../common/Input.vue';
+import ComTextArea from '../common/ComTextArea.vue';
+// 将获取到的数据源转换成私有数据，处理选择事件。点击完成后统一存到store中，便于回读
   export default {
     name:'Detail',
     data(){
       return{
-
+        checkDatas:{}
       }
     },
-    props:['datas','id'],
+    props:['datas','type','ppId'],
+    created(){
+      this.checkDatas = JSON.parse(JSON.stringify(this.datas));
+    },
     components:{
       Radio,
-      CheckBox
+      CheckBox,
+      Input,
+      ComTextArea
     },
     methods:{
       updataData(data){
-        // console.log("源数据：",this.datas,'更改后:',data)
+        const origMapping = this.datas.questionMapping;
+        let mapping = this.checkDatas.questionMapping;
+        for(let i in origMapping){
+          if(origMapping[i].id==data.id){
+            mapping.splice(i,1,data)
+          }
+        }
+      },
+      saveData(){//存值
+        const datas = this.checkDatas.questionMapping;
+        let text = "";
+        for(let i in datas){
+          if(datas[i].value){
+            text += datas[i].value+'，';
+          }
+        }
+        let msg = this.checkDatas.name+ '，' + text;console.log("完成:",this.checkDatas)
+        this.$store.commit('setDatas',{data:this.checkDatas,pId:this.checkDatas.id,type:this.type,ppId:this.ppId});
+        this.$store.commit('setText',{text:msg,pId:this.checkDatas.id,type:this.type});
       }
-    }
+    },
   }
 </script>
 <style lang="less" scoped>
   .detail-wrap{
     padding: .3rem .5rem .3rem .6rem;
+    font-size: .3rem;
+    .quest{
+      color:#000;
+      margin-bottom: .2rem;
+    }
   }
 </style>

src/components/DetailBox.vue

@@ -8,7 +8,7 @@
       <span>清空</span>
     </div>
     <div class="main">
-      <Detail :datas="privateData.questionMapping" :id="privateData.id"/>
+      <Detail :datas="privateData" ref="detail" :type="moduleType" :ppId="ppId"/>
     </div>
     <div class="foot" @click="complete">完成</div>
   </div>
@@ -20,11 +20,11 @@
     data(){
       return{
         msg:"胸痛详情",
-        privateData:{}
+        privateData:{},
+        compFlag:false
       }
     },
     created(){
-      console.log("详情盒子:",this.data);
       this.privateData = this.data;
     },
     mounted(){
@@ -34,26 +34,14 @@
     },
     methods:{
       close(){
-        this.$emit("close","胸痛");
+        this.$emit("close");
       },
       complete(){
-      //拼接value,将选中的数据结构存到store--setDatas
-        const id = this.data.id;
-        // const datas = this.$store.state.datas;
-        const datas = this.$store.state.symptom.datas;
-        const current = datas[id];
-        const detail = current.questionMapping;
-        let text = "";
-        for(let i in detail){
-          if(detail[i].value){
-            text += detail[i].value+'，';
-          }
-        }
-        let msg = current.name+ '，' + text;
-        this.$emit("pComplete",msg.substring(0,msg.length-1));
+        this.$refs.detail.saveData();
+        this.$emit("pComplete");
       }
     },
-    props:['data'],
+    props:['data','moduleType','ppId'],
     components:{
       Detail
     }
@@ -63,18 +51,14 @@
 @import '../less/base.less';
   .detailBox-wrap{
     width: 100%;
-    // height: 100%;
-    // height: calc(~"100%-1.15rem");
     overflow-y: auto;
     position: fixed;
-    // top: 1.15rem;
     bottom: 0;
     left: 0;
     z-index: 666;
     background: #fff;
     border-radius: .08rem .08rem 0 0;
     font-size: .3rem;
-    // padding-bottom: .88rem;
     .head{
       height: .88rem;
       line-height: .88rem;

src/components/DiagTreat.vue

@@ -1,11 +1,15 @@
 <template>
   <div class="treat-wrap">
-    <div v-for="(it,i) in datas.moduleDetailDTOList" 
-        v-if="datas&&datas.moduleDetailDTOList"
+    <div v-for="(it,i) in dtoList" 
+        v-if="dtoList"
         :key="it.id">
       <div class="label" v-if="it.controlType==0">
-        <p class="quest">{{it.name}}</p>
-        <span class="symp" v-for="item in it.questionMapping">{{item.name}}</span>
+        <Label :item="it" 
+              :indx="i" 
+              :ppId="it.id" 
+              :moduleType="datas.type" 
+              @setDetail="setDetail"
+              @updateOrig="updateOrig"/>
       </div>
       <UploadImg v-if="it.controlType==4" 
             :item="it" 
@@ -13,39 +17,96 @@
             :imgList="imgs"
             />
     </div>
-    <div class="result">
+    <div class="result" v-if="checkText.length>0">
       <p class="title">治疗情况</p>
-      <p>经典款了估计的结果</p>
+      <p v-for="(v,i) in checkText">{{v.text}}</p>
     </div>
     <div class="foot">
       <span class="back" @click="beBack">{{'返回'+ preName}}</span>
       <span class="next" @click="toNext">{{'进入'+ nextName}}</span>
     </div>
+    <div class="detail" v-if="show">
+      <DetailBox @close="closeDetal" 
+              :data="labelDetail" 
+              :moduleType="datas.type"
+              :ppId="ppId"
+              v-if="labelDetail.questionMapping&&labelDetail.questionMapping.length>0"
+              @pComplete="complete"/>
+    </div>
+    <!-- <Toast :message="delText" 
+          :show="showToast"
+          @comfirn="comfirnDel" 
+          @cancel="cancelDel"/> -->
   </div>
 </template>
 <script type="text/javascript">
-  import UploadImg from '../common/UploadImg.vue'
+  import UploadImg from '../common/UploadImg.vue';
+  import Label from '../common/Label.vue';
+  import DetailBox from './DetailBox.vue';
+  import Toast from '../common/Toast.vue';
   export default {
     name:'DiagTreat',
     data(){
+      let {origin,text} = this.$store.state.diagnose;console.log("诊疗：",origin)
       return{
         msg:"诊疗情况",
-        chooseSymp:[{name:'未治疗'}],
-        imgs:this.$store.state.diagnose.imgSrc
+        imgs:this.$store.state.diagnose.imgSrc,
+        dtoList:origin, //模板数据
+        labelDetail:{}, //标签明细
+        checkText:text, //选中的文字
+        show:false,
+        ppId:null
       }
     },
     props:['datas','preName','nextName'],
+    created(){
+      /*let dataArr = this.datas&&this.datas.moduleDetailDTOList;
+      if(dataArr){
+        this.dtoList = JSON.parse(JSON.stringify(dataArr));
+      }*/
+    },
     methods:{
       beBack(){
         this.$emit('back');
       },
       toNext(){
         this.$emit('next');
+        // console.log("模板数据:",this.datas,"诊疗数据:",this.dtoList)
+      },
+      setDetail(obj){
+        this.labelDetail = obj.detail;
+        this.ppId = obj.ppId;
+        this.show = true;
+      },
+      complete(){
+        this.show = false;
+        this.labelDetail = {};
+        this.ppId = null;
+        // 处理明细选中的值
+      },
+      closeDetal(){
+        this.show = false;
+        this.labelDetail = {};
+        this.ppId = null;
+      },
+      updateOrig(){
+        let origin = this.$store.state.diagnose.origin;
+        // this.dtoList = origin;console.log("更新：",origin)
       }
     },
     components:{
-      UploadImg
-    }
+      UploadImg,
+      Label,
+      DetailBox
+    },
+    watch:{
+      dtoList:{
+        handler(newVal,oldVal){
+          // console.log("诊疗数据更新:",newVal,oldVal); 
+        },
+        deep:true
+      }
+    },
   }
 </script>
 <style lang="less" scoped>
@@ -58,22 +119,12 @@
       font-weight: 700;
     }
     .label{
-      padding-bottom: .2rem;
-      .symp{
-        display: inline-block;
-        width:1.9rem;
+      .label;
+      /* img{
+        width:.56rem;
         height: .74rem;
-        line-height: .74rem;
-        border: 1px solid #DFE0E4;
-        border-radius: .08rem;
-        text-align: center;
-        color: #7C828E;
-        margin: 0 0 .3rem .3rem;
-        box-sizing: border-box;
-      }
-      .symp:nth-child(3n+2){
-        margin-left: 0;
-      }
+        vertical-align: top;
+      } */
     }
     .result{
       .title{
@@ -92,5 +143,9 @@
   .foot{
     .dbfooter;
   }
+  .detail{
+    .mask;
+    z-index: 66;
+  }
   
 </style>

src/components/Others.vue

@@ -5,7 +5,8 @@
         :key="it.id">
       <div class="label" v-if="it.controlType==0">
         <p class="quest">{{it.name}}</p>
-        <span class="symp" v-for="item in it.questionMapping">{{item.name}}</span>
+        <!-- <span v-for="item in it.questionMapping" :class="['symp',{'over':item.name&&item.name.length>5}]">{{item.name}}</span> -->
+        <span v-for="item in it.questionMapping" class="symp">{{item.name}}</span>
       </div>
     </div>
     <div class="result">
@@ -48,22 +49,7 @@
       font-weight: 700;
     }
     .label{
-      padding-bottom: .2rem;
-      .symp{
-        display: inline-block;
-        width:1.9rem;
-        height: .74rem;
-        line-height: .74rem;
-        border: 1px solid #DFE0E4;
-        border-radius: .08rem;
-        text-align: center;
-        color: #7C828E;
-        margin: 0 0 .3rem .3rem;
-        box-sizing: border-box;
-      }
-      .symp:nth-child(3n+2){
-        margin-left: 0;
-      }
+      .label;
     }
     .result{
       .title{

src/components/PathInfo.vue

@@ -215,7 +215,7 @@
           font-size: .32rem;
           margin-top: .20rem;
           background: -webkit-gradient(linear, right top, left top, from(#4F8BFF), to(#4F4FFF));
-          background: linear-gradient(right, #4F8BFF, #4F4FFF);
+          background: -webkit-linear-gradient(right, #4F8BFF, #4F4FFF);
           box-shadow: 0 .12rem .24rem 0 rgba(79,129,255,0.40);
           border-radius: .44rem;
           position: absolute;

src/components/Symptom.vue

@@ -14,14 +14,15 @@
       :key="it.conceptId"
       @click="showDetil(it)">{{it.name}}</span>
     </div>
-    <div class="result" v-if="JSON.stringify(checkText) !== '{}'">
+    <div class="result" v-if="checkText.length>0">
       <p class="title">症状情况</p>
-      <p v-for="(value,key,index) in checkText">{{value}}</p>
+      <p v-for="(value,index) in checkText">{{value.text}}</p>
     </div>
     <div :class="['footer',{'nofoot':chooseSymp.length==0}]" @click="toNext">下一步</div>
     <div class="detail" v-if="show">
       <DetailBox @close="closeDetal" 
               :data="labelDetail" 
+              :moduleType="1"
               v-if="labelDetail.questionMapping&&labelDetail.questionMapping.length>0"
               @pComplete="complete"/>
     </div>
@@ -38,8 +39,8 @@ import Toast from '../common/Toast.vue';
   export default {
     name:'Symptom',
     data(){
-      let {datas,update} = this.$store.state;
-      const {pathInfo,originDatas} = this.$store.state;
+      let {datas,pathInfo} = this.$store.state;
+      const {choose,text} = this.$store.state.symptom;
       return {
         age:pathInfo.patientAge,
         sexType:pathInfo.patientSex=='男'?1:(pathInfo.patientSex=='女'?2:3),
@@ -48,25 +49,25 @@ import Toast from '../common/Toast.vue';
         choose:false,
         check:false,
         show:false, //显示明细
-        chooseSymp:[], //已选症状
+        chooseSymp:choose, //已选症状
         symp:[], //症状
         labelDetail:{}, //明细
-        checkText:{}, //选中拼好的明细
+        checkText:text, //症状情况文字
         questId:null, //id
-        // symptomName:'', //点击的症状名称
-        delText:"是否删除该信息？ （已填内容将清除）",
+        delText:"是否删除该信息？<br/> （已填内容将清除）",
         delIndex:null,
         showToast:false,
         finished:false,   //是否填写了明细
-        upData:update
       }
     },
     created(){
-      this.getSympList();
-    },
-    mounted(){
-      // 从store中取数据
-
+      if(this.chooseSymp.length>0){
+        // 推送
+        const sympText = this.getSympText();
+        this.getPush(sympText);
+      }else{
+        this.getSympList(); //常见
+      } 
     },
     methods:{
       getSympList(){ 
@@ -83,44 +84,50 @@ import Toast from '../common/Toast.vue';
         })
       },
       toNext(){
-        // 把1切换成完成图标，且2高亮
-        // if(this.chooseSymp.length==0){return}
+        // 把1切换成完成图标，且2高亮--判断有几个模块显示，1个--提交预览；1个以上--下一步
+        if(this.chooseSymp.length==0){return}
         this.$emit('next');
-        // 把症状情况的数据存起-已选、详情、拼好的文字
-        
+        // 把症状情况的数据存起-已选
+        this.$store.commit('setChoose',{choose:this.chooseSymp,type:"1"});
 
       },
-      showDetil(item){
+      showDetil(item){console.log("getById:",item)
         this.chooseSymp.push(item);
-        // this.questId = item.conceptId;
-        this.questId = item.questionId;
-        const param = {
-          "age":this.age,
-          "id":item.questionId,
-          "sexType":this.sexType
-        }
-        api.getById(param).then((res)=>{
-          const result = res.data;
-          if(result.code==0){
-            const mapping = result.data.questionMapping;
-            this.labelDetail = result.data;
-            this.$store.commit('setOrigin',{type:"1",data:result.data});
-            // this.$store.commit('getUpdate');
-            if(mapping&&mapping.length>0){
-              this.show = true;
-            } 
+        this.questId = item.questionId || item.id || item.conceptId;
+        const id = item.questionId || item.id; //常见症状questionId，推送id,两者均有可能没有
+        //将选中的name存到store中的text
+        this.$store.commit('setText',{type:"1",text:item.name,pId:this.questId});
+        if(id){
+          const param = {
+            "age":this.age,
+            "id":id,
+            "sexType":this.sexType
           }
-        })
-        // 推理 
-        const sympText = this.getSympText();
-        this.getPush(sympText);
+          api.getById(param).then((res)=>{
+            const result = res.data;
+            if(result.code==0){
+              const mapping = result.data.questionMapping;
+              this.labelDetail = result.data;
+              this.$store.commit('setOrigin',{type:"1",data:result.data});
+              if(mapping&&mapping.length>0){
+                this.show = true;
+              }
+            }
+          })
+        }else{//没有questionId或id 就没有详情，则直接调推送
+          const sympText = this.getSympText();
+          this.getPush(sympText);
+          this.checkText = this.$store.state.symptom.text;
+        }
+        
       },
       getSympText(){
-        let sympText = "";
-        for(let k in this.chooseSymp){
-          sympText += this.chooseSymp[k].name;
+        const text = this.$store.state.symptom.text;
+        let msg = "";
+        for(let i in text){
+          msg += text[i].text;
         }
-        return sympText;
+        return msg;
       },
       getPush(symptoms){//推理
         const param = {
@@ -136,16 +143,16 @@ import Toast from '../common/Toast.vue';
           }
         })
       },
-      closeDetal(msg){
-        const questId = this.questId;
-        this.getPush(msg);
-        // this.checkText = Object.assign({},this.checkText,{[questId]:msg});
+      closeDetal(){
+        // 推理 
+        const sympText = this.getSympText();
+        this.getPush(sympText);
         this.show = false;
         this.questId = null;
       },
       deletSymp(item,index){
         this.delIndex = index;
-        this.questId = item.questionId;
+        this.questId = item.questionId || item.conceptId;
         if(this.chooseSymp.length==1){
           this.delText = "是否删除该信息？删除后将重新填写预问诊流程 （已填内容将清除）"
         }
@@ -153,7 +160,9 @@ import Toast from '../common/Toast.vue';
       },
       comfirnDel(){
         this.chooseSymp.splice(this.delIndex,1);
-        delete(this.checkText[this.questId]);
+        // delete(this.checkText[this.questId]);
+        this.checkText.splice(this.delIndex,1);
+        this.$store.commit('delText',{type:"1",pId:this.questId})
         // 删除完-常见；其他-推送
         if(this.chooseSymp.length>0){
           const sympText = this.getSympText();
@@ -167,19 +176,19 @@ import Toast from '../common/Toast.vue';
         this.showToast = false;
         this.delIndex = null;
         this.questId = null;
-        this.delText = "是否删除该信息？ （已填内容将清除）";
+        this.delText = "是否删除该信息？<br/> （已填内容将清除）";
       },
-      complete(msg){//明细填写完成
-        // 获取选择后的明细数据-拼接症状情况-关闭明细弹窗
-        // let text = this.symptomName + text;
-        this.checkText = Object.assign({},this.checkText,{[this.questId]:msg});
+      complete(){//明细填写完成
+        this.checkText = this.$store.state.symptom.text;
         this.show = false;
         this.questId = null;
+        // 推理 
+        const sympText = this.getSympText();
+        this.getPush(sympText);
       },
       showChecked(item){  
         const origin = this.$store.state.symptom.origin;
         const read = this.$store.state.symptom.datas;
-        console.log(1111,item,origin,read,)
         const data = read[item.questionId] || origin[item.questionId];
         if(data.questionMapping&&data.questionMapping.length>0){
           this.labelDetail = data;
@@ -191,22 +200,6 @@ import Toast from '../common/Toast.vue';
       DetailBox,
       Toast
     },
-    computed:{
-      getQuestId(){
-        return this.upData;
-      }
-    },
-    watch:{
-      getQuestId:{
-        handler(newVal,oldVal){
-          console.log("数据更新了",newVal,oldVal);
-          let datas = this.$store.state.datas;
-          let originDatas = this.$store.state.originDatas;
-          this.labelDetail = datas[this.questId] || originDatas[this.questId];
-        },
-        deep:true
-      }
-    }
   }
 </script>
 <style lang="less" scoped>
@@ -245,25 +238,13 @@ import Toast from '../common/Toast.vue';
         width:.56rem;
         height: .74rem;
       }
+      .over{
+        .over;
+      }
     }
   }
   .label{
-    padding-bottom: .2rem;
-    .symp{
-      display: inline-block;
-      width:1.9rem;
-      height: .74rem;
-      line-height: .74rem;
-      border: 1px solid #DFE0E4;
-      border-radius: .08rem;
-      text-align: center;
-      color: #7C828E;
-      margin: 0 0 .3rem .3rem;
-      box-sizing: border-box;
-    }
-    .symp:nth-child(3n+2){
-      margin-left: 0;
-    }
+    .label;
   }
   .result{
     .title{

src/components/TabPage.vue

@@ -152,23 +152,11 @@ export default {
       background: #e5ecfc;
       border-radius: 25px;
     }
-  }
+}
   .content {
     font-size: 0.3rem;
-    padding: 0.45rem 0.6rem;
+    // padding: 0.45rem 0.6rem;
+    padding: 0.45rem 0.3rem 0.45rem 0.6rem;
   }
-  /* .footer{
-      width:100%;
-      height: .88rem;
-      line-height: .88rem;
-      color:#fff;
-      font-size: .32rem;
-      text-align: center;
-      // background: linear-gradient(-270deg, #4F8BFF 0%, #4F4FFF 100%);
-      background: linear-gradient(-270deg, #4F4FFF,#4F8BFF);
-      position: fixed;
-      bottom: 0;
-      left: 0;
-    } */
 }
 </style>

src/less/base.less

@@ -46,4 +46,31 @@
     color: #fff;
     background: linear-gradient(-270deg, #4F4FFF,#4F8BFF);
   }
+}
+.over{
+  font-size: .24rem !important;
+}
+.label{
+  padding-bottom: .2rem;
+  .symp{
+    display: inline-block;
+    // width:1.9rem;
+    min-width:1.9rem;
+    height: .74rem;
+    line-height: .74rem;
+    border: 1px solid #DFE0E4;
+    border-radius: .08rem;
+    text-align: center;
+    color: #7C828E;
+    // margin: 0 0 .3rem .3rem;
+    margin: 0 .3rem .3rem 0;
+    padding: 0 .05rem;
+    box-sizing: border-box;
+  }
+  /* .symp:nth-child(3n+2){
+    margin-left: 0;
+  } */
+  .over{
+    font-size: .24rem !important;
+  }
 }

src/less/index.less

@@ -15,10 +15,6 @@ input, textarea{
 button {
     border: 0 none;
 }
-h1, h2, h3, h4, h5, h6 {
-  // font-size: 100%;
-  // font-weight: 500;
-}
 i {
   font-style: normal;
 }
@@ -57,7 +53,7 @@ a {
     white-space: nowrap;    
     text-overflow: ellipsis;
 }
-// #app ,body,html{
+
 html,body{
   width: 100%;
   height: auto !important;
@@ -66,20 +62,10 @@ html,body{
 html{
   margin: 0;
   padding: 0;
-  font-size: @font-size;  //750px，1vw = 750*1%=7.5px
-  // font-size: 13.33333333vw !important;  //750px，1vw = 750*1%=7.5px
+  // font-size: @font-size;  //750px，1vw = 750*1%=7.5px
+  font-size: 13.33333333vw !important;
 }
 
-/* @media screen and (-webkit-device-pixel-ratio:2){
-  html{
-    font-size: @font-size * 2;
-  }
-}
-@media screen and (-webkit-device-pixel-ratio:3){
-  html{
-    font-size: @font-size * 2;
-  }
-} */
 // 兼容ipad和pc端大屏幕
 @media screen and (min-width: 560px){
   html{

src/index.js

@@ -1,5 +1,5 @@
 import Vue from 'vue';
-import router from './router.js';
+import router from './router/index.js';
 import store from './store.js';
 import App from './App.vue';
 import preview from 'vue-photo-preview';

src/store.js

@@ -8,24 +8,31 @@ const store = new Vuex.Store({
     pathInfo:{}, //患者信息-后续提交要用
     sysConfig:[], //系统配置项
     allMoudles:[], //模板
-    originDatas:{},  //getById获取到的源数据
-    datas:{},  //处理过的数据
+    // originDatas:{},  //getById获取到的源数据
+    // datas:{},  //处理过的数据
     updata:false,  //更新数据
-    imgFile:[],   //上传图片信息file
-    imgSrc:{},   //上传的图片信息src
+    // imgFile:[],   //上传图片信息file
+    // imgSrc:{},   //上传的图片信息src
     symptom:{ //症状情况
       choose:[],
       origin:{},
       datas:{},
-      text:""
+      text:[]
     },
     diagnose:{ //诊疗
-      origin:{},
+      origin:[], //模板数据
       datas:{},
-      text:"",
+      text:[],
       imgFile:[],
       imgSrc:{}
-    }
+    },
+    others:{ //其他情况
+      origin:[], //模板数据
+      datas:{},
+      text:[],
+      imgFile:[],
+      imgSrc:{}
+    },
   },
   mutations:{
     savePathInfo(state,param){
@@ -36,8 +43,15 @@ const store = new Vuex.Store({
     },
     saveAll(state,param){
       state.allMoudles = param;
+      for(let k in param){
+        if(param[k].type == 2){
+          state.diagnose.origin = param[k].moduleDetailDTOList
+        }else if(param[k].type == 3){
+          state.others.origin = param[k].moduleDetailDTOList
+        }
+      }
     },
-    setOrigin(state,param){console.log("存值:",param)
+    setOrigin(state,param){
       const type = parseInt(param.type);
       const data = param.data;
       switch(type){
@@ -45,7 +59,17 @@ const store = new Vuex.Store({
           state.symptom.origin = Object.assign({},state.symptom.origin,{[data.id]:data});
           break;
         case 2: //诊疗情况
-          
+          let diagData = state.diagnose.origin;
+          for(let i in diagData){
+            if(diagData[i].id == param.pId){
+              let questionMapping = diagData[i].questionMapping;
+              for(let k in questionMapping){
+                if(questionMapping[k].id == data.id){
+                  questionMapping.splice(k,1,data);
+                }
+              }
+            }
+          }
           break;
         case 3:
 
@@ -56,23 +80,105 @@ const store = new Vuex.Store({
         default:
           break;
       }
-      // state.originDatas = Object.assign({},state.originDatas,{[param.id]:param});
     },
     setDatas(state,param){
-      // let originData = state.datas[param.pId]?state.datas[param.pId]:JSON.parse(JSON.stringify(state.originDatas[param.pId]));
+      // ppId--每一道题的id；pId--每个选项的id
+      const type = parseInt(param.type);//console.log("存值：",param)
+      const data = param.data;
+      switch(type){
+        case 1:
+          state.symptom.datas = Object.assign({},state.symptom.datas,{[param.pId]:data});
+          break;
+        case 2: //诊疗情况
+          const ppId = param.ppId;
+          let diagData = state.diagnose.origin;
+          for(let i in diagData){
+            if(diagData[i].id == ppId){
+              let questionMapping = diagData[i].questionMapping;
+              for(let k in questionMapping){
+                if(questionMapping[k].id == data.id){
+                  questionMapping[k].questionMapping = data.questionMapping;
+                }
+              }
+            }
+          }
+          break;
+        case 3:
+
+          break;
+        case 4:
+
+          break;
+        default:
+          break;
+      }
+      
+    },
+    setText(state,param){
       const type = parseInt(param.type);
       switch(type){
         case 1:
-          let originData = state.symptom.datas[param.pId]?state.symptom.datas[param.pId]:JSON.parse(JSON.stringify(state.symptom.origin[param.pId]));
-          let list = originData.questionMapping.slice(0);
-          for(let i=0; i<originData.questionMapping.length; i++){
-            if(originData.questionMapping[i].id==param.data.id){
-              list.splice(i,1,param.data);
+          // 对象易更新但顺序无法控制
+          // state.symptom.text = Object.assign({},state.symptom.text,{[param.pId]:param.text}); 
+          let text = state.symptom.text;
+          if(text.length > 0){
+            for(let i in text){
+              if(text[i].pId==param.pId){
+                text.splice(i,1,param);
+                return
+              }
+              /*else{
+                text.push(param);
+                break
+              }*/
+            }
+            text.push(param);
+          }else{
+            text.push(param);
+          }   
+          break;
+        case 2: //诊疗情况
+          let diaText = state.diagnose.text;
+          if(diaText.length > 0){
+            for(let i in diaText){
+              if(diaText[i].pId==param.pId){
+                diaText.splice(i,1,param);
+                return
+              }
+            }
+            diaText.push(param);
+          }else{
+            diaText.push(param);
+          }
+          break;
+        case 3:
+
+          break;
+        case 4:
+
+          break;
+        default:
+          break;
+      }
+    },
+    delText(state,param){
+      const type = parseInt(param.type);
+      switch(type){
+        case 1:
+          let text = state.symptom.text;
+          for(let i in text){
+            if(text[i].pId==param.pId){
+              text.splice(i,1)
             }
           }
-          state.symptom.datas[param.pId] = Object.assign({},state.symptom.origin[param.pId],{questionMapping:list});
           break;
         case 2: //诊疗情况
+          let diaText = state.diagnose.text;
+          for(let i in diaText){
+            if(diaText[i].pId==param.pId){
+              diaText.splice(i,1)
+            }
+          }
           break;
         case 3:
 
@@ -83,7 +189,9 @@ const store = new Vuex.Store({
         default:
           break;
       }
-      
+    },
+    setChoose(state,param){ //症状情况-已选症状
+      state.symptom.choose = param.choose;
     },
     getUpdate(state){//更新数据
       state.updata = !state.updata;

webpack.common.js

@@ -1,76 +0,0 @@
-const path = require('path');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const VueLoaderPlugin = require('vue-loader/lib/plugin');
-const resolve = function (src) {
-    return path.resolve(__dirname, src);
-};
-
-module.exports = {
-  entry:{
-    app: path.resolve(__dirname,'src','index.js'),
-    //test:path.resolve(__dirname,'src/test','test.js')
-  },
-  plugins: [
-    new VueLoaderPlugin(),
-    new HtmlWebpackPlugin({
-      // title:'预诊',
-      template:path.resolve(__dirname,'src','index.html'),
-    }),
-  ],
-  output: {
-    filename: "[name].bundle.js",
-    path: path.resolve(__dirname,'dist')
-  },
-  module: {
-    rules: [{
-      test:/\.css$/,
-      use:[
-        'style-loader',
-        'css-loader',
-      ]
-    },{
-      test:/\.less$/,
-      use:[
-        'style-loader',
-        'css-loader',
-        'less-loader'
-      ]
-    },{
-      test: /\.(png|svg|jpg|jpeg|gif)/,
-      use:[{
-        loader: "file-loader",
-        options:{
-          limit:5000,
-          name: 'imgs/[name].[ext]'
-        }
-      }]
-    },{
-      test:/\.vue$/,
-      use:[
-        'vue-loader'
-      ]
-    },{
-      test: /\.js$/,
-      exclude: file => (
-        /node_modules/.test(file) &&
-        !/\.vue\.js/.test(file)
-      ),
-      use: {
-        loader: 'babel-loader',
-        options: {
-          presets: ['@babel/preset-env'],
-          // plugins: ['@babel/plugin-transform-runtime']
-        }
-      }
-    }]
-  },
-  resolve: {
-    alias: {
-      'vue$':'vue/dist/vue.esm.js' ,     //让vue使用compiler模式，默认runtime模式要用render初始化
-      '@':resolve('./src'),
-      '@components':resolve('./src/components'),
-      '@less':resolve('./src/less'),
-      '@utils':resolve('./src/utils')
-    }
-  }
-};

webpack.dev.js

@@ -1,33 +0,0 @@
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
-const webpack = require('webpack');
-const config = require('./config.js');
-// const CopyWebpackPlugin = require('copy-webpack-plugin')
-
-module.exports = merge(common,{
-  mode: 'development',
-  devtool: "inline-source-map",
-  devServer: {
-    contentBase:'./dist',
-    port:'8082',
-    host:'192.168.3.126',
-    openPage:'?hospitalCode=A001&hospitalDeptCode=D01&doctorCode=YS001&patientCode=1600&recordId=44',//携带参数
-    proxy:{
-      '/api':{
-        target:config.host,
-        changeOrigin:true
-      }
-    },
-    hot:true
-  },
-  plugins: [
-    new webpack.HotModuleReplacementPlugin(),
-    /*new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, './src/assets'),
-        to: config.dev.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])*/
-  ]
-});

webpack.prod.js

@@ -1,72 +0,0 @@
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
-const OptimizeCssAssesetsPlugin = require('optimize-css-assets-webpack-plugin');
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
-
-module.exports = merge(common,{
-  mode:'production',
-  devtool:'source-map',
-  optimization:{
-    splitChunks:{
-      chunks:'all',
-      cacheGroups:{
-        vendor:{
-          name:'vendor',
-          test:/[\\/]node_modules[\\/]/,
-          priority:10,
-          chunks:'initial'
-        }
-      }
-    },
-    minimizer:[
-      new UglifyJsPlugin({
-        uglifyOptions:{
-          warnings: false, // 去除警告
-          compress:{
-            drop_debugger: true, // 去除debugger
-            drop_console: true // 去除console.log
-          }
-        },
-        cache:true,
-        parallel:true,
-        sourceMap:false,
-      }),
-      new OptimizeCssAssesetsPlugin({})
-    ]
-  },
-  plugins:[
-    new CleanWebpackPlugin(),
-    new MiniCssExtractPlugin({
-      filename: 'css/[name].[hash].css',
-      chunkFilename: 'js/[id].[hash].css',
-    }),
-  ],
-  module: {
-    rules: [{
-      test:/\.css$/,
-      use:[{
-        loader: MiniCssExtractPlugin.loader,
-        options: {
-          // you can specify a publicPath here
-          // by default it use publicPath in webpackOptions.output
-          publicPath: '../'
-        }
-      },
-        'css-loader'
-      ]
-    },{
-      test:/\.less$/,
-      use:[{
-        loader: MiniCssExtractPlugin.loader,
-        options:{
-          publicPath:'../'
-        }
-      },
-        'css-loader',
-        'less-loader'
-      ]
-    }]
-  }
-});