system-clients 1.6.67 → 1.6.68-heat

package/SystemClient.iml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.6.18" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="SystemClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="1.6.5" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
 </module>

package/package.json

@@ -1,102 +1,102 @@
-{
-  "name": "system-clients",
-  "version": "1.6.67",
-  "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.23",
-    "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": "1.6.68-heat",
+  "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.23",
+    "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/equipment/PcAdd.vue

@@ -1,109 +1,109 @@
-<template>
-  <div class="auto select-overspread">
-    <validator name='v'>
-      <ul class="nav nav-tabs" >
-        <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
-      </ul>
-      <form class="form-horizontal">
-        <div class="row">
-          <div class="col-sm-4 form-group form-input-group">
-            <label class="control-label">使用人员</label>
-            <input type="text" class="form-control" v-model="model.f_username" placeholder="使用人员" >
-          </div>
-          <div class="col-sm-4 form-group form-input-group">
-            <label class="control-label">所属地址</label>
-            <input type="text" class="form-control" v-model="model.f_mac_outlets" placeholder="所属地址" >
-          </div>
-          <div class="col-sm-4 form-group form-input-group">
-            <label class="control-label">mac地址</label>
-            <input type="text" class="form-control" v-model="model.f_mac_number" placeholder="mac地址" >
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-4 form-group form-input-group">
-            <label class=" col-sm-2 control-label">使用公司</label>
-            <div class="col-sm-2">
-              <res-select restype='organization'
-                          is-mul="false"
-                          @res-select="getorg"
-                          :initresid="curorgid">
-              </res-select>
-            </div>
-          </div>
-        </div>
-      </form>
-      <div style="text-align:right;height:auto;">
-        <button class="btn btn-success " @click="confirm()"  >确认</button>
-        <button class="btn btn-default " @click="cancel()" >取消</button>
-      </div>
-    </validator>
-  </div>
-</template>
-<script>
-
-
-  export default {
-    data () {
-      return {
-        model: {
-          f_username: '',
-          f_mac_outlets: '',
-          f_mac_number: '',
-          f_equipment_type: 'PC',
-          f_state: '正常'
-        },
-        curorgid: this.$login.f.orgid,
-        f_orgid: ''
-      }
-    },
-    props: ['data'],
-    watch: {
-      'data' (val) {
-          if (val) {
-            this.edit(val)
-          } else {
-              this.initModel()
-          }
-      }
-    },
-    ready () {
-      console.log('mac信息：', this.data)
-      if (this.data) {
-          this.edit(this.data)
-      }
-    },
-    methods: {
-      confirm () {
-        this.model.f_operator = this.$login.f.name
-        this.model.f_operatorid = this.$login.f.id
-        this.model.f_orgid = this.f_orgid
-        console.log('保存', this.model)
-        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
-          this.$dispatch('refresh')
-        }).catch((error) => {
-          this.$dispatch('refresh')
-        })
-      },
-      edit (row) {
-        console.log('修改，，。。', row)
-        this.model.f_username = row.f_username
-        this.model.f_mac_outlets = row.f_mac_outlets
-        this.model.f_mac_number = row.f_mac_number
-        this.model.id = row.id
-        this.f_orgid = row.f_orgid
-      },
-      initModel () {
-        delete this.model.id
-        this.model.f_username = ''
-        this.model.f_mac_outlets = ''
-        this.model.f_mac_number = ''
-      },
-      cancel () {
-        this.$dispatch('close')
-      },
-      getorg (val) {
-        this.f_orgid = val[0]
-      }
-    }
-  }
-</script>
+<template>
+  <div class="auto select-overspread">
+    <validator name='v'>
+      <ul class="nav nav-tabs" >
+        <li role="presentation" class="active"><a href="#">PC端MAC</a></li>
+      </ul>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">使用人员</label>
+            <input type="text" class="form-control" v-model="model.f_username" placeholder="使用人员" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">所属地址</label>
+            <input type="text" class="form-control" v-model="model.f_mac_outlets" placeholder="所属地址" >
+          </div>
+          <div class="col-sm-4 form-group form-input-group">
+            <label class="control-label">mac地址</label>
+            <input type="text" class="form-control" v-model="model.f_mac_number" placeholder="mac地址" >
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-4 form-group form-input-group">
+            <label class=" col-sm-2 control-label">使用公司</label>
+            <div class="col-sm-2">
+              <res-select restype='organization'
+                          is-mul="false"
+                          @res-select="getorg"
+                          :initresid="curorgid">
+              </res-select>
+            </div>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;height:auto;">
+        <button class="btn btn-success " @click="confirm()"  >确认</button>
+        <button class="btn btn-default " @click="cancel()" >取消</button>
+      </div>
+    </validator>
+  </div>
+</template>
+<script>
+
+
+  export default {
+    data () {
+      return {
+        model: {
+          f_username: '',
+          f_mac_outlets: '',
+          f_mac_number: '',
+          f_equipment_type: 'PC',
+          f_state: '正常'
+        },
+        curorgid: this.$login.f.orgid,
+        f_orgid: ''
+      }
+    },
+    props: ['data'],
+    watch: {
+      'data' (val) {
+          if (val) {
+            this.edit(val)
+          } else {
+              this.initModel()
+          }
+      }
+    },
+    ready () {
+      console.log('mac信息：', this.data)
+      if (this.data) {
+          this.edit(this.data)
+      }
+    },
+    methods: {
+      confirm () {
+        this.model.f_operator = this.$login.f.name
+        this.model.f_operatorid = this.$login.f.id
+        this.model.f_orgid = this.f_orgid
+        console.log('保存', this.model)
+        this.$resetpost('rs/entity/t_equipment', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
+          this.$dispatch('refresh')
+        }).catch((error) => {
+          this.$dispatch('refresh')
+        })
+      },
+      edit (row) {
+        console.log('修改，，。。', row)
+        this.model.f_username = row.f_username
+        this.model.f_mac_outlets = row.f_mac_outlets
+        this.model.f_mac_number = row.f_mac_number
+        this.model.id = row.id
+        this.f_orgid = row.f_orgid
+      },
+      initModel () {
+        delete this.model.id
+        this.model.f_username = ''
+        this.model.f_mac_outlets = ''
+        this.model.f_mac_number = ''
+      },
+      cancel () {
+        this.$dispatch('close')
+      },
+      getorg (val) {
+        this.f_orgid = val[0]
+      }
+    }
+  }
+</script>