Commit b242d937 by zzrdark

1.fix设备模块

2.生产配置
parent 46500bff
...@@ -2,38 +2,48 @@ ...@@ -2,38 +2,48 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment=""> <list default="true" id="58efcb75-622d-40c1-b8e0-10cd2fb456b4" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DataFilterDto.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application-prod.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DevicesDto.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application-test.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DevicesVo.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application-prod.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/service/MxJwtTokenEnhancer.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/css/chunk-113720ab.9d63d053.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/client/UserClient.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.bacadfa9.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/common/DataFilterAspect.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-0b251b6b.c62cffd6.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/config/MybatisPlusConfig.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-113720ab.c13124c4.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-1d606ab9.36c5da6b.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-218bb4cf.2c87854b.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-47af9ee4.a003a3e1.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-636f8118.2d5d0784.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-79a85582.dd8d44e5.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-acf60ff8.f55e1c1c.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-e19c4374.a6d2a75b.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application-prod.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application-test.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application-prod.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application-test.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-prod.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-test.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/ProductSeriesDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/ProductSeriesDao.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DevicesDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/dto/DevicesDto.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDeptDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/dao/SysUserDeptDao.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/java/com/mx/cneeds/server/entity/DeviceInfoEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/ProductSeriesDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/ProductSeriesDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDeptDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-data/src/main/resources/mapper/SysUserDeptDao.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-pojo/src/main/java/com/mx/cneeds/common/vo/DeviceChannelVo.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/annotation/DataFilter.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-common-utils/src/main/java/com/mx/cneeds/common/annotation/DataFilter.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/OAuth2AuthorizationServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-authorization/src/main/java/com/mx/cneeds/server/anthorization/config/OAuth2AuthorizationServer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/build.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/build.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/client/DeviceClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/DeviceApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/DeviceApplication.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/DeviceInfoService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/ProductSeriesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/ProductSeriesService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/app.e5fc0d17.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/DeviceInfoServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-21520446.0ba4244e.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/ProductSeriesServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/service/impl/ProductSeriesServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-218bb4cf.bbc78c96.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-47af9ee4.c1792ef7.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-636f8118.9a467c91.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources/statics/static/js/chunk-e19c4374.65d65d64.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/build.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/build.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/DeviceInfoController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/ProductSeriesController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/java/com/mx/cneeds/server/device/web/ProductSeriesController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-device/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/common/DataFilterAspect.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/common/DataFilterAspect.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-eureka/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysRoleService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/build.sh" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/build.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserDeptService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserDeptService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/SysUserService.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/resources/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserDeptServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserDeptServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/service/impl/SysUserServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cneeds-server-user/src/main/java/com/mx/cneeds/server/user/web/SysUserController.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -107,7 +117,7 @@ ...@@ -107,7 +117,7 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-datashow/src/main/resources" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/cneeds-server-user/src/main/resources" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.last.edited" value="Modules" />
...@@ -118,12 +128,12 @@ ...@@ -118,12 +128,12 @@
<property name="settings.editor.splitter.proportion" value="0.20898877" /> <property name="settings.editor.splitter.proportion" value="0.20898877" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\test" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources\statics" /> <recent name="E:\mx_project\cneeds-server" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-device" /> <recent name="E:\mx_project\cneeds-server\src" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\main\resources\mapper" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.mx.cneeds.server.device.common" /> <recent name="com.mx.cneeds.server.device.common" />
...@@ -132,12 +142,12 @@ ...@@ -132,12 +142,12 @@
<recent name="com.mx.cneeds.common.vo" /> <recent name="com.mx.cneeds.common.vo" />
<recent name="com.mx.cneeds.common.generate" /> <recent name="com.mx.cneeds.common.generate" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="E:\mx_project\cneeds-server\cneeds-common-data\src\test" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-user\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\java\com\mx\cneeds" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-eureka\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-device\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-datashow\src\main\resources" />
<recent name="E:\mx_project\cneeds-server" /> <recent name="E:\mx_project\cneeds-server\cneeds-server-authorization\src\main\resources" />
<recent name="E:\mx_project\cneeds-server\src" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Spring Boot.DeviceApplication"> <component name="RunManager" selected="Spring Boot.DeviceApplication">
...@@ -307,7 +317,8 @@ ...@@ -307,7 +317,8 @@
<workItem from="1584497551021" duration="17798000" /> <workItem from="1584497551021" duration="17798000" />
<workItem from="1584583200954" duration="19003000" /> <workItem from="1584583200954" duration="19003000" />
<workItem from="1584671773646" duration="19144000" /> <workItem from="1584671773646" duration="19144000" />
<workItem from="1584927645789" duration="18067000" /> <workItem from="1584927645789" duration="18154000" />
<workItem from="1585014666194" duration="17923000" />
</task> </task>
<task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload"> <task id="LOCAL-00001" summary="1.修改不需要web服务 &#10;2.增加一个logupload">
<created>1578451117064</created> <created>1578451117064</created>
...@@ -414,7 +425,14 @@ ...@@ -414,7 +425,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1584530106783</updated> <updated>1584530106783</updated>
</task> </task>
<option name="localTasksCounter" value="16" /> <task id="LOCAL-00016" summary="1.增加页面&#10;2.系统管理大模块的修改&#10;3.设备控制模块">
<created>1584962456528</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1584962456528</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
...@@ -449,7 +467,8 @@ ...@@ -449,7 +467,8 @@
<MESSAGE value="2.角色模块增删改查" /> <MESSAGE value="2.角色模块增删改查" />
<MESSAGE value="1.用户模块" /> <MESSAGE value="1.用户模块" />
<MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3. 产品系列" /> <MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3. 产品系列" />
<option name="LAST_COMMIT_MESSAGE" value="1.增加页面&#10;2.系统管理大模块的修改&#10;3. 产品系列" /> <MESSAGE value="1.增加页面&#10;2.系统管理大模块的修改&#10;3.设备控制模块" />
<option name="LAST_COMMIT_MESSAGE" value="1.增加页面&#10;2.系统管理大模块的修改&#10;3.设备控制模块" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="552" y="178" key="#Project_Structure" timestamp="1584514052764"> <state x="552" y="178" key="#Project_Structure" timestamp="1584514052764">
...@@ -480,62 +499,62 @@ ...@@ -480,62 +499,62 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1583822701848" /> <state x="703" y="356" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1040@0.0.1920.1040" timestamp="1583822701848" />
<state x="463" y="112" key="CommitChangelistDialog2" timestamp="1584530098996"> <state x="463" y="112" key="CommitChangelistDialog2" timestamp="1584962451248">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1584530098996" /> <state x="463" y="112" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1584962451248" />
<state x="740" y="275" key="FileChooserDialogImpl" timestamp="1583991202144"> <state x="740" y="275" key="FileChooserDialogImpl" timestamp="1585025839954">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1583991202144" /> <state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1585025839953" />
<state width="1877" height="215" key="GridCell.Tab.0.bottom" timestamp="1584956421111"> <state width="1877" height="326" key="GridCell.Tab.0.bottom" timestamp="1585047970775">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421111" /> <state width="1877" height="326" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585047970775" />
<state width="1877" height="215" key="GridCell.Tab.0.center" timestamp="1584956421111"> <state width="1877" height="326" key="GridCell.Tab.0.center" timestamp="1585047970775">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421111" /> <state width="1877" height="326" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585047970775" />
<state width="1877" height="215" key="GridCell.Tab.0.left" timestamp="1584956421111"> <state width="1877" height="326" key="GridCell.Tab.0.left" timestamp="1585047970775">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421111" /> <state width="1877" height="326" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585047970775" />
<state width="1877" height="215" key="GridCell.Tab.0.right" timestamp="1584956421111"> <state width="1877" height="326" key="GridCell.Tab.0.right" timestamp="1585047970775">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421111" /> <state width="1877" height="326" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585047970775" />
<state width="1877" height="215" key="GridCell.Tab.1.bottom" timestamp="1584956421112"> <state width="938" height="351" key="GridCell.Tab.1.bottom" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421112" /> <state width="938" height="351" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.1.center" timestamp="1584956421111"> <state width="938" height="351" key="GridCell.Tab.1.center" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421111" /> <state width="938" height="351" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.1.left" timestamp="1584956421111"> <state width="938" height="351" key="GridCell.Tab.1.left" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421111" /> <state width="938" height="351" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.1.right" timestamp="1584956421112"> <state width="938" height="351" key="GridCell.Tab.1.right" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421112" /> <state width="938" height="351" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.2.bottom" timestamp="1584956421112"> <state width="938" height="351" key="GridCell.Tab.2.bottom" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421112" /> <state width="938" height="351" key="GridCell.Tab.2.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.2.center" timestamp="1584956421112"> <state width="938" height="351" key="GridCell.Tab.2.center" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421112" /> <state width="938" height="351" key="GridCell.Tab.2.center/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.2.left" timestamp="1584956421112"> <state width="938" height="351" key="GridCell.Tab.2.left" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421112" /> <state width="938" height="351" key="GridCell.Tab.2.left/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state width="1877" height="215" key="GridCell.Tab.2.right" timestamp="1584956421112"> <state width="938" height="351" key="GridCell.Tab.2.right" timestamp="1585020911160">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="1877" height="215" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1584956421112" /> <state width="938" height="351" key="GridCell.Tab.2.right/0.0.1920.1040@0.0.1920.1040" timestamp="1585020911160" />
<state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926"> <state x="490" y="175" key="Maven.ArtifactSearchDialog" timestamp="1583320014926">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
...@@ -548,10 +567,10 @@ ...@@ -548,10 +567,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583725437328" /> <state x="438" y="166" width="1352" height="708" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1583725437328" />
<state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1584530108501"> <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1584962477473">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1584530108501" /> <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1584962477473" />
<state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1583724603426"> <state x="752" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1583724603426">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
...@@ -568,10 +587,10 @@ ...@@ -568,10 +587,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" /> <state x="511" y="210" key="new project wizard/0.0.1920.1040@0.0.1920.1040" timestamp="1583318693876" />
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1584700567292"> <state x="616" y="173" width="672" height="676" key="search.everywhere.popup" timestamp="1585037123423">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1584700567292" /> <state x="616" y="173" width="672" height="676" key="search.everywhere.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1585037123423" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -591,6 +610,11 @@ ...@@ -591,6 +610,11 @@
<line>304</line> <line>304</line>
<option name="timeStamp" value="15" /> <option name="timeStamp" value="15" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/cneeds-server-datashow/src/main/java/com/mx/cneeds/server/datashow/web/device/DeviceController.java</url>
<line>165</line>
<option name="timeStamp" value="17" />
</line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
</component> </component>
......
...@@ -27,4 +27,20 @@ public class DevicesDto { ...@@ -27,4 +27,20 @@ public class DevicesDto {
* 部门Id * 部门Id
*/ */
private Long deptId; private Long deptId;
/**
* 渠道号 分割符号 ,
*/
private String channelNums;
/**
* 提示信息
*/
private String channelNumsMessage;
/**
* 名单规则
* 0:黑名单,1:白名单
*/
private Integer channelRules;
} }
...@@ -2,6 +2,8 @@ package com.mx.cneeds.common.vo; ...@@ -2,6 +2,8 @@ package com.mx.cneeds.common.vo;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @ClassName DeviceChannelVo * @ClassName DeviceChannelVo
* @Author zzrdark * @Author zzrdark
...@@ -12,7 +14,7 @@ import lombok.Data; ...@@ -12,7 +14,7 @@ import lombok.Data;
public class DeviceChannelVo { public class DeviceChannelVo {
/** /**
* 渠道号 * 渠道号 分割符号 ,
*/ */
private String channelNums; private String channelNums;
...@@ -27,6 +29,11 @@ public class DeviceChannelVo { ...@@ -27,6 +29,11 @@ public class DeviceChannelVo {
*/ */
private Integer channelRules; private Integer channelRules;
/**
* 设备imeis
*/
private List<String> imeis;
public DeviceChannelVo(String channelNums, String channelNumsMessage, Integer channelRules) { public DeviceChannelVo(String channelNums, String channelNumsMessage, Integer channelRules) {
this.channelNums = channelNums; this.channelNums = channelNums;
this.channelNumsMessage = channelNumsMessage; this.channelNumsMessage = channelNumsMessage;
......
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
password: cneeds!QAZ1qaz
username: root
eureka:
client:
service-url:
defaultZone: http://127.0.0.1:8761/eureka/
instance:
prefer-ip-address: true
ip-address: 192.168.2.244
\ No newline at end of file
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
password: cneeds!QAZ1qaz
username: root
eureka:
client:
service-url:
defaultZone: http://192.168.2.244:8761/eureka/
instance:
prefer-ip-address: true
ip-address: 192.168.2.244
\ No newline at end of file
spring: spring:
profiles: profiles:
active: dev active: prod
application: application:
name: cneeds-server-authorization name: cneeds-server-authorization
server: server:
......
...@@ -7,9 +7,10 @@ mvn clean package -Dmaven.test.skip=true -U ...@@ -7,9 +7,10 @@ mvn clean package -Dmaven.test.skip=true -U
#docker push hub.c.163.com/springcloud/eureka #docker push hub.c.163.com/springcloud/eureka
docker build -t zzrdark/eureka . # docker build -t zzrdark/eureka .
docker push zzrdark/eureka
# docker build -t 192.168.2.244:5000/eureka . # docker push zzrdark/eureka
# docker push 192.168.2.244:5000/eureka docker build -t 192.168.2.244:5000/springcloud_datashow .
\ No newline at end of file
docker push 192.168.2.244:5000/springcloud_datashow
\ No newline at end of file
...@@ -48,6 +48,9 @@ public interface DeviceClient { ...@@ -48,6 +48,9 @@ public interface DeviceClient {
@PostMapping("/device/info/importDevice") @PostMapping("/device/info/importDevice")
void importDevice(@RequestBody DevicesDto dto); void importDevice(@RequestBody DevicesDto dto);
@PostMapping("/device/info/updateDeviceChannelBatch")
void updateDeviceChannelBatch(@RequestBody DevicesDto dto);
@PostMapping("/device/info/updateDeviceSeriesBatch") @PostMapping("/device/info/updateDeviceSeriesBatch")
void updateDeviceSeriesBatch(@RequestBody DevicesDto dto); void updateDeviceSeriesBatch(@RequestBody DevicesDto dto);
......
...@@ -31,7 +31,7 @@ public class DeviceController { ...@@ -31,7 +31,7 @@ public class DeviceController {
private DeviceClient deviceClient; private DeviceClient deviceClient;
@GetMapping("/getChannel_nums") @GetMapping("/device/getChannel")
public R getChannel_nums(String imei){ public R getChannel_nums(String imei){
DeviceChannelVo channelVo = new DeviceChannelVo("123456,112233,654321", "提示的信息", 0); DeviceChannelVo channelVo = new DeviceChannelVo("123456,112233,654321", "提示的信息", 0);
...@@ -39,11 +39,11 @@ public class DeviceController { ...@@ -39,11 +39,11 @@ public class DeviceController {
return new R().put("data",channelVo); return new R().put("data",channelVo);
} }
@PostMapping("/saveChannel") @PostMapping("/device/saveChannel")
public R saveChannel_nums(DeviceChannelVo channelVo){ public R saveChannel_nums(DeviceChannelVo channelVo){
DevicesDto devicesDto = new DevicesDto(); DevicesDto devicesDto = new DevicesDto();
BeanUtils.copyProperties(channelVo,devicesDto); BeanUtils.copyProperties(channelVo,devicesDto);
deviceClient.updateDeviceSeriesBatch(devicesDto); deviceClient.updateDeviceChannelBatch(devicesDto);
return new R().put("data",channelVo); return new R().put("data",channelVo);
} }
......
eureka:
client:
service-url:
defaultZone: http://127.0.0.1:8761/eureka/
instance:
prefer-ip-address: true
spring: spring:
profiles: profiles:
active: dev active: prod
application: application:
name: cneeds-server-datashow name: cneeds-server-datashow
......
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=./favicon.ico><title>springSecurity登陆demo</title><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.53f7b034.css rel=stylesheet></head><body><div id=app></div><script src=static/js/chunk-elementUI.1c191b8c.js></script><script src=static/js/chunk-libs.dc23c267.js></script><script>(function(e){function n(n){for(var t,r,d=n[0],f=n[1],o=n[2],h=0,i=[];h<d.length;h++)r=d[h],u[r]&&i.push(u[r][0]),u[r]=0;for(t in f)Object.prototype.hasOwnProperty.call(f,t)&&(e[t]=f[t]);l&&l(n);while(i.length)i.shift()();return a.push.apply(a,o||[]),c()}function c(){for(var e,n=0;n<a.length;n++){for(var c=a[n],t=!0,r=1;r<c.length;r++){var d=c[r];0!==u[d]&&(t=!1)}t&&(a.splice(n--,1),e=f(f.s=c[0]))}return e}var t={},r={runtime:0},u={runtime:0},a=[];function d(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-06aa7494":"06e9eb28","chunk-21520446":"0ba4244e","chunk-218bb4cf":"bbc78c96","chunk-2b4823a9":"8b477be6","chunk-2d2105d3":"c38e1553","chunk-2d230fe7":"8023f254","chunk-3b59103a":"8d86d081","chunk-403c80dd":"94c0ac41","chunk-42768dcf":"af38ec7a","chunk-47af9ee4":"c1792ef7","chunk-4a8d06a6":"81dbed13","chunk-4ab8490a":"d0b52c5a","chunk-5411756c":"80e1e589","chunk-56d3065a":"f080c714","chunk-10f36354":"7f6359fa","chunk-636f8118":"9a467c91","chunk-64238bd4":"b5c58bf5","chunk-67ae84aa":"ad314bd8","chunk-73bfcbf0":"58efd4e9","chunk-7b66cc0a":"d0fee21d","chunk-e19c4374":"65d65d64","chunk-2d0cfe15":"286a34ef","chunk-2d213927":"a484a4fb","chunk-e652b80c":"0ad9ee3a"}[e]+".js"}function f(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var n=[],c={"chunk-06aa7494":1,"chunk-218bb4cf":1,"chunk-2b4823a9":1,"chunk-42768dcf":1,"chunk-4a8d06a6":1,"chunk-4ab8490a":1,"chunk-5411756c":1,"chunk-10f36354":1,"chunk-64238bd4":1,"chunk-67ae84aa":1,"chunk-e19c4374":1};r[e]?n.push(r[e]):0!==r[e]&&c[e]&&n.push(r[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-06aa7494":"9d63d053","chunk-21520446":"31d6cfe0","chunk-218bb4cf":"9d63d053","chunk-2b4823a9":"9d63d053","chunk-2d2105d3":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-3b59103a":"31d6cfe0","chunk-403c80dd":"31d6cfe0","chunk-42768dcf":"9d63d053","chunk-47af9ee4":"31d6cfe0","chunk-4a8d06a6":"e9a4618c","chunk-4ab8490a":"9d63d053","chunk-5411756c":"9d63d053","chunk-56d3065a":"31d6cfe0","chunk-10f36354":"129625a4","chunk-636f8118":"31d6cfe0","chunk-64238bd4":"70564041","chunk-67ae84aa":"eedc5334","chunk-73bfcbf0":"31d6cfe0","chunk-7b66cc0a":"31d6cfe0","chunk-e19c4374":"36699270","chunk-2d0cfe15":"31d6cfe0","chunk-2d213927":"31d6cfe0","chunk-e652b80c":"31d6cfe0"}[e]+".css",u=f.p+t,a=document.getElementsByTagName("link"),d=0;d<a.length;d++){var o=a[d],h=o.getAttribute("data-href")||o.getAttribute("href");if("stylesheet"===o.rel&&(h===t||h===u))return n()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){o=i[d],h=o.getAttribute("data-href");if(h===t||h===u)return n()}var l=document.createElement("link");l.rel="stylesheet",l.type="text/css",l.onload=n,l.onerror=function(n){var t=n&&n.target&&n.target.src||u,a=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");a.request=t,delete r[e],l.parentNode.removeChild(l),c(a)},l.href=u;var k=document.getElementsByTagName("head")[0];k.appendChild(l)})).then((function(){r[e]=0})));var t=u[e];if(0!==t)if(t)n.push(t[2]);else{var a=new Promise((function(n,c){t=u[e]=[n,c]}));n.push(t[2]=a);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,f.nc&&h.setAttribute("nonce",f.nc),h.src=d(e),o=function(n){h.onerror=h.onload=null,clearTimeout(i);var c=u[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),r=n&&n.target&&n.target.src,a=new Error("Loading chunk "+e+" failed.\n("+t+": "+r+")");a.type=t,a.request=r,c[1](a)}u[e]=void 0}};var i=setTimeout((function(){o({type:"timeout",target:h})}),12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(n)},f.m=e,f.c=t,f.d=function(e,n,c){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(f.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)f.d(c,t,function(n){return e[n]}.bind(null,t));return c},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="",f.oe=function(e){throw console.error(e),e};var o=window["webpackJsonp"]=window["webpackJsonp"]||[],h=o.push.bind(o);o.push=n,o=o.slice();for(var i=0;i<o.length;i++)n(o[i]);var l=h;c()})([]);</script><script src=static/js/app.e5fc0d17.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><link rel=icon href=./favicon.ico><title>springSecurity登陆demo</title><link href=static/css/chunk-libs.3dfb7769.css rel=stylesheet><link href=static/css/app.53f7b034.css rel=stylesheet></head><body><div id=app></div><script src=static/js/chunk-elementUI.1c191b8c.js></script><script src=static/js/chunk-libs.dc23c267.js></script><script>(function(e){function n(n){for(var t,u,d=n[0],f=n[1],h=n[2],o=0,i=[];o<d.length;o++)u=d[o],a[u]&&i.push(a[u][0]),a[u]=0;for(t in f)Object.prototype.hasOwnProperty.call(f,t)&&(e[t]=f[t]);k&&k(n);while(i.length)i.shift()();return r.push.apply(r,h||[]),c()}function c(){for(var e,n=0;n<r.length;n++){for(var c=r[n],t=!0,u=1;u<c.length;u++){var d=c[u];0!==a[d]&&(t=!1)}t&&(r.splice(n--,1),e=f(f.s=c[0]))}return e}var t={},u={runtime:0},a={runtime:0},r=[];function d(e){return f.p+"static/js/"+({}[e]||e)+"."+{"chunk-06aa7494":"06e9eb28","chunk-0b251b6b":"c62cffd6","chunk-113720ab":"c13124c4","chunk-1d606ab9":"36c5da6b","chunk-218bb4cf":"2c87854b","chunk-2b4823a9":"8b477be6","chunk-2d2105d3":"c38e1553","chunk-2d230fe7":"8023f254","chunk-3b59103a":"8d86d081","chunk-403c80dd":"94c0ac41","chunk-42768dcf":"af38ec7a","chunk-47af9ee4":"a003a3e1","chunk-4a8d06a6":"81dbed13","chunk-4ab8490a":"d0b52c5a","chunk-5411756c":"80e1e589","chunk-56d3065a":"f080c714","chunk-10f36354":"7f6359fa","chunk-636f8118":"2d5d0784","chunk-64238bd4":"b5c58bf5","chunk-67ae84aa":"ad314bd8","chunk-73bfcbf0":"58efd4e9","chunk-79a85582":"dd8d44e5","chunk-7b66cc0a":"d0fee21d","chunk-acf60ff8":"f55e1c1c","chunk-e19c4374":"a6d2a75b","chunk-2d0cfe15":"286a34ef","chunk-2d213927":"a484a4fb","chunk-e652b80c":"0ad9ee3a"}[e]+".js"}function f(n){if(t[n])return t[n].exports;var c=t[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,f),c.l=!0,c.exports}f.e=function(e){var n=[],c={"chunk-06aa7494":1,"chunk-113720ab":1,"chunk-218bb4cf":1,"chunk-2b4823a9":1,"chunk-42768dcf":1,"chunk-4a8d06a6":1,"chunk-4ab8490a":1,"chunk-5411756c":1,"chunk-10f36354":1,"chunk-64238bd4":1,"chunk-67ae84aa":1,"chunk-e19c4374":1};u[e]?n.push(u[e]):0!==u[e]&&c[e]&&n.push(u[e]=new Promise((function(n,c){for(var t="static/css/"+({}[e]||e)+"."+{"chunk-06aa7494":"9d63d053","chunk-0b251b6b":"31d6cfe0","chunk-113720ab":"9d63d053","chunk-1d606ab9":"31d6cfe0","chunk-218bb4cf":"9d63d053","chunk-2b4823a9":"9d63d053","chunk-2d2105d3":"31d6cfe0","chunk-2d230fe7":"31d6cfe0","chunk-3b59103a":"31d6cfe0","chunk-403c80dd":"31d6cfe0","chunk-42768dcf":"9d63d053","chunk-47af9ee4":"31d6cfe0","chunk-4a8d06a6":"e9a4618c","chunk-4ab8490a":"9d63d053","chunk-5411756c":"9d63d053","chunk-56d3065a":"31d6cfe0","chunk-10f36354":"129625a4","chunk-636f8118":"31d6cfe0","chunk-64238bd4":"70564041","chunk-67ae84aa":"eedc5334","chunk-73bfcbf0":"31d6cfe0","chunk-79a85582":"31d6cfe0","chunk-7b66cc0a":"31d6cfe0","chunk-acf60ff8":"31d6cfe0","chunk-e19c4374":"36699270","chunk-2d0cfe15":"31d6cfe0","chunk-2d213927":"31d6cfe0","chunk-e652b80c":"31d6cfe0"}[e]+".css",a=f.p+t,r=document.getElementsByTagName("link"),d=0;d<r.length;d++){var h=r[d],o=h.getAttribute("data-href")||h.getAttribute("href");if("stylesheet"===h.rel&&(o===t||o===a))return n()}var i=document.getElementsByTagName("style");for(d=0;d<i.length;d++){h=i[d],o=h.getAttribute("data-href");if(o===t||o===a)return n()}var k=document.createElement("link");k.rel="stylesheet",k.type="text/css",k.onload=n,k.onerror=function(n){var t=n&&n.target&&n.target.src||a,r=new Error("Loading CSS chunk "+e+" failed.\n("+t+")");r.request=t,delete u[e],k.parentNode.removeChild(k),c(r)},k.href=a;var b=document.getElementsByTagName("head")[0];b.appendChild(k)})).then((function(){u[e]=0})));var t=a[e];if(0!==t)if(t)n.push(t[2]);else{var r=new Promise((function(n,c){t=a[e]=[n,c]}));n.push(t[2]=r);var h,o=document.createElement("script");o.charset="utf-8",o.timeout=120,f.nc&&o.setAttribute("nonce",f.nc),o.src=d(e),h=function(n){o.onerror=o.onload=null,clearTimeout(i);var c=a[e];if(0!==c){if(c){var t=n&&("load"===n.type?"missing":n.type),u=n&&n.target&&n.target.src,r=new Error("Loading chunk "+e+" failed.\n("+t+": "+u+")");r.type=t,r.request=u,c[1](r)}a[e]=void 0}};var i=setTimeout((function(){h({type:"timeout",target:o})}),12e4);o.onerror=o.onload=h,document.head.appendChild(o)}return Promise.all(n)},f.m=e,f.c=t,f.d=function(e,n,c){f.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:c})},f.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(e,n){if(1&n&&(e=f(e)),8&n)return e;if(4&n&&"object"===typeof e&&e&&e.__esModule)return e;var c=Object.create(null);if(f.r(c),Object.defineProperty(c,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var t in e)f.d(c,t,function(n){return e[n]}.bind(null,t));return c},f.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return f.d(n,"a",n),n},f.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},f.p="",f.oe=function(e){throw console.error(e),e};var h=window["webpackJsonp"]=window["webpackJsonp"]||[],o=h.push.bind(h);h.push=n,h=h.slice();for(var i=0;i<h.length;i++)n(h[i]);var k=o;c()})([]);</script><script src=static/js/app.bacadfa9.js></script></body></html>
\ No newline at end of file \ No newline at end of file
.pagination-container[data-v-f3b72548]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-f3b72548]{display:none}.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0b251b6b"],{aa98:function(e,n,t){"use strict";t.d(n,"b",(function(){return i})),t.d(n,"c",(function(){return c})),t.d(n,"e",(function(){return l})),t.d(n,"a",(function(){return s})),t.d(n,"d",(function(){return u}));t("55dd");var a=t("b775");function i(e){return Object(a["a"])({url:"/device/device/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function c(e){return Object(a["a"])({url:"/device/device/importDevice",method:"post",data:e})}function l(e){return Object(a["a"])({url:"/device/device/updateDeviceSeriesBatch",method:"post",data:e})}function s(e){return Object(a["a"])({url:"/device/device/delete",method:"post",data:{ids:e}})}function u(e){return Object(a["a"])({url:"/device/device/saveChannel",method:"post",data:e})}},ee85:function(e,n,t){"use strict";t.r(n);var a=function(){var e=this,n=e.$createElement,t=e._self._c||n;return t("el-container",[t("el-main",[t("el-form",{ref:"setChannel",attrs:{model:e.device,rules:e.rules,"label-width":"80px"}},[t("el-form-item",{attrs:{prop:"channelNumsMessage",label:"终端提示文字"}},[t("el-input",{model:{value:e.device.channelNumsMessage,callback:function(n){e.$set(e.device,"channelNumsMessage",n)},expression:"device.channelNumsMessage"}})],1),e._v(" "),t("el-form-item",{attrs:{prop:"channelRules",label:"规则"}},[t("el-select",{attrs:{placeholder:"选择"},model:{value:e.device.channelRules,callback:function(n){e.$set(e.device,"channelRules",n)},expression:"device.channelRules"}},[t("el-option",{attrs:{label:"黑名单",value:"0"}}),e._v(" "),t("el-option",{attrs:{label:"白名单",value:"1"}})],1)],1),e._v(" "),e._l(e.device.channelNums,(function(n,a){return t("el-form-item",{key:a,attrs:{label:"第"+(a+1)+"个渠道号: ",prop:"channelNums."+a+".value","label-width":"20"}},[t("el-row",[t("el-col",{attrs:{span:14}},[t("el-input",{model:{value:n.value,callback:function(t){e.$set(n,"value",t)},expression:"channelNum.value"}})],1),e._v(" "),t("el-col",{attrs:{span:5}},[t("el-button",{on:{click:function(t){return t.preventDefault(),e.removeChannelNums(n)}}},[e._v("\n 删除\n ")])],1)],1)],1)})),e._v(" "),t("el-form-item",[t("el-button",{on:{click:e.addChannelNums}},[e._v("新增渠道号")]),e._v(" "),t("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("修改")]),e._v(" "),t("el-button",{on:{click:e.toDeviceList}},[e._v("取消")])],1)],2)],1)],1)},i=[],c=(t("456d"),t("ac6a"),t("96cf"),t("3b8d")),l=t("aa98"),s={channelNumsMessage:"终端提示文字",channelRules:"规则"},u={data:function(){var e=function(e,n,t){void 0===n||null===n||0===n.length?t(new Error(s[e.field]+"必须填写")):t()};return{loading:!1,device:{channelNums:[{value:""}],channelNumsMessage:"",channelRules:"",imeis:[]},rules:{channelNumsMessage:[{validator:e}],channelRules:[{validator:e}]},selectSeriesOptions:[]}},mounted:function(){this.device.imeis=this.$route.query.imeis,this.getFormData()},methods:{getFormData:function(){var e=Object(c["a"])(regeneratorRuntime.mark((function e(){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:case"end":return e.stop()}}),e)})));function n(){return e.apply(this,arguments)}return n}(),setDefault:function(){this.$refs.device=[]},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.setChannel.validate((function(n,t){if(n){var a=e.device.channelNums;e.device.channelNums=[],a.forEach((function(n){e.device.channelNums.push(n.value)})),Object(l["d"])(e.device).then((function(n){var t=n.msg;e.$notify({title:"操作成功",message:t,type:"success",duration:2e3}),e.setDefault(),e.toDeviceList(),e.loading=!1})).catch((function(){e.loading=!1}))}else{var i=t[Object.keys(t)[0]][0].message;e.$message({message:i,type:"error"}),e.loading=!1}})))},toDeviceList:function(){this.$router.push({path:"/deviceManagement/device"})},addChannelNums:function(){this.device.channelNums.push({value:""})},removeChannelNums:function(e){var n=this.device.channelNums.indexOf(e);-1!==n&&this.device.channelNums.splice(n,1)}}},r=u,o=t("2877"),d=Object(o["a"])(r,a,i,!1,null,"6cae8d7a",null);n["default"]=d.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-113720ab"],{"1c64":function(e,t,n){},"1cc6":function(e,t,n){"use strict";var i=n("1c64"),a=n.n(i);a.a},"333d":function(e,t,n){"use strict";var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"pagination-container",class:{hidden:e.hidden}},[n("el-pagination",e._b({attrs:{background:e.background,"current-page":e.currentPage,"page-size":e.pageSize,layout:e.layout,"page-sizes":e.pageSizes,total:e.total},on:{"update:currentPage":function(t){e.currentPage=t},"update:current-page":function(t){e.currentPage=t},"update:pageSize":function(t){e.pageSize=t},"update:page-size":function(t){e.pageSize=t},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}},"el-pagination",e.$attrs,!1))],1)},a=[];n("c5f6");Math.easeInOutQuad=function(e,t,n,i){return e/=i/2,e<1?n/2*e*e+t:(e--,-n/2*(e*(e-2)-1)+t)};var o=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();function r(e){document.documentElement.scrollTop=e,document.body.parentNode.scrollTop=e,document.body.scrollTop=e}function l(){return document.documentElement.scrollTop||document.body.parentNode.scrollTop||document.body.scrollTop}function c(e,t,n){var i=l(),a=e-i,c=20,s=0;t="undefined"===typeof t?500:t;var u=function e(){s+=c;var l=Math.easeInOutQuad(s,i,a,t);r(l),s<t?o(e):n&&"function"===typeof n&&n()};u()}var s={name:"Pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:20},pageSizes:{type:Array,default:function(){return[10,20,30,50]}},layout:{type:String,default:"total, sizes, prev, pager, next, jumper"},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1}},computed:{currentPage:{get:function(){return this.page},set:function(e){this.$emit("update:page",e)}},pageSize:{get:function(){return this.limit},set:function(e){this.$emit("update:limit",e)}}},methods:{handleSizeChange:function(e){this.$emit("pagination",{page:this.currentPage,limit:e}),this.autoScroll&&c(0,800)},handleCurrentChange:function(e){this.$emit("pagination",{page:e,limit:this.pageSize}),this.autoScroll&&c(0,800)}}},u=s,d=(n("1cc6"),n("2877")),p=Object(d["a"])(u,i,a,!1,null,"f3b72548",null);t["a"]=p.exports},"8d41":function(e,t,n){},aa98:function(e,t,n){"use strict";n.d(t,"b",(function(){return a})),n.d(t,"c",(function(){return o})),n.d(t,"e",(function(){return r})),n.d(t,"a",(function(){return l})),n.d(t,"d",(function(){return c}));n("55dd");var i=n("b775");function a(e){return Object(i["a"])({url:"/device/device/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function o(e){return Object(i["a"])({url:"/device/device/importDevice",method:"post",data:e})}function r(e){return Object(i["a"])({url:"/device/device/updateDeviceSeriesBatch",method:"post",data:e})}function l(e){return Object(i["a"])({url:"/device/device/delete",method:"post",data:{ids:e}})}function c(e){return Object(i["a"])({url:"/device/device/saveChannel",method:"post",data:e})}},c7a7:function(e,t,n){"use strict";n("8d41");var i="@@wavesContext";function a(e,t){function n(n){var i=Object.assign({},t.value),a=Object.assign({ele:e,type:"hit",color:"rgba(0, 0, 0, 0.15)"},i),o=a.ele;if(o){o.style.position="relative",o.style.overflow="hidden";var r=o.getBoundingClientRect(),l=o.querySelector(".waves-ripple");switch(l?l.className="waves-ripple":(l=document.createElement("span"),l.className="waves-ripple",l.style.height=l.style.width=Math.max(r.width,r.height)+"px",o.appendChild(l)),a.type){case"center":l.style.top=r.height/2-l.offsetHeight/2+"px",l.style.left=r.width/2-l.offsetWidth/2+"px";break;default:l.style.top=(n.pageY-r.top-l.offsetHeight/2-document.documentElement.scrollTop||document.body.scrollTop)+"px",l.style.left=(n.pageX-r.left-l.offsetWidth/2-document.documentElement.scrollLeft||document.body.scrollLeft)+"px"}return l.style.backgroundColor=a.color,l.className="waves-ripple z-active",!1}}return e[i]?e[i].removeHandle=n:e[i]={removeHandle:n},n}t["a"]={bind:function(e,t){e.addEventListener("click",a(e,t),!1)},update:function(e,t){e.removeEventListener("click",e[i].removeHandle,!1),e.addEventListener("click",a(e,t),!1)},unbind:function(e){e.removeEventListener("click",e[i].removeHandle,!1),e[i]=null,delete e[i]}}},dc86:function(e,t,n){"use strict";n.r(t);var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-header",[n("div",{staticStyle:{margin:"20px 0"}},[n("el-button",{on:{click:e.addPage}},[e._v("导入设备")]),e._v(" "),n("el-button",{on:{click:e.editSeriesPage}},[e._v("变更产品系列")]),e._v(" "),n("el-button",{on:{click:e.setChannelPage}},[e._v("适配配置")]),e._v(" "),n("el-button",{on:{click:e.deletePage}},[e._v("删除设备")])],1)]),e._v(" "),n("el-main",[n("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.listLoading,expression:"listLoading"}],key:e.tableKey,staticStyle:{width:"100%"},attrs:{data:e.list,border:"",fit:"","highlight-current-row":"","default-sort":e.defaultSort},on:{"sort-change":e.sortChange,"selection-change":e.handleSelectionChange}},[n("el-table-column",{attrs:{type:"selection",width:"55"}}),e._v(" "),n("el-table-column",{attrs:{label:"设备ID",prop:"deviceId",sortable:"custom",align:"center",width:"80"}}),e._v(" "),n("el-table-column",{attrs:{label:"产品系列",prop:"seriesNum",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"imei",prop:"imei",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"创建时间",prop:"createTime",width:"100",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.createTime;return[n("span",[e._v(e._s(e._f("timeFilter")(i)))])]}}])})],1),e._v(" "),n("pagination",{directives:[{name:"show",rawName:"v-show",value:e.total>0,expression:"total > 0"}],attrs:{total:e.total,page:e.listQuery.page,limit:e.listQuery.pageSize},on:{"update:page":function(t){return e.$set(e.listQuery,"page",t)},"update:limit":function(t){return e.$set(e.listQuery,"pageSize",t)},pagination:e.refresh}})],1)],1)},a=[],o=(n("ac6a"),n("333d")),r=n("c7a7"),l=n("ed08"),c=n("aa98"),s={components:{Pagination:o["a"]},directives:{waves:r["a"]},filters:{valueFilter:function(e){return e||"无"},timeFilter:function(e){return e?Object(l["d"])(e,"{y}-{m}-{d} {h}:{i}"):"无"}},data:function(){return{tableKey:0,listLoading:!0,listQuery:{},list:[],total:0,defaultSort:{},multipleSelection:[],device:{imei:""},deviceIds:[]}},created:function(){},mounted:function(){this.getList()},beforeRouteUpdate:function(e,t,n){if(e.path===t.path){var i=Object.assign({},e.query),a=Object.assign({},t.query);JSON.stringify(i)!==JSON.stringify(a)&&this.getList()}n()},methods:{handleSelectionChange:function(e){this.multipleSelection=e},sortChange:function(e){console.log("sortChange",e);var t=e.prop,n=e.order;this.sortBy(t,n)},sortBy:function(e,t){this.listQuery.sort="ascending"===t?"+".concat(e):"-".concat(e),this.handleFilter()},getList:function(){var e=this;this.listLoading=!0,Object(c["b"])(this.listQuery).then((function(t){var n=t.data,i=n.list,a=n.totalCount;e.list=i,e.total=a,e.listLoading=!1}))},addPage:function(){this.$router.push({path:"/deviceManagement/device/importDevice"})},editSeriesPage:function(){if(0!==this.multipleSelection.length){var e=[];this.multipleSelection.forEach((function(t){e.push(t.imei)})),this.$router.push({path:"/deviceManagement/device/editSeries",query:{imeis:e}})}else{var t="必须选一列";this.$message({message:t,type:"error"})}},setChannelPage:function(){if(0!==this.multipleSelection.length){var e=[];this.multipleSelection.forEach((function(t){e.push(t.imei)})),this.$router.push({path:"/deviceManagement/device/setChannelNum",query:{imeis:e}})}else{var t="必须选一列";this.$message({message:t,type:"error"})}},deletePage:function(){var e=this;if(0!==this.multipleSelection.length)this.multipleSelection.forEach((function(t){e.deviceIds.push(t.deviceId)})),Object(c["a"])(this.deviceIds).then((function(t){e.getList()})),this.deviceIds=[];else{var t="必须选一列";this.$message({message:t,type:"error"})}},refresh:function(){this.$router.push({path:"/deviceManagement/device",query:this.listQuery})},handleFilter:function(){console.log("handleFilter",this.listQuery),this.listQuery.page=1,this.refresh()}}},u=s,d=n("2877"),p=Object(d["a"])(u,i,a,!1,null,"387f23f8",null);t["default"]=p.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-1d606ab9"],{"7d09":function(e,t,i){"use strict";i.d(t,"e",(function(){return r})),i.d(t,"a",(function(){return s})),i.d(t,"c",(function(){return a})),i.d(t,"b",(function(){return c})),i.d(t,"d",(function(){return o}));i("55dd");var n=i("b775");function r(e){return Object(n["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function s(e){return Object(n["a"])({url:"/device/series/add",method:"post",data:e})}function a(e){return Object(n["a"])({url:"/device/series/edit",method:"post",data:e})}function c(e){return Object(n["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}function o(){return Object(n["a"])({url:"/device/series/listAll",method:"post"})}},"8a03":function(e,t,i){"use strict";i.r(t);var n=function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("el-container",[i("el-main",[i("el-form",{ref:"editSeries",attrs:{model:e.device,rules:e.rules,"label-width":"80px"}},[i("el-form-item",{attrs:{prop:"seriesId",label:"所属系列"}},[i("el-select",{attrs:{placeholder:"请选择"},model:{value:e.device.seriesId,callback:function(t){e.$set(e.device,"seriesId",t)},expression:"device.seriesId"}},e._l(e.selectSeriesOptions,(function(e){return i("el-option",{key:e.seriesId,attrs:{label:e.seriesNum,value:e.seriesId}})})),1)],1),e._v(" "),i("el-form-item",[i("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("修改")]),e._v(" "),i("el-button",{on:{click:e.toDeviceList}},[e._v("取消")])],1)],1)],1)],1)},r=[],s=(i("ac6a"),i("456d"),i("96cf"),i("3b8d")),a=i("7d09"),c=i("aa98"),o={seriesId:"选择系列",imeis:"要选择设备"},u={data:function(){var e=function(e,t,i){void 0===t||null===t||0===t.length?i(new Error(o[e.field]+"必须填写")):i()};return{loading:!1,device:{seriesIdList:[],imeis:[]},rules:{seriesId:[{validator:e}],imeis:[{validator:e}]},selectSeriesOptions:[]}},mounted:function(){this.device.imeis=this.$route.query.imeis,this.getFormData()},methods:{getFormData:function(){var e=Object(s["a"])(regeneratorRuntime.mark((function e(){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,this.selectSeries();case 2:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}(),setDefault:function(){this.$refs.editSeries.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.editSeries.validate((function(t,i){if(t)Object(c["e"])(e.device).then((function(t){var i=t.msg;e.$notify({title:"操作成功",message:i,type:"success",duration:2e3}),e.setDefault(),e.toDeviceList(),e.loading=!1})).catch((function(){e.loading=!1}));else{var n=i[Object.keys(i)[0]][0].message;e.$message({message:n,type:"error"}),e.loading=!1}})))},toDeviceList:function(){this.$router.push({path:"/deviceManagement/device"})},selectSeries:function(){var e=Object(s["a"])(regeneratorRuntime.mark((function e(){var t=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,Object(a["d"])().then((function(e){var i=e.data;t.selectSeriesOptions=i}));case 2:case"end":return e.stop()}}),e)})));function t(){return e.apply(this,arguments)}return t}(),handleChange:function(e){var t=e.length;t-=1,this.device.deptId=e[t]}}},d=u,l=i("2877"),f=Object(l["a"])(d,n,r,!1,null,"644ef19e",null);t["default"]=f.exports},aa98:function(e,t,i){"use strict";i.d(t,"b",(function(){return r})),i.d(t,"c",(function(){return s})),i.d(t,"e",(function(){return a})),i.d(t,"a",(function(){return c})),i.d(t,"d",(function(){return o}));i("55dd");var n=i("b775");function r(e){return Object(n["a"])({url:"/device/device/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function s(e){return Object(n["a"])({url:"/device/device/importDevice",method:"post",data:e})}function a(e){return Object(n["a"])({url:"/device/device/updateDeviceSeriesBatch",method:"post",data:e})}function c(e){return Object(n["a"])({url:"/device/device/delete",method:"post",data:{ids:e}})}function o(e){return Object(n["a"])({url:"/device/device/saveChannel",method:"post",data:e})}}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-218bb4cf"],{"1c64":function(e,t,n){},"1cc6":function(e,t,n){"use strict";var i=n("1c64"),a=n.n(i);a.a},"2bee":function(e,t,n){"use strict";n.r(t);var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-header",[n("div",{staticStyle:{margin:"20px 0"}},[n("el-button",{on:{click:e.addPage}},[e._v("添加产品系列")]),e._v(" "),n("el-button",{on:{click:e.editPage}},[e._v("编辑产品系列")]),e._v(" "),n("el-button",{on:{click:e.deletePage}},[e._v("删除产品系列")])],1)]),e._v(" "),n("el-main",[n("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.listLoading,expression:"listLoading"}],key:e.tableKey,staticStyle:{width:"100%"},attrs:{data:e.list,border:"",fit:"","highlight-current-row":"","default-sort":e.defaultSort},on:{"sort-change":e.sortChange,"selection-change":e.handleSelectionChange}},[n("el-table-column",{attrs:{type:"selection",width:"55"}}),e._v(" "),n("el-table-column",{attrs:{label:"序号",prop:"seriesId",sortable:"custom",align:"center",width:"80"}}),e._v(" "),n("el-table-column",{attrs:{label:"产品系列号",prop:"seriesNum",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"产品系列详情",prop:"remark",width:"300",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"时间",prop:"createTime",width:"100",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.createTime;return[n("span",[e._v(e._s(e._f("timeFilter")(i)))])]}}])})],1),e._v(" "),n("pagination",{directives:[{name:"show",rawName:"v-show",value:e.total>0,expression:"total > 0"}],attrs:{total:e.total,page:e.listQuery.page,limit:e.listQuery.pageSize},on:{"update:page":function(t){return e.$set(e.listQuery,"page",t)},"update:limit":function(t){return e.$set(e.listQuery,"pageSize",t)},pagination:e.refresh}})],1)],1)},a=[],r=(n("ac6a"),n("333d")),o=n("c7a7"),s=n("7d09"),l=n("ed08"),u={components:{Pagination:r["a"]},directives:{waves:o["a"]},filters:{delFlagValueFilter:function(e){return-1===e?e="不可用":0===e&&(e="可用"),e},valueFilter:function(e){return e||"无"},timeFilter:function(e){return e?Object(l["d"])(e,"{y}-{m}-{d} {h}:{i}"):"无"}},data:function(){return{tableKey:0,listLoading:!0,listQuery:{},list:[],total:0,defaultSort:{},multipleSelection:[],series:{},seriesIds:[]}},mounted:function(){this.getList()},beforeRouteUpdate:function(e,t,n){if(e.path===t.path){var i=Object.assign({},e.query),a=Object.assign({},t.query);JSON.stringify(i)!==JSON.stringify(a)&&this.getList()}n()},methods:{handleSelectionChange:function(e){this.multipleSelection=e},sortChange:function(e){console.log("sortChange",e);var t=e.prop,n=e.order;this.sortBy(t,n)},sortBy:function(e,t){this.listQuery.sort="ascending"===t?"+".concat(e):"-".concat(e),this.handleFilter()},getList:function(){var e=this;this.listLoading=!0,Object(s["d"])(this.listQuery).then((function(t){var n=t.data,i=n.list,a=n.totalCount;e.list=i,e.total=a,e.listLoading=!1}))},refresh:function(){this.$router.push({path:"/configManagement/productSeries",query:this.listQuery})},addPage:function(){this.$router.push({path:"/configManagement/productSeries/add"})},editPage:function(){if(0!==this.multipleSelection.length)if(this.multipleSelection.length>1){var e="单选";this.$message({message:e,type:"error"})}else this.series=this.multipleSelection[0],this.$router.push({path:"/configManagement/productSeries/edit",query:{series:this.series}});else{var t="必须选一列";this.$message({message:t,type:"error"})}},deletePage:function(){var e=this;if(0!==this.multipleSelection.length)this.multipleSelection.forEach((function(t){e.seriesIds.push(t.seriesId)})),Object(s["b"])(this.seriesIds).then((function(t){e.getList()})),this.seriesIds=[];else{var t="必须选一列";this.$message({message:t,type:"error"})}},handleFilter:function(){console.log("handleFilter",this.listQuery),this.listQuery.page=1,this.refresh()}}},c=u,d=n("2877"),p=Object(d["a"])(c,i,a,!1,null,"c82aa268",null);t["default"]=p.exports},"333d":function(e,t,n){"use strict";var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"pagination-container",class:{hidden:e.hidden}},[n("el-pagination",e._b({attrs:{background:e.background,"current-page":e.currentPage,"page-size":e.pageSize,layout:e.layout,"page-sizes":e.pageSizes,total:e.total},on:{"update:currentPage":function(t){e.currentPage=t},"update:current-page":function(t){e.currentPage=t},"update:pageSize":function(t){e.pageSize=t},"update:page-size":function(t){e.pageSize=t},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}},"el-pagination",e.$attrs,!1))],1)},a=[];n("c5f6");Math.easeInOutQuad=function(e,t,n,i){return e/=i/2,e<1?n/2*e*e+t:(e--,-n/2*(e*(e-2)-1)+t)};var r=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();function o(e){document.documentElement.scrollTop=e,document.body.parentNode.scrollTop=e,document.body.scrollTop=e}function s(){return document.documentElement.scrollTop||document.body.parentNode.scrollTop||document.body.scrollTop}function l(e,t,n){var i=s(),a=e-i,l=20,u=0;t="undefined"===typeof t?500:t;var c=function e(){u+=l;var s=Math.easeInOutQuad(u,i,a,t);o(s),u<t?r(e):n&&"function"===typeof n&&n()};c()}var u={name:"Pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:20},pageSizes:{type:Array,default:function(){return[10,20,30,50]}},layout:{type:String,default:"total, sizes, prev, pager, next, jumper"},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1}},computed:{currentPage:{get:function(){return this.page},set:function(e){this.$emit("update:page",e)}},pageSize:{get:function(){return this.limit},set:function(e){this.$emit("update:limit",e)}}},methods:{handleSizeChange:function(e){this.$emit("pagination",{page:this.currentPage,limit:e}),this.autoScroll&&l(0,800)},handleCurrentChange:function(e){this.$emit("pagination",{page:e,limit:this.pageSize}),this.autoScroll&&l(0,800)}}},c=u,d=(n("1cc6"),n("2877")),p=Object(d["a"])(c,i,a,!1,null,"f3b72548",null);t["a"]=p.exports},"7d09":function(e,t,n){"use strict";n.d(t,"d",(function(){return a})),n.d(t,"a",(function(){return r})),n.d(t,"c",(function(){return o})),n.d(t,"b",(function(){return s}));n("55dd");var i=n("b775");function a(e){return Object(i["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function r(e){return Object(i["a"])({url:"/device/series/add",method:"post",data:e})}function o(e){return Object(i["a"])({url:"/device/series/edit",method:"post",data:e})}function s(e){return Object(i["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}},"8d41":function(e,t,n){},c7a7:function(e,t,n){"use strict";n("8d41");var i="@@wavesContext";function a(e,t){function n(n){var i=Object.assign({},t.value),a=Object.assign({ele:e,type:"hit",color:"rgba(0, 0, 0, 0.15)"},i),r=a.ele;if(r){r.style.position="relative",r.style.overflow="hidden";var o=r.getBoundingClientRect(),s=r.querySelector(".waves-ripple");switch(s?s.className="waves-ripple":(s=document.createElement("span"),s.className="waves-ripple",s.style.height=s.style.width=Math.max(o.width,o.height)+"px",r.appendChild(s)),a.type){case"center":s.style.top=o.height/2-s.offsetHeight/2+"px",s.style.left=o.width/2-s.offsetWidth/2+"px";break;default:s.style.top=(n.pageY-o.top-s.offsetHeight/2-document.documentElement.scrollTop||document.body.scrollTop)+"px",s.style.left=(n.pageX-o.left-s.offsetWidth/2-document.documentElement.scrollLeft||document.body.scrollLeft)+"px"}return s.style.backgroundColor=a.color,s.className="waves-ripple z-active",!1}}return e[i]?e[i].removeHandle=n:e[i]={removeHandle:n},n}t["a"]={bind:function(e,t){e.addEventListener("click",a(e,t),!1)},update:function(e,t){e.removeEventListener("click",e[i].removeHandle,!1),e.addEventListener("click",a(e,t),!1)},unbind:function(e){e.removeEventListener("click",e[i].removeHandle,!1),e[i]=null,delete e[i]}}}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-218bb4cf"],{"1c64":function(e,t,n){},"1cc6":function(e,t,n){"use strict";var i=n("1c64"),a=n.n(i);a.a},"2bee":function(e,t,n){"use strict";n.r(t);var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-header",[n("div",{staticStyle:{margin:"20px 0"}},[n("el-button",{on:{click:e.addPage}},[e._v("添加产品系列")]),e._v(" "),n("el-button",{on:{click:e.editPage}},[e._v("编辑产品系列")]),e._v(" "),n("el-button",{on:{click:e.deletePage}},[e._v("删除产品系列")])],1)]),e._v(" "),n("el-main",[n("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.listLoading,expression:"listLoading"}],key:e.tableKey,staticStyle:{width:"100%"},attrs:{data:e.list,border:"",fit:"","highlight-current-row":"","default-sort":e.defaultSort},on:{"sort-change":e.sortChange,"selection-change":e.handleSelectionChange}},[n("el-table-column",{attrs:{type:"selection",width:"55"}}),e._v(" "),n("el-table-column",{attrs:{label:"序号",prop:"seriesId",sortable:"custom",align:"center",width:"80"}}),e._v(" "),n("el-table-column",{attrs:{label:"产品系列号",prop:"seriesNum",width:"150",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"产品系列详情",prop:"remark",width:"300",align:"center"}}),e._v(" "),n("el-table-column",{attrs:{label:"时间",prop:"createTime",width:"100",align:"center"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row.createTime;return[n("span",[e._v(e._s(e._f("timeFilter")(i)))])]}}])})],1),e._v(" "),n("pagination",{directives:[{name:"show",rawName:"v-show",value:e.total>0,expression:"total > 0"}],attrs:{total:e.total,page:e.listQuery.page,limit:e.listQuery.pageSize},on:{"update:page":function(t){return e.$set(e.listQuery,"page",t)},"update:limit":function(t){return e.$set(e.listQuery,"pageSize",t)},pagination:e.refresh}})],1)],1)},a=[],r=(n("ac6a"),n("333d")),o=n("c7a7"),s=n("7d09"),l=n("ed08"),u={components:{Pagination:r["a"]},directives:{waves:o["a"]},filters:{delFlagValueFilter:function(e){return-1===e?e="不可用":0===e&&(e="可用"),e},valueFilter:function(e){return e||"无"},timeFilter:function(e){return e?Object(l["d"])(e,"{y}-{m}-{d} {h}:{i}"):"无"}},data:function(){return{tableKey:0,listLoading:!0,listQuery:{},list:[],total:0,defaultSort:{},multipleSelection:[],series:{},seriesIds:[]}},mounted:function(){this.getList()},beforeRouteUpdate:function(e,t,n){if(e.path===t.path){var i=Object.assign({},e.query),a=Object.assign({},t.query);JSON.stringify(i)!==JSON.stringify(a)&&this.getList()}n()},methods:{handleSelectionChange:function(e){this.multipleSelection=e},sortChange:function(e){console.log("sortChange",e);var t=e.prop,n=e.order;this.sortBy(t,n)},sortBy:function(e,t){this.listQuery.sort="ascending"===t?"+".concat(e):"-".concat(e),this.handleFilter()},getList:function(){var e=this;this.listLoading=!0,Object(s["e"])(this.listQuery).then((function(t){var n=t.data,i=n.list,a=n.totalCount;e.list=i,e.total=a,e.listLoading=!1}))},refresh:function(){this.$router.push({path:"/configManagement/productSeries",query:this.listQuery})},addPage:function(){this.$router.push({path:"/configManagement/productSeries/add"})},editPage:function(){if(0!==this.multipleSelection.length)if(this.multipleSelection.length>1){var e="单选";this.$message({message:e,type:"error"})}else this.series=this.multipleSelection[0],this.$router.push({path:"/configManagement/productSeries/edit",query:{series:this.series}});else{var t="必须选一列";this.$message({message:t,type:"error"})}},deletePage:function(){var e=this;if(0!==this.multipleSelection.length)this.multipleSelection.forEach((function(t){e.seriesIds.push(t.seriesId)})),Object(s["b"])(this.seriesIds).then((function(t){e.getList()})),this.seriesIds=[];else{var t="必须选一列";this.$message({message:t,type:"error"})}},handleFilter:function(){console.log("handleFilter",this.listQuery),this.listQuery.page=1,this.refresh()}}},c=u,d=n("2877"),p=Object(d["a"])(c,i,a,!1,null,"c82aa268",null);t["default"]=p.exports},"333d":function(e,t,n){"use strict";var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"pagination-container",class:{hidden:e.hidden}},[n("el-pagination",e._b({attrs:{background:e.background,"current-page":e.currentPage,"page-size":e.pageSize,layout:e.layout,"page-sizes":e.pageSizes,total:e.total},on:{"update:currentPage":function(t){e.currentPage=t},"update:current-page":function(t){e.currentPage=t},"update:pageSize":function(t){e.pageSize=t},"update:page-size":function(t){e.pageSize=t},"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}},"el-pagination",e.$attrs,!1))],1)},a=[];n("c5f6");Math.easeInOutQuad=function(e,t,n,i){return e/=i/2,e<1?n/2*e*e+t:(e--,-n/2*(e*(e-2)-1)+t)};var r=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||function(e){window.setTimeout(e,1e3/60)}}();function o(e){document.documentElement.scrollTop=e,document.body.parentNode.scrollTop=e,document.body.scrollTop=e}function s(){return document.documentElement.scrollTop||document.body.parentNode.scrollTop||document.body.scrollTop}function l(e,t,n){var i=s(),a=e-i,l=20,u=0;t="undefined"===typeof t?500:t;var c=function e(){u+=l;var s=Math.easeInOutQuad(u,i,a,t);o(s),u<t?r(e):n&&"function"===typeof n&&n()};c()}var u={name:"Pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:20},pageSizes:{type:Array,default:function(){return[10,20,30,50]}},layout:{type:String,default:"total, sizes, prev, pager, next, jumper"},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1}},computed:{currentPage:{get:function(){return this.page},set:function(e){this.$emit("update:page",e)}},pageSize:{get:function(){return this.limit},set:function(e){this.$emit("update:limit",e)}}},methods:{handleSizeChange:function(e){this.$emit("pagination",{page:this.currentPage,limit:e}),this.autoScroll&&l(0,800)},handleCurrentChange:function(e){this.$emit("pagination",{page:e,limit:this.pageSize}),this.autoScroll&&l(0,800)}}},c=u,d=(n("1cc6"),n("2877")),p=Object(d["a"])(c,i,a,!1,null,"f3b72548",null);t["a"]=p.exports},"7d09":function(e,t,n){"use strict";n.d(t,"e",(function(){return a})),n.d(t,"a",(function(){return r})),n.d(t,"c",(function(){return o})),n.d(t,"b",(function(){return s})),n.d(t,"d",(function(){return l}));n("55dd");var i=n("b775");function a(e){return Object(i["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function r(e){return Object(i["a"])({url:"/device/series/add",method:"post",data:e})}function o(e){return Object(i["a"])({url:"/device/series/edit",method:"post",data:e})}function s(e){return Object(i["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}function l(){return Object(i["a"])({url:"/device/series/listAll",method:"post"})}},"8d41":function(e,t,n){},c7a7:function(e,t,n){"use strict";n("8d41");var i="@@wavesContext";function a(e,t){function n(n){var i=Object.assign({},t.value),a=Object.assign({ele:e,type:"hit",color:"rgba(0, 0, 0, 0.15)"},i),r=a.ele;if(r){r.style.position="relative",r.style.overflow="hidden";var o=r.getBoundingClientRect(),s=r.querySelector(".waves-ripple");switch(s?s.className="waves-ripple":(s=document.createElement("span"),s.className="waves-ripple",s.style.height=s.style.width=Math.max(o.width,o.height)+"px",r.appendChild(s)),a.type){case"center":s.style.top=o.height/2-s.offsetHeight/2+"px",s.style.left=o.width/2-s.offsetWidth/2+"px";break;default:s.style.top=(n.pageY-o.top-s.offsetHeight/2-document.documentElement.scrollTop||document.body.scrollTop)+"px",s.style.left=(n.pageX-o.left-s.offsetWidth/2-document.documentElement.scrollLeft||document.body.scrollLeft)+"px"}return s.style.backgroundColor=a.color,s.className="waves-ripple z-active",!1}}return e[i]?e[i].removeHandle=n:e[i]={removeHandle:n},n}t["a"]={bind:function(e,t){e.addEventListener("click",a(e,t),!1)},update:function(e,t){e.removeEventListener("click",e[i].removeHandle,!1),e.addEventListener("click",a(e,t),!1)},unbind:function(e){e.removeEventListener("click",e[i].removeHandle,!1),e[i]=null,delete e[i]}}}}]);
\ No newline at end of file \ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-47af9ee4"],{"544f":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-container",[r("el-main",[r("el-form",{ref:"editSeries",attrs:{model:e.series,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{prop:"seriesNum",label:"产品系列号"}},[r("el-input",{model:{value:e.series.seriesNum,callback:function(t){e.$set(e.series,"seriesNum",t)},expression:"series.seriesNum"}})],1),e._v(" "),r("el-form-item",{attrs:{prop:"remark",label:"产品系列详情:"}},[r("el-input",{model:{value:e.series.remark,callback:function(t){e.$set(e.series,"remark",t)},expression:"series.remark"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("修改")]),e._v(" "),r("el-button",{on:{click:e.toSeriesList}},[e._v("取消")])],1)],1)],1)],1)},i=[],n=(r("ac6a"),r("456d"),r("7d09")),a=r("ed08"),o={seriesNum:"系列号",remark:"描述"},u={data:function(){var e=function(e,t,r){0===t.length?r(new Error(o[e.field]+"必须填写")):r()};return{loading:!1,series:{seriesNum:"",remark:""},rules:{seriesNum:[{validator:e}],remark:[{validator:e}]}}},mounted:function(){this.series=this.$route.query.series},methods:{setDefault:function(){this.$refs.editSeries.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.editSeries.validate((function(t,r){if(t)e.series.createTime=Object(a["d"])(e.series.createTime,"{y}-{m}-{d} {h}:{i}:{s}"),Object(n["c"])(e.series).then((function(t){var r=t.msg;e.$notify({title:"操作成功",message:r,type:"success",duration:2e3}),e.loading=!1,e.setDefault(),e.toSeriesList()})).catch((function(){e.loading=!1}));else{var s=r[Object.keys(r)[0]][0].message;e.$message({message:s,type:"error"}),e.loading=!1}})))},handleChange:function(e){var t=e.length;t-=1,this.dept.parentId=e[t]},toSeriesList:function(){this.$router.push({path:"/configManagement/productSeries"})}}},c=u,l=r("2877"),d=Object(l["a"])(c,s,i,!1,null,"65e88b04",null);t["default"]=d.exports},"7d09":function(e,t,r){"use strict";r.d(t,"d",(function(){return i})),r.d(t,"a",(function(){return n})),r.d(t,"c",(function(){return a})),r.d(t,"b",(function(){return o}));r("55dd");var s=r("b775");function i(e){return Object(s["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function n(e){return Object(s["a"])({url:"/device/series/add",method:"post",data:e})}function a(e){return Object(s["a"])({url:"/device/series/edit",method:"post",data:e})}function o(e){return Object(s["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-47af9ee4"],{"544f":function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-container",[r("el-main",[r("el-form",{ref:"editSeries",attrs:{model:e.series,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{prop:"seriesNum",label:"产品系列号"}},[r("el-input",{model:{value:e.series.seriesNum,callback:function(t){e.$set(e.series,"seriesNum",t)},expression:"series.seriesNum"}})],1),e._v(" "),r("el-form-item",{attrs:{prop:"remark",label:"产品系列详情:"}},[r("el-input",{model:{value:e.series.remark,callback:function(t){e.$set(e.series,"remark",t)},expression:"series.remark"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("修改")]),e._v(" "),r("el-button",{on:{click:e.toSeriesList}},[e._v("取消")])],1)],1)],1)],1)},i=[],n=(r("ac6a"),r("456d"),r("7d09")),a=r("ed08"),o={seriesNum:"系列号",remark:"描述"},u={data:function(){var e=function(e,t,r){0===t.length?r(new Error(o[e.field]+"必须填写")):r()};return{loading:!1,series:{seriesNum:"",remark:""},rules:{seriesNum:[{validator:e}],remark:[{validator:e}]}}},mounted:function(){this.series=this.$route.query.series},methods:{setDefault:function(){this.$refs.editSeries.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.editSeries.validate((function(t,r){if(t)e.series.createTime=Object(a["d"])(e.series.createTime,"{y}-{m}-{d} {h}:{i}:{s}"),Object(n["c"])(e.series).then((function(t){var r=t.msg;e.$notify({title:"操作成功",message:r,type:"success",duration:2e3}),e.loading=!1,e.setDefault(),e.toSeriesList()})).catch((function(){e.loading=!1}));else{var s=r[Object.keys(r)[0]][0].message;e.$message({message:s,type:"error"}),e.loading=!1}})))},handleChange:function(e){var t=e.length;t-=1,this.dept.parentId=e[t]},toSeriesList:function(){this.$router.push({path:"/configManagement/productSeries"})}}},c=u,l=r("2877"),d=Object(l["a"])(c,s,i,!1,null,"65e88b04",null);t["default"]=d.exports},"7d09":function(e,t,r){"use strict";r.d(t,"e",(function(){return i})),r.d(t,"a",(function(){return n})),r.d(t,"c",(function(){return a})),r.d(t,"b",(function(){return o})),r.d(t,"d",(function(){return u}));r("55dd");var s=r("b775");function i(e){return Object(s["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function n(e){return Object(s["a"])({url:"/device/series/add",method:"post",data:e})}function a(e){return Object(s["a"])({url:"/device/series/edit",method:"post",data:e})}function o(e){return Object(s["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}function u(){return Object(s["a"])({url:"/device/series/listAll",method:"post"})}}}]);
\ No newline at end of file \ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-636f8118"],{"7d09":function(e,t,r){"use strict";r.d(t,"e",(function(){return i})),r.d(t,"a",(function(){return n})),r.d(t,"c",(function(){return a})),r.d(t,"b",(function(){return o})),r.d(t,"d",(function(){return u}));r("55dd");var s=r("b775");function i(e){return Object(s["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function n(e){return Object(s["a"])({url:"/device/series/add",method:"post",data:e})}function a(e){return Object(s["a"])({url:"/device/series/edit",method:"post",data:e})}function o(e){return Object(s["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}function u(){return Object(s["a"])({url:"/device/series/listAll",method:"post"})}},ff07:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-container",[r("el-main",[r("el-form",{ref:"addSeries",attrs:{model:e.series,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{prop:"seriesNum",label:"产品系列号"}},[r("el-input",{model:{value:e.series.seriesNum,callback:function(t){e.$set(e.series,"seriesNum",t)},expression:"series.seriesNum"}})],1),e._v(" "),r("el-form-item",{attrs:{prop:"remark",label:"产品系列详情:"}},[r("el-input",{model:{value:e.series.remark,callback:function(t){e.$set(e.series,"remark",t)},expression:"series.remark"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("添加")]),e._v(" "),r("el-button",{on:{click:e.toSeriesList}},[e._v("取消")])],1)],1)],1)],1)},i=[],n=(r("ac6a"),r("456d"),r("7d09")),a={seriesNum:"系列号",remark:"描述"},o={data:function(){var e=function(e,t,r){0===t.length?r(new Error(a[e.field]+"必须填写")):r()};return{loading:!1,series:{seriesNum:"",remark:""},rules:{seriesNum:[{validator:e}],remark:[{validator:e}]}}},mounted:function(){},methods:{setDefault:function(){this.$refs.addSeries.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.addSeries.validate((function(t,r){if(t)Object(n["a"])(e.series).then((function(t){var r=t.msg;e.$notify({title:"操作成功",message:r,type:"success",duration:2e3}),e.loading=!1,e.setDefault(),e.toSeriesList()})).catch((function(){e.loading=!1}));else{var s=r[Object.keys(r)[0]][0].message;e.$message({message:s,type:"error"}),e.loading=!1}})))},toSeriesList:function(){this.$router.push({path:"/configManagement/productSeries"})}}},u=o,l=r("2877"),c=Object(l["a"])(u,s,i,!1,null,"2984fed9",null);t["default"]=c.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-636f8118"],{"7d09":function(e,t,r){"use strict";r.d(t,"d",(function(){return i})),r.d(t,"a",(function(){return n})),r.d(t,"c",(function(){return a})),r.d(t,"b",(function(){return o}));r("55dd");var s=r("b775");function i(e){return Object(s["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function n(e){return Object(s["a"])({url:"/device/series/add",method:"post",data:e})}function a(e){return Object(s["a"])({url:"/device/series/edit",method:"post",data:e})}function o(e){return Object(s["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}},ff07:function(e,t,r){"use strict";r.r(t);var s=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("el-container",[r("el-main",[r("el-form",{ref:"addSeries",attrs:{model:e.series,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{prop:"seriesNum",label:"产品系列号"}},[r("el-input",{model:{value:e.series.seriesNum,callback:function(t){e.$set(e.series,"seriesNum",t)},expression:"series.seriesNum"}})],1),e._v(" "),r("el-form-item",{attrs:{prop:"remark",label:"产品系列详情:"}},[r("el-input",{model:{value:e.series.remark,callback:function(t){e.$set(e.series,"remark",t)},expression:"series.remark"}})],1),e._v(" "),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("添加")]),e._v(" "),r("el-button",{on:{click:e.toSeriesList}},[e._v("取消")])],1)],1)],1)],1)},i=[],n=(r("ac6a"),r("456d"),r("7d09")),a={seriesNum:"系列号",remark:"描述"},o={data:function(){var e=function(e,t,r){0===t.length?r(new Error(a[e.field]+"必须填写")):r()};return{loading:!1,series:{seriesNum:"",remark:""},rules:{seriesNum:[{validator:e}],remark:[{validator:e}]}}},mounted:function(){this.selectDeptParent()},methods:{setDefault:function(){this.$refs.addSeries.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.addSeries.validate((function(t,r){if(t)Object(n["a"])(e.series).then((function(t){var r=t.msg;e.$notify({title:"操作成功",message:r,type:"success",duration:2e3}),e.loading=!1,e.setDefault(),e.toSeriesList()})).catch((function(){e.loading=!1}));else{var s=r[Object.keys(r)[0]][0].message;e.$message({message:s,type:"error"}),e.loading=!1}})))},toSeriesList:function(){this.$router.push({path:"/configManagement/productSeries"})}}},u=o,l=r("2877"),c=Object(l["a"])(u,s,i,!1,null,"1cf0be8b",null);t["default"]=c.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-21520446"],{ee7e:function(e,t,n){"use strict";n.r(t);var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-main",[n("el-form",{ref:"editDept",attrs:{model:e.dept,rules:e.rules,"label-width":"80px"}},[n("el-form-item",{attrs:{prop:"parentId",label:"父级"}},[n("el-cascader",{attrs:{"expand-trigger":"hover",options:e.options,"show-all-levels":!1,"change-on-select":""},on:{change:e.handleChange},model:{value:e.selectDeptParents,callback:function(t){e.selectDeptParents=t},expression:"selectDeptParents"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"name",label:"客户名称"}},[n("el-input",{model:{value:e.dept.name,callback:function(t){e.$set(e.dept,"name",t)},expression:"dept.name"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"delFlag",label:"可用"}},[n("el-select",{attrs:{placeholder:"选择"},model:{value:e.dept.delFlag,callback:function(t){e.$set(e.dept,"delFlag",t)},expression:"dept.delFlag"}},[n("el-option",{attrs:{label:"可用",value:"0"}}),e._v(" "),n("el-option",{attrs:{label:"不可用",value:"1"}})],1)],1),e._v(" "),n("el-form-item",{attrs:{prop:"distributorNum",label:"渠道商"}},[n("el-input",{model:{value:e.dept.distributorNum,callback:function(t){e.$set(e.dept,"distributorNum",t)},expression:"dept.distributorNum"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"remark",label:"描述"}},[n("el-input",{model:{value:e.dept.remark,callback:function(t){e.$set(e.dept,"remark",t)},expression:"dept.remark"}})],1),e._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("修改")]),e._v(" "),n("el-button",{on:{click:e.toDeptList}},[e._v("取消")])],1)],1)],1)],1)},a=[],i=(n("ac6a"),n("456d"),n("96cf"),n("3b8d")),s=n("fe05"),o=n("f62d"),u={parentId:"选择父级",name:"客户名称",delFlag:"可用",distributorNum:"渠道商号",remark:"描述"},l={data:function(){var e=function(e,t,n){0===t.length?n(new Error(u[e.field]+"必须填写")):n()};return{loading:!1,dept:{deptId:"",parentId:"",name:"",delFlag:"",distributorNum:"",remark:""},rules:{name:[{validator:e}],delFlag:[{validator:e}]},options:[],selectDeptParents:[]}},mounted:function(){this.dept=this.$route.query.dept,this.getFormData()},methods:{getFormData:function(){var e=Object(i["a"])(regeneratorRuntime.mark((function e(){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,this.selectDeptParent();case 2:return e.next=4,this.setSelectCas();case 4:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}(),setDefault:function(){this.$refs.editDept.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.editDept.validate((function(t,n){if(t)Object(s["d"])(e.dept).then((function(t){var n=t.msg;e.$notify({title:"操作成功",message:n,type:"success",duration:2e3}),e.loading=!1,e.setDefault(),e.toDeptList()})).catch((function(){e.loading=!1}));else{var r=n[Object.keys(n)[0]][0].message;e.$message({message:r,type:"error"}),e.loading=!1}})))},handleChange:function(e){var t=e.length;t-=1,this.dept.parentId=e[t]},toDeptList:function(){this.$router.push({path:"/system/dept"})},selectDeptParent:function(){var e=Object(i["a"])(regeneratorRuntime.mark((function e(){var t=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,Object(s["e"])().then((function(e){var n=e.data;t.options=n}));case 2:case"end":return e.stop()}}),e)})));function t(){return e.apply(this,arguments)}return t}(),setSelectCas:function(){var e=Object(i["a"])(regeneratorRuntime.mark((function e(){var t;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return t=[],e.next=3,Object(o["a"])(t,this.options,this.dept.parentId);case 3:this.selectDeptParents=t;case 4:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}()}},c=l,p=n("2877"),d=Object(p["a"])(c,r,a,!1,null,"2b6acf90",null);t["default"]=d.exports},f62d:function(e,t,n){"use strict";n.d(t,"a",(function(){return a}));n("96cf");var r=n("3b8d");n("ac6a");function a(e,t,n){return i.apply(this,arguments)}function i(){return i=Object(r["a"])(regeneratorRuntime.mark((function e(t,n,r){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:n.forEach((function(e){return e.value===r?(t.unshift(e.value),t):0===e.children.length?null:void a(t,e.children,r).then((function(){t.unshift(e.value)}))}));case 1:case"end":return e.stop()}}),e)}))),i.apply(this,arguments)}},fe05:function(e,t,n){"use strict";n.d(t,"c",(function(){return a})),n.d(t,"e",(function(){return i})),n.d(t,"f",(function(){return s})),n.d(t,"a",(function(){return o})),n.d(t,"d",(function(){return u})),n.d(t,"b",(function(){return l}));n("55dd");var r=n("b775");function a(e){return Object(r["a"])({url:"/sys/dept/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function i(){return Object(r["a"])({url:"/sys/dept/listAll",method:"post"})}function s(){return Object(r["a"])({url:"/sys/dept/listAllTree",method:"post"})}function o(e){return Object(r["a"])({url:"/sys/dept/add",method:"post",data:e})}function u(e){return Object(r["a"])({url:"/sys/dept/edit",method:"post",data:e})}function l(e){return Object(r["a"])({url:"/sys/dept/delete",method:"post",data:{ids:e}})}}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-79a85582"],{ee7e:function(e,t,n){"use strict";n.r(t);var r=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-main",[n("el-form",{ref:"editDept",attrs:{model:e.dept,rules:e.rules,"label-width":"80px"}},[n("el-form-item",{attrs:{prop:"parentId",label:"父级"}},[n("el-cascader",{attrs:{"expand-trigger":"hover",options:e.options,"show-all-levels":!1,"change-on-select":""},on:{change:e.handleChange},model:{value:e.selectDeptParents,callback:function(t){e.selectDeptParents=t},expression:"selectDeptParents"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"name",label:"客户名称"}},[n("el-input",{model:{value:e.dept.name,callback:function(t){e.$set(e.dept,"name",t)},expression:"dept.name"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"delFlag",label:"可用"}},[n("el-select",{attrs:{placeholder:"选择"},model:{value:e.dept.delFlag,callback:function(t){e.$set(e.dept,"delFlag",t)},expression:"dept.delFlag"}},[n("el-option",{attrs:{label:"可用",value:"0"}}),e._v(" "),n("el-option",{attrs:{label:"不可用",value:"1"}})],1)],1),e._v(" "),n("el-form-item",{attrs:{prop:"distributorNum",label:"渠道商"}},[n("el-input",{model:{value:e.dept.distributorNum,callback:function(t){e.$set(e.dept,"distributorNum",t)},expression:"dept.distributorNum"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"remark",label:"描述"}},[n("el-input",{model:{value:e.dept.remark,callback:function(t){e.$set(e.dept,"remark",t)},expression:"dept.remark"}})],1),e._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("修改")]),e._v(" "),n("el-button",{on:{click:e.toDeptList}},[e._v("取消")])],1)],1)],1)],1)},a=[],i=(n("ac6a"),n("456d"),n("96cf"),n("3b8d")),s=n("fe05"),o=n("f62d"),u={parentId:"选择父级",name:"客户名称",delFlag:"可用",distributorNum:"渠道商号",remark:"描述"},l={data:function(){var e=function(e,t,n){0===t.length?n(new Error(u[e.field]+"必须填写")):n()};return{loading:!1,dept:{deptId:"",parentId:"",name:"",delFlag:"",distributorNum:"",remark:""},rules:{name:[{validator:e}],delFlag:[{validator:e}]},options:[],selectDeptParents:[]}},mounted:function(){this.dept=this.$route.query.dept,this.getFormData()},methods:{getFormData:function(){var e=Object(i["a"])(regeneratorRuntime.mark((function e(){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,this.selectDeptParent();case 2:return e.next=4,this.setSelectCas();case 4:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}(),setDefault:function(){this.$refs.editDept.resetFields()},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.editDept.validate((function(t,n){if(t)Object(s["d"])(e.dept).then((function(t){var n=t.msg;e.$notify({title:"操作成功",message:n,type:"success",duration:2e3}),e.loading=!1,e.setDefault(),e.toDeptList()})).catch((function(){e.loading=!1}));else{var r=n[Object.keys(n)[0]][0].message;e.$message({message:r,type:"error"}),e.loading=!1}})))},handleChange:function(e){var t=e.length;t-=1,this.dept.parentId=e[t]},toDeptList:function(){this.$router.push({path:"/system/dept"})},selectDeptParent:function(){var e=Object(i["a"])(regeneratorRuntime.mark((function e(){var t=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,Object(s["e"])().then((function(e){var n=e.data;t.options=n}));case 2:case"end":return e.stop()}}),e)})));function t(){return e.apply(this,arguments)}return t}(),setSelectCas:function(){var e=Object(i["a"])(regeneratorRuntime.mark((function e(){var t;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return t=[],e.next=3,Object(o["a"])(t,this.options,this.dept.parentId);case 3:this.selectDeptParents=t;case 4:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}()}},c=l,p=n("2877"),d=Object(p["a"])(c,r,a,!1,null,"2b6acf90",null);t["default"]=d.exports},f62d:function(e,t,n){"use strict";n.d(t,"a",(function(){return a}));n("96cf");var r=n("3b8d");n("ac6a");function a(e,t,n){return i.apply(this,arguments)}function i(){return i=Object(r["a"])(regeneratorRuntime.mark((function e(t,n,r){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:n.forEach((function(e){return e.value===r?(t.unshift(e.value),t):0===e.children.length?null:void a(t,e.children,r).then((function(){t.unshift(e.value)}))}));case 1:case"end":return e.stop()}}),e)}))),i.apply(this,arguments)}},fe05:function(e,t,n){"use strict";n.d(t,"c",(function(){return a})),n.d(t,"e",(function(){return i})),n.d(t,"f",(function(){return s})),n.d(t,"a",(function(){return o})),n.d(t,"d",(function(){return u})),n.d(t,"b",(function(){return l}));n("55dd");var r=n("b775");function a(e){return Object(r["a"])({url:"/sys/dept/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function i(){return Object(r["a"])({url:"/sys/dept/listAll",method:"post"})}function s(){return Object(r["a"])({url:"/sys/dept/listAllTree",method:"post"})}function o(e){return Object(r["a"])({url:"/sys/dept/add",method:"post",data:e})}function u(e){return Object(r["a"])({url:"/sys/dept/edit",method:"post",data:e})}function l(e){return Object(r["a"])({url:"/sys/dept/delete",method:"post",data:{ids:e}})}}}]);
\ No newline at end of file \ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-acf60ff8"],{"7d09":function(e,t,n){"use strict";n.d(t,"e",(function(){return r})),n.d(t,"a",(function(){return s})),n.d(t,"c",(function(){return a})),n.d(t,"b",(function(){return c})),n.d(t,"d",(function(){return o}));n("55dd");var i=n("b775");function r(e){return Object(i["a"])({url:"/device/series/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function s(e){return Object(i["a"])({url:"/device/series/add",method:"post",data:e})}function a(e){return Object(i["a"])({url:"/device/series/edit",method:"post",data:e})}function c(e){return Object(i["a"])({url:"/device/series/delete",method:"post",data:{ids:e}})}function o(){return Object(i["a"])({url:"/device/series/listAll",method:"post"})}},aa98:function(e,t,n){"use strict";n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return s})),n.d(t,"e",(function(){return a})),n.d(t,"a",(function(){return c})),n.d(t,"d",(function(){return o}));n("55dd");var i=n("b775");function r(e){return Object(i["a"])({url:"/device/device/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function s(e){return Object(i["a"])({url:"/device/device/importDevice",method:"post",data:e})}function a(e){return Object(i["a"])({url:"/device/device/updateDeviceSeriesBatch",method:"post",data:e})}function c(e){return Object(i["a"])({url:"/device/device/delete",method:"post",data:{ids:e}})}function o(e){return Object(i["a"])({url:"/device/device/saveChannel",method:"post",data:e})}},bf40:function(e,t,n){"use strict";n.r(t);var i=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-container",[n("el-main",[n("el-form",{ref:"importDevice",attrs:{model:e.device,rules:e.rules,"label-width":"80px"}},[n("el-form-item",{attrs:{prop:"deptId",label:"所属部门"}},[n("el-cascader",{attrs:{"expand-trigger":"hover",options:e.options,"show-all-levels":!1,"change-on-select":""},on:{change:e.handleChange},model:{value:e.selectDeptParents,callback:function(t){e.selectDeptParents=t},expression:"selectDeptParents"}})],1),e._v(" "),n("el-form-item",{attrs:{prop:"seriesId",label:"所属系列"}},[n("el-select",{attrs:{placeholder:"请选择"},model:{value:e.device.seriesId,callback:function(t){e.$set(e.device,"seriesId",t)},expression:"device.seriesId"}},e._l(e.selectSeriesOptions,(function(e){return n("el-option",{key:e.seriesId,attrs:{label:e.seriesNum,value:e.seriesId}})})),1)],1),e._v(" "),e._l(e.device.imeis,(function(t,i){return n("el-form-item",{key:i,attrs:{label:"第"+(i+1)+"个imei: ",prop:"imeis."+i+".value","label-width":"20"}},[n("el-row",[n("el-col",{attrs:{span:14}},[n("el-input",{model:{value:t.value,callback:function(n){e.$set(t,"value",n)},expression:"imei.value"}})],1),e._v(" "),n("el-col",{attrs:{span:5}},[n("el-button",{on:{click:function(n){return n.preventDefault(),e.removeImeis(t)}}},[e._v("\n 删除\n ")])],1)],1)],1)})),e._v(" "),n("el-form-item",[n("el-button",{attrs:{type:"primary"},on:{click:e.onSubmit}},[e._v("添加")]),e._v(" "),n("el-button",{on:{click:e.addImeis}},[e._v("新增imei")]),e._v(" "),n("el-button",{on:{click:e.toDeviceList}},[e._v("取消")])],1)],2)],1)],1)},r=[],s=(n("456d"),n("ac6a"),n("96cf"),n("3b8d")),a=n("fe05"),c=n("7d09"),o=n("aa98"),u={deptId:"部门Id",seriesId:"系列号",imeis:"imeis"},d={data:function(){var e=function(e,t,n){void 0===t||null===t||0===t.length?n(new Error(u[e.field]+"必须填写")):n()};return{loading:!1,device:{deptIdList:[],seriesIdList:[],imeis:[{value:""}]},rules:{deptId:[{validator:e}],seriesId:[{validator:e}]},options:[],selectSeriesOptions:[],selectDeptParents:[],defaultProps:{children:"children",label:"label"}}},mounted:function(){this.getFormData()},methods:{getFormData:function(){var e=Object(s["a"])(regeneratorRuntime.mark((function e(){return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,this.selectDeptParent();case 2:return e.next=4,this.selectSeries();case 4:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}(),setDefault:function(){this.$refs.device=[]},onSubmit:function(){var e=this;this.loading||(this.loading=!0,this.$refs.importDevice.validate((function(t,n){if(t){var i=e.device.imeis;e.device.imeis=[],i.forEach((function(t){e.device.imeis.push(t.value)})),Object(o["c"])(e.device).then((function(t){var n=t.msg;e.$notify({title:"操作成功",message:n,type:"success",duration:2e3}),e.setDefault(),e.toDeviceList(),e.loading=!1})).catch((function(t){console.log(t),e.loading=!1}))}else{var r=n[Object.keys(n)[0]][0].message;e.$message({message:r,type:"error"}),e.loading=!1}})))},toDeviceList:function(){this.$router.push({path:"/deviceManagement/device"})},selectSeries:function(){var e=Object(s["a"])(regeneratorRuntime.mark((function e(){var t=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,Object(c["d"])().then((function(e){var n=e.data;t.selectSeriesOptions=n}));case 2:case"end":return e.stop()}}),e)})));function t(){return e.apply(this,arguments)}return t}(),selectDeptParent:function(){var e=Object(s["a"])(regeneratorRuntime.mark((function e(){var t=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return e.next=2,Object(a["e"])().then((function(e){var n=e.data;t.options=n}));case 2:case"end":return e.stop()}}),e)})));function t(){return e.apply(this,arguments)}return t}(),handleChange:function(e){var t=e.length;t-=1,this.device.deptId=e[t]},addImeis:function(){this.device.imeis.push({value:""})},removeImeis:function(e){var t=this.device.imeis.indexOf(e);-1!==t&&this.device.imeis.splice(t,1)}}},l=d,p=n("2877"),f=Object(p["a"])(l,i,r,!1,null,"675253c4",null);t["default"]=f.exports},fe05:function(e,t,n){"use strict";n.d(t,"c",(function(){return r})),n.d(t,"e",(function(){return s})),n.d(t,"f",(function(){return a})),n.d(t,"a",(function(){return c})),n.d(t,"d",(function(){return o})),n.d(t,"b",(function(){return u}));n("55dd");var i=n("b775");function r(e){return Object(i["a"])({url:"/sys/dept/list",method:"post",params:{page:e.page,pageSize:e.pageSize,sort:e.sort}})}function s(){return Object(i["a"])({url:"/sys/dept/listAll",method:"post"})}function a(){return Object(i["a"])({url:"/sys/dept/listAllTree",method:"post"})}function c(e){return Object(i["a"])({url:"/sys/dept/add",method:"post",data:e})}function o(e){return Object(i["a"])({url:"/sys/dept/edit",method:"post",data:e})}function u(e){return Object(i["a"])({url:"/sys/dept/delete",method:"post",data:{ids:e}})}}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-e19c4374"],{11731:function(e,t,a){},"589d":function(e,t,a){},"9a8b":function(e,t,a){"use strict";var l=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-form",{ref:"postForm",attrs:{model:e.postForm,rules:e.rules}},[a("sticky",{attrs:{"class-name":"sub-navbar"}},[e.isEdit?e._e():a("el-button",{on:{click:e.showGuide}},[e._v("显示帮助")]),e._v(" "),a("el-button",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticStyle:{"margin-left":"10px"},attrs:{type:"success"},on:{click:e.submitForm}},[e._v("\n "+e._s(e.isEdit?"编辑电子书":"新增电子书")+"\n ")])],1),e._v(" "),a("div",{staticClass:"detail-container"},[a("el-row",[a("warning"),e._v(" "),a("el-col",{attrs:{span:24}},[a("ebook-upload",{attrs:{"file-list":e.fileList,disabled:e.isEdit},on:{onSuccess:e.onUploadSuccess,onRemove:e.onUploadRemove}})],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{prop:"title"}},[a("MdInput",{attrs:{maxlength:100,name:"name",required:""},model:{value:e.postForm.title,callback:function(t){e.$set(e.postForm,"title",t)},expression:"postForm.title"}},[e._v("\n 书名\n ")])],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"author",label:"作者:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"作者"},model:{value:e.postForm.author,callback:function(t){e.$set(e.postForm,"author",t)},expression:"postForm.author"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"publisher",label:"出版社:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"出版社"},model:{value:e.postForm.publisher,callback:function(t){e.$set(e.postForm,"publisher",t)},expression:"postForm.publisher"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"language",label:"语言:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"语言"},model:{value:e.postForm.language,callback:function(t){e.$set(e.postForm,"language",t)},expression:"postForm.language"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"rootFile",label:"根文件:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"根文件",disabled:""},model:{value:e.postForm.rootFile,callback:function(t){e.$set(e.postForm,"rootFile",t)},expression:"postForm.rootFile"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"filePath",label:"文件路径:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"文件路径",disabled:""},model:{value:e.postForm.filePath,callback:function(t){e.$set(e.postForm,"filePath",t)},expression:"postForm.filePath"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"unzipPath",label:"解压路径:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"解压路径",disabled:""},model:{value:e.postForm.unzipPath,callback:function(t){e.$set(e.postForm,"unzipPath",t)},expression:"postForm.unzipPath"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"coverPath",label:"封面路径:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"封面路径",disabled:""},model:{value:e.postForm.coverPath,callback:function(t){e.$set(e.postForm,"coverPath",t)},expression:"postForm.coverPath"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"originalName",label:"文件名称:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"文件名称",disabled:""},model:{value:e.postForm.originalName,callback:function(t){e.$set(e.postForm,"originalName",t)},expression:"postForm.originalName"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{prop:"cover",label:"封面:","label-width":e.labelWidth}},[e.postForm.cover?a("a",{attrs:{href:e.postForm.cover,target:"_blank"}},[a("img",{staticClass:"preview-img",attrs:{src:e.postForm.cover}})]):a("span",[e._v("无")])])],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"目录:","label-width":e.labelWidth}},[e.contentsTree&&e.contentsTree.length>0?a("div",{staticClass:"contents-wrapper"},[a("el-tree",{attrs:{data:e.contentsTree},on:{"node-click":e.onContentClick}})],1):a("span",[e._v("无")])])],1)],1)],1)],1)],1)],1)},o=[],n=(a("ac6a"),a("456d"),a("db72")),i=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{style:{height:e.height+"px",zIndex:e.zIndex}},[a("div",{class:e.className,style:{top:e.isSticky?e.stickyTop+"px":"",zIndex:e.zIndex,position:e.position,width:e.width,height:e.height+"px"}},[e._t("default",[a("div",[e._v("sticky")])])],2)])},r=[],s=(a("c5f6"),{name:"Sticky",props:{stickyTop:{type:Number,default:0},zIndex:{type:Number,default:1},className:{type:String,default:""}},data:function(){return{active:!1,position:"",width:void 0,height:void 0,isSticky:!1}},mounted:function(){this.height=this.$el.getBoundingClientRect().height,window.addEventListener("scroll",this.handleScroll),window.addEventListener("resize",this.handleResize)},activated:function(){this.handleScroll()},destroyed:function(){window.removeEventListener("scroll",this.handleScroll),window.removeEventListener("resize",this.handleResize)},methods:{sticky:function(){this.active||(this.position="fixed",this.active=!0,this.width=this.width+"px",this.isSticky=!0)},handleReset:function(){this.active&&this.reset()},reset:function(){this.position="",this.width="auto",this.active=!1,this.isSticky=!1},handleScroll:function(){var e=this.$el.getBoundingClientRect().width;this.width=e||"auto";var t=this.$el.getBoundingClientRect().top;t<this.stickyTop?this.sticky():this.handleReset()},handleResize:function(){this.isSticky&&(this.width=this.$el.getBoundingClientRect().width+"px")}}}),u=s,c=a("2877"),d=Object(c["a"])(u,i,r,!1,null,null,null),p=d.exports,m=function(){var e=this,t=e.$createElement;e._self._c;return e._m(0)},h=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("aside",[e._v("\n 上传电子书分为两步:上传电子书和新增电子书。首先需要上传epub电子书文件,服务器会对epub文件进行解析,解析成功后会将电子书的各字段填入表单,之后我们只需要手动点击新增电子书即可完成电子书的保存。查看\n "),a("a",{attrs:{href:"https://www.youbaobao.xyz/admin-docs/",target:"_blank"}},[e._v("\n 课程官网\n ")]),e._v("\n 获取更多开发指引。\n")])}],f={},v=Object(c["a"])(f,m,h,!1,null,null,null),b=v.exports,g=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"upload-container"},[a("el-upload",{staticClass:"image-upload",attrs:{action:e.action,headers:e.headers,multiple:!1,limit:1,"before-upload":e.beforeUpload,"on-success":e.onSuccess,"on-error":e.onError,"on-remove":e.onRemove,"file-list":e.fileList,"on-exceed":e.onExceed,disabled:e.disabled,drag:"","show-file-list":"",accept:"application/epub+zip"}},[a("i",{staticClass:"el-icon-upload"}),e._v(" "),0===e.fileList.length?a("div",{staticClass:"el-upload__text"},[e._v("\n 请将电子书拖入或 "),a("em",[e._v("点击上传")])]):a("div",{staticClass:"el-upload__text"},[e._v("图书已上传")])])],1)},_=[],y=a("5f87"),w={props:{fileList:{type:Array,default:function(){return[]}},disabled:{type:Boolean,default:!1}},data:function(){return{action:"".concat("http://localhost:9000","/book/upload")}},computed:{headers:function(){return{Authorization:"Bearer ".concat(Object(y["a"])())}}},methods:{beforeUpload:function(e){this.$emit("beforeUpload",e)},onSuccess:function(e,t){console.log(e,t);var a=e.code,l=e.msg,o=e.data;0===a?(this.$message({message:l,type:"success"}),this.$emit("onSuccess",o)):(this.$message({message:l&&"上传失败,失败原因:".concat(l)||"上传失败",type:"error"}),this.$emit("onError",t))},onError:function(e){var t=e.message&&JSON.parse(e.message);this.$message({message:t&&t.msg&&"上传失败,失败原因:".concat(t.msg)||"上传失败",type:"error"}),this.$emit("onError",e)},onRemove:function(){this.$message({message:"电子书删除成功",type:"success"}),this.$emit("onRemove")},onExceed:function(){this.$message({message:"每次只能上传一本电子书",type:"warning"})}}},x=w,F=Object(c["a"])(x,g,_,!1,null,"b6961bd4",null),$=F.exports,k=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"material-input__component",class:e.computedClasses},[a("div",{class:{iconClass:e.icon}},[e.icon?a("i",{staticClass:"el-input__icon material-input__icon",class:["el-icon-"+e.icon]}):e._e(),e._v(" "),"email"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,required:e.required,type:"email"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"url"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,required:e.required,type:"url"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"number"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,step:e.step,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,max:e.max,min:e.min,minlength:e.minlength,maxlength:e.maxlength,required:e.required,type:"number"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"password"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,max:e.max,min:e.min,required:e.required,type:"password"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"tel"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,required:e.required,type:"tel"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"text"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,minlength:e.minlength,maxlength:e.maxlength,required:e.required,type:"text"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),a("span",{staticClass:"material-input-bar"}),e._v(" "),a("label",{staticClass:"material-label"},[e._t("default")],2)])])},C=[],P={name:"MdInput",props:{icon:String,name:String,type:{type:String,default:"text"},value:[String,Number],placeholder:String,readonly:Boolean,disabled:Boolean,min:String,max:String,step:String,minlength:Number,maxlength:Number,required:{type:Boolean,default:!0},autoComplete:{type:String,default:"off"},validateEvent:{type:Boolean,default:!0}},data:function(){return{currentValue:this.value,focus:!1,fillPlaceHolder:null}},computed:{computedClasses:function(){return{"material--active":this.focus,"material--disabled":this.disabled,"material--raised":Boolean(this.focus||this.currentValue)}}},watch:{value:function(e){this.currentValue=e}},methods:{handleModelInput:function(e){var t=e.target.value;this.$emit("input",t),"ElFormItem"===this.$parent.$options.componentName&&this.validateEvent&&this.$parent.$emit("el.form.change",[t]),this.$emit("change",t)},handleMdFocus:function(e){this.focus=!0,this.$emit("focus",e),this.placeholder&&""!==this.placeholder&&(this.fillPlaceHolder=this.placeholder)},handleMdBlur:function(e){this.focus=!1,this.$emit("blur",e),this.fillPlaceHolder=null,"ElFormItem"===this.$parent.$options.componentName&&this.validateEvent&&this.$parent.$emit("el.form.blur",[this.currentValue])}}},S=P,E=(a("ad53"),Object(c["a"])(S,k,C,!1,null,"d9b004ee",null)),N=E.exports,V=a("b067"),M={title:"书名",author:"作者",publisher:"出版社",language:"语言"},B={components:{MdInput:N,Sticky:p,Warning:b,EbookUpload:$},props:{isEdit:Boolean},data:function(){var e=function(e,t,a){0===t.length?a(new Error(M[e.field]+"必须填写")):a()};return{loading:!1,postForm:{},fileList:[],labelWidth:"120px",contentsTree:[],rules:{title:[{validator:e}],author:[{validator:e}],language:[{validator:e}],publisher:[{validator:e}]}}},created:function(){if(this.isEdit){var e=this.$route.params.fileName;this.getBookData(e)}},methods:{getBookData:function(e){var t=this;Object(V["c"])(e).then((function(e){t.setData(e.data)}))},onContentClick:function(e){console.log(e),e.text&&window.open(e.text)},setDefault:function(){this.contentsTree=[],this.fileList=[],this.$refs.postForm.resetFields()},setData:function(e){var t=e.title,a=e.author,l=e.publisher,o=e.language,i=e.rootFile,r=e.cover,s=e.url,u=e.originalName,c=e.contents,d=e.contentsTree,p=e.fileName,m=e.coverPath,h=e.filePath,f=e.unzipPath;this.postForm=Object(n["a"])({},this.postForm,{title:t,author:a,publisher:l,language:o,rootFile:i,cover:r,url:s,originalName:u,contents:c,contentsTree:d,fileName:p,coverPath:m,filePath:h,unzipPath:f}),this.contentsTree=d,this.fileList=[{name:u||p,url:s}]},onUploadSuccess:function(e){console.log("onUploadSuccess",e),this.setData(e)},onUploadRemove:function(){this.setDefault()},submitForm:function(){var e=this,t=function(t){var a=t.msg;e.$notify({title:"操作成功",message:a,type:"success",duration:2e3}),e.loading=!1};this.loading||(this.loading=!0,this.$refs.postForm.validate((function(a,l){if(console.log(a,l),a){var o=Object.assign({},e.postForm);delete o.contentsTree,e.isEdit?Object(V["f"])(o).then((function(e){t(e)})).catch((function(){e.loading=!1})):Object(V["a"])(o).then((function(a){t(a),e.setDefault()})).catch((function(){e.loading=!1}))}else{var n=l[Object.keys(l)[0]][0].message;e.$message({message:n,type:"error"}),e.loading=!1}})))},showGuide:function(){console.log("show guide...")}}},z=B,O=(a("e120"),Object(c["a"])(z,l,o,!1,null,"96296cca",null));t["a"]=O.exports},ad53:function(e,t,a){"use strict";var l=a("589d"),o=a.n(l);o.a},b067:function(e,t,a){"use strict";a.d(t,"a",(function(){return o})),a.d(t,"f",(function(){return n})),a.d(t,"c",(function(){return i})),a.d(t,"d",(function(){return r})),a.d(t,"e",(function(){return s})),a.d(t,"b",(function(){return u}));var l=a("b775");function o(e){return Object(l["a"])({url:"/book/create",method:"post",data:e})}function n(e){return Object(l["a"])({url:"/book/update",method:"post",data:e})}function i(e){return Object(l["a"])({url:"/book/get",method:"get",params:{fileName:e}})}function r(){return Object(l["a"])({url:"/book/category",method:"get"})}function s(e){return Object(l["a"])({url:"/book/list",method:"get",params:e})}function u(e){return Object(l["a"])({url:"/book/delete",method:"get",params:{fileName:e}})}},e120:function(e,t,a){"use strict";var l=a("11731"),o=a.n(l);o.a}}]); (window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-e19c4374"],{11731:function(e,t,a){},"589d":function(e,t,a){},"9a8b":function(e,t,a){"use strict";var l=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("el-form",{ref:"postForm",attrs:{model:e.postForm,rules:e.rules}},[a("sticky",{attrs:{"class-name":"sub-navbar"}},[e.isEdit?e._e():a("el-button",{on:{click:e.showGuide}},[e._v("显示帮助")]),e._v(" "),a("el-button",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticStyle:{"margin-left":"10px"},attrs:{type:"success"},on:{click:e.submitForm}},[e._v("\n "+e._s(e.isEdit?"编辑电子书":"新增电子书")+"\n ")])],1),e._v(" "),a("div",{staticClass:"detail-container"},[a("el-row",[a("warning"),e._v(" "),a("el-col",{attrs:{span:24}},[a("ebook-upload",{attrs:{"file-list":e.fileList,disabled:e.isEdit},on:{onSuccess:e.onUploadSuccess,onRemove:e.onUploadRemove}})],1),e._v(" "),a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{prop:"title"}},[a("MdInput",{attrs:{maxlength:100,name:"name",required:""},model:{value:e.postForm.title,callback:function(t){e.$set(e.postForm,"title",t)},expression:"postForm.title"}},[e._v("\n 书名\n ")])],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"author",label:"作者:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"作者"},model:{value:e.postForm.author,callback:function(t){e.$set(e.postForm,"author",t)},expression:"postForm.author"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"publisher",label:"出版社:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"出版社"},model:{value:e.postForm.publisher,callback:function(t){e.$set(e.postForm,"publisher",t)},expression:"postForm.publisher"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"language",label:"语言:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"语言"},model:{value:e.postForm.language,callback:function(t){e.$set(e.postForm,"language",t)},expression:"postForm.language"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"rootFile",label:"根文件:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"根文件",disabled:""},model:{value:e.postForm.rootFile,callback:function(t){e.$set(e.postForm,"rootFile",t)},expression:"postForm.rootFile"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"filePath",label:"文件路径:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"文件路径",disabled:""},model:{value:e.postForm.filePath,callback:function(t){e.$set(e.postForm,"filePath",t)},expression:"postForm.filePath"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"unzipPath",label:"解压路径:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"解压路径",disabled:""},model:{value:e.postForm.unzipPath,callback:function(t){e.$set(e.postForm,"unzipPath",t)},expression:"postForm.unzipPath"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"coverPath",label:"封面路径:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"封面路径",disabled:""},model:{value:e.postForm.coverPath,callback:function(t){e.$set(e.postForm,"coverPath",t)},expression:"postForm.coverPath"}})],1)],1),e._v(" "),a("el-col",{attrs:{span:12}},[a("el-form-item",{attrs:{prop:"originalName",label:"文件名称:","label-width":e.labelWidth}},[a("el-input",{attrs:{placeholder:"文件名称",disabled:""},model:{value:e.postForm.originalName,callback:function(t){e.$set(e.postForm,"originalName",t)},expression:"postForm.originalName"}})],1)],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{prop:"cover",label:"封面:","label-width":e.labelWidth}},[e.postForm.cover?a("a",{attrs:{href:e.postForm.cover,target:"_blank"}},[a("img",{staticClass:"preview-img",attrs:{src:e.postForm.cover}})]):a("span",[e._v("无")])])],1)],1),e._v(" "),a("el-row",[a("el-col",{attrs:{span:24}},[a("el-form-item",{attrs:{label:"目录:","label-width":e.labelWidth}},[e.contentsTree&&e.contentsTree.length>0?a("div",{staticClass:"contents-wrapper"},[a("el-tree",{attrs:{data:e.contentsTree},on:{"node-click":e.onContentClick}})],1):a("span",[e._v("无")])])],1)],1)],1)],1)],1)],1)},o=[],n=(a("ac6a"),a("456d"),a("db72")),i=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{style:{height:e.height+"px",zIndex:e.zIndex}},[a("div",{class:e.className,style:{top:e.isSticky?e.stickyTop+"px":"",zIndex:e.zIndex,position:e.position,width:e.width,height:e.height+"px"}},[e._t("default",[a("div",[e._v("sticky")])])],2)])},r=[],s=(a("c5f6"),{name:"Sticky",props:{stickyTop:{type:Number,default:0},zIndex:{type:Number,default:1},className:{type:String,default:""}},data:function(){return{active:!1,position:"",width:void 0,height:void 0,isSticky:!1}},mounted:function(){this.height=this.$el.getBoundingClientRect().height,window.addEventListener("scroll",this.handleScroll),window.addEventListener("resize",this.handleResize)},activated:function(){this.handleScroll()},destroyed:function(){window.removeEventListener("scroll",this.handleScroll),window.removeEventListener("resize",this.handleResize)},methods:{sticky:function(){this.active||(this.position="fixed",this.active=!0,this.width=this.width+"px",this.isSticky=!0)},handleReset:function(){this.active&&this.reset()},reset:function(){this.position="",this.width="auto",this.active=!1,this.isSticky=!1},handleScroll:function(){var e=this.$el.getBoundingClientRect().width;this.width=e||"auto";var t=this.$el.getBoundingClientRect().top;t<this.stickyTop?this.sticky():this.handleReset()},handleResize:function(){this.isSticky&&(this.width=this.$el.getBoundingClientRect().width+"px")}}}),u=s,c=a("2877"),d=Object(c["a"])(u,i,r,!1,null,null,null),p=d.exports,m=function(){var e=this,t=e.$createElement;e._self._c;return e._m(0)},h=[function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("aside",[e._v("\n 上传电子书分为两步:上传电子书和新增电子书。首先需要上传epub电子书文件,服务器会对epub文件进行解析,解析成功后会将电子书的各字段填入表单,之后我们只需要手动点击新增电子书即可完成电子书的保存。查看\n "),a("a",{attrs:{href:"https://www.youbaobao.xyz/admin-docs/",target:"_blank"}},[e._v("\n 课程官网\n ")]),e._v("\n 获取更多开发指引。\n")])}],f={},v=Object(c["a"])(f,m,h,!1,null,null,null),b=v.exports,g=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"upload-container"},[a("el-upload",{staticClass:"image-upload",attrs:{action:e.action,headers:e.headers,multiple:!1,limit:1,"before-upload":e.beforeUpload,"on-success":e.onSuccess,"on-error":e.onError,"on-remove":e.onRemove,"file-list":e.fileList,"on-exceed":e.onExceed,disabled:e.disabled,drag:"","show-file-list":"",accept:"application/epub+zip"}},[a("i",{staticClass:"el-icon-upload"}),e._v(" "),0===e.fileList.length?a("div",{staticClass:"el-upload__text"},[e._v("\n 请将电子书拖入或 "),a("em",[e._v("点击上传")])]):a("div",{staticClass:"el-upload__text"},[e._v("图书已上传")])])],1)},_=[],y=a("5f87"),w={props:{fileList:{type:Array,default:function(){return[]}},disabled:{type:Boolean,default:!1}},data:function(){return{action:"".concat("http://192.168.2.244:9000","/book/upload")}},computed:{headers:function(){return{Authorization:"Bearer ".concat(Object(y["a"])())}}},methods:{beforeUpload:function(e){this.$emit("beforeUpload",e)},onSuccess:function(e,t){console.log(e,t);var a=e.code,l=e.msg,o=e.data;0===a?(this.$message({message:l,type:"success"}),this.$emit("onSuccess",o)):(this.$message({message:l&&"上传失败,失败原因:".concat(l)||"上传失败",type:"error"}),this.$emit("onError",t))},onError:function(e){var t=e.message&&JSON.parse(e.message);this.$message({message:t&&t.msg&&"上传失败,失败原因:".concat(t.msg)||"上传失败",type:"error"}),this.$emit("onError",e)},onRemove:function(){this.$message({message:"电子书删除成功",type:"success"}),this.$emit("onRemove")},onExceed:function(){this.$message({message:"每次只能上传一本电子书",type:"warning"})}}},x=w,F=Object(c["a"])(x,g,_,!1,null,"b6961bd4",null),$=F.exports,k=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"material-input__component",class:e.computedClasses},[a("div",{class:{iconClass:e.icon}},[e.icon?a("i",{staticClass:"el-input__icon material-input__icon",class:["el-icon-"+e.icon]}):e._e(),e._v(" "),"email"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,required:e.required,type:"email"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"url"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,required:e.required,type:"url"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"number"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,step:e.step,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,max:e.max,min:e.min,minlength:e.minlength,maxlength:e.maxlength,required:e.required,type:"number"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"password"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,max:e.max,min:e.min,required:e.required,type:"password"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"tel"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,required:e.required,type:"tel"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),"text"===e.type?a("input",{directives:[{name:"model",rawName:"v-model",value:e.currentValue,expression:"currentValue"}],staticClass:"material-input",attrs:{name:e.name,placeholder:e.fillPlaceHolder,readonly:e.readonly,disabled:e.disabled,autocomplete:e.autoComplete,minlength:e.minlength,maxlength:e.maxlength,required:e.required,type:"text"},domProps:{value:e.currentValue},on:{focus:e.handleMdFocus,blur:e.handleMdBlur,input:[function(t){t.target.composing||(e.currentValue=t.target.value)},e.handleModelInput]}}):e._e(),e._v(" "),a("span",{staticClass:"material-input-bar"}),e._v(" "),a("label",{staticClass:"material-label"},[e._t("default")],2)])])},C=[],P={name:"MdInput",props:{icon:String,name:String,type:{type:String,default:"text"},value:[String,Number],placeholder:String,readonly:Boolean,disabled:Boolean,min:String,max:String,step:String,minlength:Number,maxlength:Number,required:{type:Boolean,default:!0},autoComplete:{type:String,default:"off"},validateEvent:{type:Boolean,default:!0}},data:function(){return{currentValue:this.value,focus:!1,fillPlaceHolder:null}},computed:{computedClasses:function(){return{"material--active":this.focus,"material--disabled":this.disabled,"material--raised":Boolean(this.focus||this.currentValue)}}},watch:{value:function(e){this.currentValue=e}},methods:{handleModelInput:function(e){var t=e.target.value;this.$emit("input",t),"ElFormItem"===this.$parent.$options.componentName&&this.validateEvent&&this.$parent.$emit("el.form.change",[t]),this.$emit("change",t)},handleMdFocus:function(e){this.focus=!0,this.$emit("focus",e),this.placeholder&&""!==this.placeholder&&(this.fillPlaceHolder=this.placeholder)},handleMdBlur:function(e){this.focus=!1,this.$emit("blur",e),this.fillPlaceHolder=null,"ElFormItem"===this.$parent.$options.componentName&&this.validateEvent&&this.$parent.$emit("el.form.blur",[this.currentValue])}}},S=P,E=(a("ad53"),Object(c["a"])(S,k,C,!1,null,"d9b004ee",null)),N=E.exports,V=a("b067"),M={title:"书名",author:"作者",publisher:"出版社",language:"语言"},B={components:{MdInput:N,Sticky:p,Warning:b,EbookUpload:$},props:{isEdit:Boolean},data:function(){var e=function(e,t,a){0===t.length?a(new Error(M[e.field]+"必须填写")):a()};return{loading:!1,postForm:{},fileList:[],labelWidth:"120px",contentsTree:[],rules:{title:[{validator:e}],author:[{validator:e}],language:[{validator:e}],publisher:[{validator:e}]}}},created:function(){if(this.isEdit){var e=this.$route.params.fileName;this.getBookData(e)}},methods:{getBookData:function(e){var t=this;Object(V["c"])(e).then((function(e){t.setData(e.data)}))},onContentClick:function(e){console.log(e),e.text&&window.open(e.text)},setDefault:function(){this.contentsTree=[],this.fileList=[],this.$refs.postForm.resetFields()},setData:function(e){var t=e.title,a=e.author,l=e.publisher,o=e.language,i=e.rootFile,r=e.cover,s=e.url,u=e.originalName,c=e.contents,d=e.contentsTree,p=e.fileName,m=e.coverPath,h=e.filePath,f=e.unzipPath;this.postForm=Object(n["a"])({},this.postForm,{title:t,author:a,publisher:l,language:o,rootFile:i,cover:r,url:s,originalName:u,contents:c,contentsTree:d,fileName:p,coverPath:m,filePath:h,unzipPath:f}),this.contentsTree=d,this.fileList=[{name:u||p,url:s}]},onUploadSuccess:function(e){console.log("onUploadSuccess",e),this.setData(e)},onUploadRemove:function(){this.setDefault()},submitForm:function(){var e=this,t=function(t){var a=t.msg;e.$notify({title:"操作成功",message:a,type:"success",duration:2e3}),e.loading=!1};this.loading||(this.loading=!0,this.$refs.postForm.validate((function(a,l){if(console.log(a,l),a){var o=Object.assign({},e.postForm);delete o.contentsTree,e.isEdit?Object(V["f"])(o).then((function(e){t(e)})).catch((function(){e.loading=!1})):Object(V["a"])(o).then((function(a){t(a),e.setDefault()})).catch((function(){e.loading=!1}))}else{var n=l[Object.keys(l)[0]][0].message;e.$message({message:n,type:"error"}),e.loading=!1}})))},showGuide:function(){console.log("show guide...")}}},z=B,O=(a("e120"),Object(c["a"])(z,l,o,!1,null,"96296cca",null));t["a"]=O.exports},ad53:function(e,t,a){"use strict";var l=a("589d"),o=a.n(l);o.a},b067:function(e,t,a){"use strict";a.d(t,"a",(function(){return o})),a.d(t,"f",(function(){return n})),a.d(t,"c",(function(){return i})),a.d(t,"d",(function(){return r})),a.d(t,"e",(function(){return s})),a.d(t,"b",(function(){return u}));var l=a("b775");function o(e){return Object(l["a"])({url:"/book/create",method:"post",data:e})}function n(e){return Object(l["a"])({url:"/book/update",method:"post",data:e})}function i(e){return Object(l["a"])({url:"/book/get",method:"get",params:{fileName:e}})}function r(){return Object(l["a"])({url:"/book/category",method:"get"})}function s(e){return Object(l["a"])({url:"/book/list",method:"get",params:e})}function u(e){return Object(l["a"])({url:"/book/delete",method:"get",params:{fileName:e}})}},e120:function(e,t,a){"use strict";var l=a("11731"),o=a.n(l);o.a}}]);
\ No newline at end of file \ No newline at end of file
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
mvn clean package -Dmaven.test.skip=true -U mvn clean package -Dmaven.test.skip=true -U
#docker build -t hub.c.163.com/springcloud/eureka . # docker build -t hub.c.163.com/springcloud/eureka .
#docker push hub.c.163.com/springcloud/eureka # docker push hub.c.163.com/springcloud/eureka
docker build -t zzrdark/eureka . # docker build -t zzrdark/springcloud_device .
docker push zzrdark/eureka
# docker build -t 192.168.2.244:5000/eureka . # docker push zzrdark/eureka
# docker push 192.168.2.244:5000/eureka docker build -t 192.168.2.244:5000/springcloud_device .
\ No newline at end of file
docker push 192.168.2.244:5000/springcloud_device
\ No newline at end of file
...@@ -122,4 +122,25 @@ public class DeviceInfoController { ...@@ -122,4 +122,25 @@ public class DeviceInfoController {
return R.ok(); return R.ok();
} }
/**
* 保存
*/
@RequestMapping("/updateDeviceChannelBatch")
public R updateDeviceChannelBatch(@RequestBody DevicesDto devicesDto){
List<DeviceInfoEntity> deviceInfoEntityList = new LinkedList<>();
if (devicesDto.getImeis() != null && devicesDto.getImeis().size() != 0) {
devicesDto.getImeis().forEach(str -> {
DeviceInfoEntity deviceInfoEntity = new DeviceInfoEntity();
deviceInfoEntity.setImei(str);
deviceInfoEntity.setChannelNums(devicesDto.getChannelNums());
deviceInfoEntity.setChannelNumsMessage(devicesDto.getChannelNumsMessage());
deviceInfoEntity.setChannelRules(devicesDto.getChannelRules());
deviceInfoEntityList.add(deviceInfoEntity);
});
}
deviceInfoService.updateBatchByImei(deviceInfoEntityList);
return R.ok();
}
} }
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
password: cneeds!QAZ1qaz
username: root
eureka:
client:
service-url:
defaultZone: http://127.0.0.1:8761/eureka/
instance:
prefer-ip-address: true
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
password: cneeds!QAZ1qaz
username: root
# hikari:
# driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# username: root
# password: cneeds!QAZ1qaz
# datasource:
# type: com.alibaba.druid.pool.DruidDataSource
# druid:
# driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# username: root
# password: cneeds!QAZ1qaz
# initial-size: 10
# max-active: 100
# min-idle: 10
# max-wait: 60000
# pool-prepared-statements: true
# max-pool-prepared-statement-per-connection-size: 20
# time-between-eviction-runs-millis: 60000
# min-evictable-idle-time-millis: 300000
# #Oracle需要打开注释
# #validation-query: SELECT 1 FROM DUAL
# test-while-idle: true
# test-on-borrow: false
# test-on-return: false
# stat-view-servlet:
# enabled: true
# url-pattern: /druid/*
# #login-username: admin
# #login-password: admin
# filter:
# stat:
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: false
# wall:
# config:
# multi-statement-allow: true
eureka:
client:
service-url:
defaultZone: http://192.168.2.244:8761/eureka/
instance:
prefer-ip-address: true
# ip-address: 192.168.2.244
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.mx.cneeds.server.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
column-underline: true
logic-delete-value: -1
logic-not-delete-value: 0
banner: false
#原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
spring: spring:
profiles: profiles:
active: dev active: prod
application: application:
name: cneeds-server-device name: cneeds-server-device
...@@ -8,3 +8,27 @@ server: ...@@ -8,3 +8,27 @@ server:
port: 9002 port: 9002
servlet: servlet:
context-path: / context-path: /
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.mx.cneeds.server.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
column-underline: true
logic-delete-value: -1
logic-not-delete-value: 0
banner: false
#原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
\ No newline at end of file
eureka:
client:
service-url:
#defaultZone: http://eureka2:8762/eureka/
defaultZone: http://localhost:8761/eureka/
## 单机的时候开启
register-with-eureka: false
fetch-registry: 'false'

# server:
# enable-self-preservation: false
instance:
prefer-ip-address: true
eureka:
client:
service-url:
#defaultZone: http://eureka2:8762/eureka/
defaultZone: http://localhost:8761/eureka/
## 单机的时候开启
register-with-eureka: false
fetch-registry: 'false'

# server:
# enable-self-preservation: false
instance:
prefer-ip-address: true
ip-address: 192.168.2.244
\ No newline at end of file
eureka:
client:
service-url:
#defaultZone: http://eureka2:8762/eureka/
defaultZone: http://localhost:8761/eureka/
## 单机的时候开启
register-with-eureka: false
fetch-registry: 'false'

# server:
# enable-self-preservation: false
instance:
prefer-ip-address: true
spring: spring:
profiles: profiles:
active: dev active: prod
application: application:
name: cneeds-server-eureka name: cneeds-server-eureka
server: server:
......
...@@ -7,9 +7,9 @@ mvn clean package -Dmaven.test.skip=true -U ...@@ -7,9 +7,9 @@ mvn clean package -Dmaven.test.skip=true -U
#docker push hub.c.163.com/springcloud/eureka #docker push hub.c.163.com/springcloud/eureka
docker build -t zzrdark/eureka . #docker build -t zzrdark/eureka .
docker push zzrdark/eureka #docker push zzrdark/eureka
# docker build -t 192.168.2.244:5000/eureka . docker build -t 192.168.2.244:5000/springcloud_user .
# docker push 192.168.2.244:5000/eureka docker push 192.168.2.244:5000/springcloud_user
\ No newline at end of file \ No newline at end of file
...@@ -53,26 +53,5 @@ eureka: ...@@ -53,26 +53,5 @@ eureka:
ip-address: 192.168.2.244 ip-address: 192.168.2.244
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.mx.cneeds.server.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
column-underline: true
logic-delete-value: -1
logic-not-delete-value: 0
banner: false
#原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
password: cneeds!QAZ1qaz
username: root
eureka:
client:
service-url:
defaultZone: http://127.0.0.1:8761/eureka/
instance:
prefer-ip-address: true
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
password: cneeds!QAZ1qaz
username: root
# hikari:
# driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# username: root
# password: cneeds!QAZ1qaz
# datasource:
# type: com.alibaba.druid.pool.DruidDataSource
# druid:
# driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://192.168.2.244:3306/cneeds_server?useUnicode=true&characterEncoding=UTF-8&useSSL=false
# username: root
# password: cneeds!QAZ1qaz
# initial-size: 10
# max-active: 100
# min-idle: 10
# max-wait: 60000
# pool-prepared-statements: true
# max-pool-prepared-statement-per-connection-size: 20
# time-between-eviction-runs-millis: 60000
# min-evictable-idle-time-millis: 300000
# #Oracle需要打开注释
# #validation-query: SELECT 1 FROM DUAL
# test-while-idle: true
# test-on-borrow: false
# test-on-return: false
# stat-view-servlet:
# enabled: true
# url-pattern: /druid/*
# #login-username: admin
# #login-password: admin
# filter:
# stat:
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: false
# wall:
# config:
# multi-statement-allow: true
eureka:
client:
service-url:
defaultZone: http://192.168.2.244:8761/eureka/
instance:
prefer-ip-address: true
ip-address: 192.168.2.244
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.mx.cneeds.server.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
column-underline: true
logic-delete-value: -1
logic-not-delete-value: 0
banner: false
#原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
spring: spring:
profiles: profiles:
active: dev active: prod
application: application:
name: cneeds-server-user name: cneeds-server-user
...@@ -8,3 +8,26 @@ server: ...@@ -8,3 +8,26 @@ server:
port: 9001 port: 9001
servlet: servlet:
context-path: / context-path: /
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
#实体扫描,多个package用逗号或者分号分隔
typeAliasesPackage: com.mx.cneeds.server.entity
global-config:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
id-type: AUTO
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换
column-underline: true
logic-delete-value: -1
logic-not-delete-value: 0
banner: false
#原生配置
configuration:
map-underscore-to-camel-case: true
cache-enabled: false
call-setters-on-nulls: true
jdbc-type-for-null: 'null'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment