system-clients 3.0.47 → 3.0.48-fanxian

package/CHANGELOG.md

@@ -1,51 +1,51 @@
-# Change Log
-所有关于本产品的变化都在该文档里。
-
-## [版本更新]
-##1.6.4 2018-12-24 @陈栋扬
--首页及左边栏标题名称修改
-
-##1.6.0 2018-12-1 @何宁社
-- 支持功能连接为其它页面，把登录人信息同步到其它页面中
-
-##1.3.14 2018-11-8 @陈栋扬
--修改参数管理,添加参数一键复制功能
--修改RightTree组件,添加选择上级的权限控制permissions
-
-##1.3.13 2018-11-1 @何宁社
-- 登录用户名，密码加密
-- 登录后2分钟发一次心跳信息，防止2次登录
-- 用户名密码错误，模糊提醒
-
-##1.3.8 2018-10-31 @何宁社
-- 登录后，可以调用注册的异步加载插件
-
-##1.3.7 2018-10-9 @张桥
-- 返回资源树正常
-
-## 1.3.6 - 2018-10-12 @何宁社
-- 修改了$appdata的加载过程
-
-## 1.3.1 - 2018-10-6 @何宁社
-- 把登录过程放到GetLoginInfoService插件里了
-
-## 1.2.3 - 2018-9-27 @何宁社
-- 修改路径错误
-
-## 1.2.2 - 2018-9-27 @何宁社
-- 修改资源选择器的bug
-
-## 1.2.0 - 2018-9-20 @何宁社
-- 登录后，把登录人员id存放到cookie中
-
-## 1.1.4 - 2018-9-12 @张桥
-- 修改公司树样式，登录获取显示登录人
-
-## 1.1.3 - 2018-9-11 @何宁社
-- 抄表员等获取过程，修改成更加合理模式
-
-## 1.1.2 - 2018-9-10 @何宁社
-- 片区的获取过程，修改成更加合理模式
-
-## 1.1.1 - 2018-9-7 @何宁社
-- 资源管理连接转到资源管理的页面
+# Change Log
+所有关于本产品的变化都在该文档里。
+
+## [版本更新]
+##1.6.4 2018-12-24 @陈栋扬
+-首页及左边栏标题名称修改
+
+##1.6.0 2018-12-1 @何宁社
+- 支持功能连接为其它页面，把登录人信息同步到其它页面中
+
+##1.3.14 2018-11-8 @陈栋扬
+-修改参数管理,添加参数一键复制功能
+-修改RightTree组件,添加选择上级的权限控制permissions
+
+##1.3.13 2018-11-1 @何宁社
+- 登录用户名，密码加密
+- 登录后2分钟发一次心跳信息，防止2次登录
+- 用户名密码错误，模糊提醒
+
+##1.3.8 2018-10-31 @何宁社
+- 登录后，可以调用注册的异步加载插件
+
+##1.3.7 2018-10-9 @张桥
+- 返回资源树正常
+
+## 1.3.6 - 2018-10-12 @何宁社
+- 修改了$appdata的加载过程
+
+## 1.3.1 - 2018-10-6 @何宁社
+- 把登录过程放到GetLoginInfoService插件里了
+
+## 1.2.3 - 2018-9-27 @何宁社
+- 修改路径错误
+
+## 1.2.2 - 2018-9-27 @何宁社
+- 修改资源选择器的bug
+
+## 1.2.0 - 2018-9-20 @何宁社
+- 登录后，把登录人员id存放到cookie中
+
+## 1.1.4 - 2018-9-12 @张桥
+- 修改公司树样式，登录获取显示登录人
+
+## 1.1.3 - 2018-9-11 @何宁社
+- 抄表员等获取过程，修改成更加合理模式
+
+## 1.1.2 - 2018-9-10 @何宁社
+- 片区的获取过程，修改成更加合理模式
+
+## 1.1.1 - 2018-9-7 @何宁社
+- 资源管理连接转到资源管理的页面

package/build/webpack.base.conf.js

@@ -53,7 +53,7 @@ module.exports = {
         loader: 'style!css!less'
       },
       {
-        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)(\?.*)?$/,
+        test: /\.(png|jpg|gif|svg|woff2?|eot|ttf|mp3)(\?.*)?$/,
         loader: 'url',
         query: {
           limit: 10000,

package/build.gradle

@@ -1,6 +1,6 @@
-version = '3.0.47'
-
-task release(type:Exec) {
-	workingDir '.'
-	commandLine 'cmd', '/c', 'release.bat ' + version
-}
+version = '3.0.17'
+
+task release(type:Exec) {
+	workingDir '.'
+	commandLine 'cmd', '/c', 'release.bat ' + version
+}

package/package.json

@@ -1,102 +1,102 @@
-{
-  "name": "system-clients",
-  "version": "3.0.47",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "jsencrypt": "^3.0.0-rc.1",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.21.60",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "^3.0.0-alpha.2",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "3.0.48-fanxian",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "jsencrypt": "^3.0.0-rc.1",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.21.60",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "^3.0.0-alpha.2",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/components/Main.vue

@@ -56,8 +56,19 @@
     <!--              </div>-->
     <!--            </div>-->
     <!--    </div>-->
-    <div class='flex-row  system-main' id="box" v-el:box v-if="!isManger">
-      <div class="auto "  :class="{'login-operator1':$refs.mic.tabs.length === 0,'login-operator':$refs.mic.tabs.length != 0}">
+
+    <div class='flex-row aaa system-main' id="box" v-el:box v-if="!isManger">
+      <div class="auto" style="position: fixed;right: 370px;top: 15px;color: #333">
+        <button class="btn" @click="showAbnormity = true" style="background: none;">
+          <img
+            src="../assets/shezhi-hover.png" height="15" width="15">
+          异常警报<label style="display: inline-block;width: 8px;height: 8px;border-radius: 50%;background-color: red;text-align: center;line-height: 30px;" v-show="showaData"></label>
+        </button>
+        <button class="btn" @click="stopSound" style="background: none;">
+          关闭警报
+        </button>
+      </div>
+      <div class="auto" style="position: fixed;right: 30px;top: 20px;color: #333">
             <span>
                <img
                  src="../assets/people.png" height="15" width="15">
@@ -114,12 +125,26 @@
     <!-- 修改密码组件 -->
     <modify-pw :show.sync="show" v-if="show"></modify-pw>
     <!-- 修改密码模态框 -->
+    <!--  异常查看  -->
+    <modal v-if="showAbnormity" :show.sync="showAbnormity"  :width="1000" v-ref:modal  backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="stopSoundNew"><span>&times;</span></button>
+        <h4 class="modal-title">异常报警</h4>
+      </header>
+      <article  slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+        <alarm-information :mergeinfo=abnormityWarningData></alarm-information>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button  type="button" class="btn btn-success" @click='stopSoundNew'>确认</button>
+      </footer>
+    </modal>
   </div>
 </template>
 
 <script>
   import vue from 'vue'
   import co from 'co'
+  import source from '../../static/newStyle/alarm.mp3'
 
   window.onunload = () => {
     vue.http({url: `rs/user/update/${this.$login.f.ename}`, method: 'GET'})
@@ -150,7 +175,16 @@
         tabs:[],       //已初始化页签数组
         selecttab:'',
         setting:true,
-        srcsetting:'../../static/newStyle/setting.png'
+        srcsetting:'../../static/newStyle/setting.png',
+        abnormityWarningData: {
+          data: []
+        },
+        showAbnormity: false,
+        showaData: false,
+        audio: null,
+        isTimeAb: parseInt(this.$appdata.getSingleValue('异常报警查询时间')),
+        isBell: this.$appdata.getSingleValue('是否响铃')
+
 
         // headerHint: true, // 右侧顶部提示信息
         // value: 25645.26,
@@ -202,8 +236,52 @@
       // 				return false
       // 			}
       this.changeShow()
+      // 在组件挂载后立即开始定时任务
+      this.abnormityWarning()
+      this.abnormityWarData()
     },
     methods: {
+      handleMouseMoveOnce () {
+        const handleMouseMove = (event) => {
+          this.playSound()
+          // 移除事件监听器
+          document.removeEventListener('mousemove', handleMouseMove)
+        }
+        // 添加事件监听器
+        document.addEventListener('mousemove', handleMouseMove)
+      },
+      abnormityWarning () {
+        setInterval(() => {
+          this.abnormityWarningData = []
+          this.$resetpost('rs/sql/getAbnormityWarning', {data: {}}, {resolveMsg: '', rejectMsg: ''}).then(item => {
+            this.abnormityWarningData = item
+            if (this.isBell === '是') {
+              if (this.abnormityWarningData.data.length > 0) {
+                this.playSound()
+                this.showaData = true
+                this.showAbnormity = true
+              } else {
+                this.showaData = false
+              }
+            }
+          })
+        }, this.isTimeAb)
+      },
+      abnormityWarData () {
+        this.$resetpost('rs/sql/getAbnormityWarning', {data: {}}, {resolveMsg: '', rejectMsg: ''}).then(item => {
+          this.abnormityWarningData = item
+          if (this.isBell === '是') {
+            if (this.abnormityWarningData.data.length > 0) {
+              // this.handleMouseMoveOnce()
+              this.playSound()
+              this.showaData = true
+              this.showAbnormity = true
+            } else {
+              this.showaData = false
+            }
+          }
+        })
+      },
       hindsetting(){
 
         this.setting=!this.setting
@@ -271,6 +349,27 @@
       tabcg(val){
         console.log(val)
         this.tabs = val
+      },
+      playSound () {
+        if (this.audio) {
+          this.audio.pause()
+          this.audio = null
+        }
+        this.audio = new Audio(source)
+        // this.audio.src = 'static/newStyle/alarm.mp3' // 替换为实际的音频文件路径
+        this.audio.loop = true // 设置循环播放
+        this.audio.autoplay = true
+        this.audio.play()
+      },
+      stopSound () {
+        if (this.audio) {
+          this.audio.pause()
+          this.audio = null
+        }
+      },
+      stopSoundNew () {
+        this.showAbnormity = false
+        this.stopSound()
       }
     },
     computed: {

package/src/components/equipment/EquipmentManage.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="flex">
     <div class="auto">
-      <div class="form-horizontal select-overspread" style="background: white; padding: 0 1%;">
+      <div class="form-horizontal select-overspread" style="height: auto">
         <div class="row">
-          <div class="col-sm-2 form-group">
+          <div class="col-sm-2">
             <label class="font_normal_body">终端类型</label>
             <v-select id="f_charge_type"
                       v-model="model.f_equipment_type"

package/src/components/parammanage/AlarmInformation.vue

@@ -0,0 +1,124 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:paged >
+        <criteria partial='criteria' v-ref:criteria @condition-changed='$parent.search' >
+          <div v-show="false" novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          </div>
+
+        </criteria>
+        <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th><nobr>客户编号</nobr></th>
+              <th><nobr>客户姓名</nobr></th>
+              <th><nobr>上报时间</nobr></th>
+              <th><nobr>上报级别</nobr></th>
+              <th><nobr>报警类型</nobr></th>
+              <th><nobr>报警详情</nobr></th>
+              <th>操作</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_user_name}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_insert_date}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_error_level}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_error_type}}</nobr></td>
+              <td style="text-align:center"><nobr>{{row.f_error_msg}}</nobr></td>
+              <td style="text-align:center;" v-if="row.f_is_read == false" >
+                <span ><a href="#" @click.stop="$parent.$parent.$parent.backSend1(row.id)">添加备注</a></span>
+              </td>
+              <td style="text-align:center;" v-if="row.f_is_read === true"><span title="备注信息:{{row.f_error_reason}}">备注信息</span></td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+
+      <modal :show.sync="watchshow"  v-ref:modal backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="tableFault()"><span>&times;</span></button>
+          <h4 class="modal-title">信息备注</h4>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <div class="col-sm-12">
+            <label class="font_normal_body">添加信息备注</label>
+            <textarea name="name" rows="2" style="width: 100%"
+                      class="ver-textarea" class="form-control"
+                      placeholder='请填写信息备注'
+                      v-model='f_error_reason'></textarea>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="watchshow" type="button" class="btn btn-default" @click='tableFault()'>取消</button>
+          <button v-show="watchshow" type="button" class="btn btn-danger btn-ln fr" @click='saveException()'>确认</button>
+        </footer>
+      </modal>
+    </div>
+  </div>
+</template>
+<script>
+  import {PagedList} from 'vue-client'
+
+  export default {
+    title: '异常警报信息',
+    props: ['mergeinfo'],
+    data () {
+      return {
+        watchshow: false,
+        cancelid: '',
+        condition: '1=1',
+        error_condition: '',
+        f_error_reason: '',
+        model: new PagedList('rs/sql/getAbnormityWarning', 8)
+      }
+    },
+    ready () {
+      this.model
+      this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      backSend1(megrow){
+        this.watchshow = true
+        this.cancelid = megrow
+      },
+      tableFault (val) {
+        if (val) {
+          console.log('开启弹窗')
+        } else {
+          console.log('返回置空')
+          this.f_error_reason = ''
+        }
+        this.watchshow = !this.watchshow
+      },
+      search (args) {
+        console.log(args)
+        this.condition = '1=1'
+        this.model.search(args.condition, args.model)
+      },
+      saveException () {
+        let send = {
+          id: this.cancelid,      // 当前记录ID
+          f_is_read: 1,
+          f_error_operator: this.$login.f.name,
+          f_error_operatorid: this.$login.f.id,
+          f_error_reason: this.f_error_reason   // 备注原因
+        }
+        let param = {
+          tablename: 't_exception',
+          id:1,
+          basedata: send
+        }
+        this.$resetpost('rs/logic/iat_saveTable', param).then(() => {
+          // this.params.rows.splice(index, 1)
+          this.watchshow = false
+          this.$refs.paged
+          this.f_error_reason = ''
+        })
+      }
+    }
+
+  }
+</script>

package/src/components/parammanage/ParamPage.vue

@@ -6,7 +6,7 @@
     <div class="auto">
       <form class="form-horizontal" style="margin-bottom: 5px;">
         <div class="row">
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4">
             <label class="font_normal_body">使用公司</label>
             <res-select restype='organization'
                         :is-mul="false"
@@ -14,11 +14,11 @@
                         @res-select="getorgCur">
             </res-select>
           </div>
-          <div class="col-sm-4 form-group">
+          <div class="col-sm-4">
             <label class="font_normal_body">参数名称</label>
             <input type="text" class="input_search" style="width: 60%" placeholder='请输入查找的参数名' v-model="conditionModel.paramName" @keyup.enter="filter_query(param, f_orgid_current)">
           </div>
-          <div class="col-sm-4 form-group button-range" style="float:left;">
+          <div class="text-right">
             <button type="button" class="button_search" @click="filter_query(conditionModel.paramName,conditionModel.f_cond_orgid);return false;">查询</button>
           </div>
         </div>
@@ -79,12 +79,12 @@
       </header>
       <article slot="modal-body" class="modal-body">
         <form class="form-horizontal">
-          <div class="row">
-            <div class="col-sm-6 form-group">
+          <div class="form-group">
+            <div class="col-sm-6">
               <label class="font_normal_body">参数名称</label>
               <input type="text" class="input_search" style="width: 60%" v-model="modifyItem.name" @keyup.enter="confirm">
             </div>
-            <div class="col-sm-6 form-group" v-if="modifyItem.EntityType === 't_parameter'">
+            <div class="col-sm-6" v-if="modifyItem.EntityType === 't_parameter'">
               <div class="checkbox">
                 <label>
                   <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局
@@ -92,8 +92,8 @@
               </div>
             </div>
           </div>
-          <div class="row" v-if="modifyItem.EntityType === 't_parameter' && !modifyItem.isGlobal">
-            <div class="col-sm-6 form-group">
+          <div class="form-group" v-if="modifyItem.EntityType === 't_parameter' && !modifyItem.isGlobal">
+            <div class="col-sm-6">
               <label class="font_normal_body">所属公司</label>
               <res-select restype='organization'
                           :is-mul="false"