This commit is contained in:
sunrich
2018-11-22 09:54:02 +08:00
parent 9d773f6102
commit eafdf3ba94
4 changed files with 743 additions and 597 deletions

152
.idea/workspace.xml generated
View File

@ -8,6 +8,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment=""> <list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java" afterPath="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/CasesAction.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
</list> </list>
@ -21,31 +22,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="caseDetails.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="caseDetail.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682">
<caret line="79" column="34" lean-forward="true" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="footer.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="caseDetail.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3951"> <state relative-caret-position="146">
<caret line="708" column="31" lean-forward="true" selection-start-line="708" selection-start-column="31" selection-end-line="708" selection-end-column="31" /> <caret line="258" column="46" lean-forward="false" selection-start-line="258" selection-start-column="37" selection-end-line="258" selection-end-column="46" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -54,13 +35,33 @@
<file leaf-file-name="footers.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="footers.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3828"> <state relative-caret-position="-2508">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="caseDetails.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="165" column="37" lean-forward="true" selection-start-line="159" selection-start-column="36" selection-end-line="165" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="footer.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="24" column="24" lean-forward="false" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@ -72,9 +73,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>consume_query</find>
<find>simpl</find>
<find>SimpleDateFormat</find>
<find>exportData</find> <find>exportData</find>
<find>recharge_query</find> <find>recharge_query</find>
<find>simple</find> <find>simple</find>
@ -102,6 +100,9 @@
<find>$</find> <find>$</find>
<find>to</find> <find>to</find>
<find>tbody</find> <find>tbody</find>
<find>other</find>
<find>unknownProblem</find>
<find>是否修复车辆 开始</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>D:\JLR\JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4\src\main\webapp\css</dir> <dir>D:\JLR\JLR-master-19f1e7b4858da9a529342c6e8625154c882ae7c4\src\main\webapp\css</dir>
@ -119,7 +120,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/OrderCheckService.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/OrderCheckServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/impl/OrderCheckServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/OrderCheckAction.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/OrderCheckAction.java" />
<option value="$PROJECT_DIR$/src/main/webapp/page/orderCheckAll.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/orderCheckAll.jsp" />
@ -168,8 +168,9 @@
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/CaseDaoImpl.java" />
<option value="$PROJECT_DIR$/src/main/webapp/page/header.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/home.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/home.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" />
</list> </list>
</option> </option>
</component> </component>
@ -231,7 +232,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" /> <pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -269,9 +270,9 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="AndroidView" /> <pane id="AndroidView" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -610,7 +611,8 @@
<workItem from="1542266860375" duration="629000" /> <workItem from="1542266860375" duration="629000" />
<workItem from="1542590853085" duration="13495000" /> <workItem from="1542590853085" duration="13495000" />
<workItem from="1542677147951" duration="22239000" /> <workItem from="1542677147951" duration="22239000" />
<workItem from="1542763435853" duration="2153000" /> <workItem from="1542763435853" duration="14823000" />
<workItem from="1542849539703" duration="2053000" />
</task> </task>
<task id="LOCAL-00001" summary="ceshi"> <task id="LOCAL-00001" summary="ceshi">
<created>1540174575886</created> <created>1540174575886</created>
@ -647,11 +649,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1542767331334</updated> <updated>1542767331334</updated>
</task> </task>
<option name="localTasksCounter" value="6" /> <task id="LOCAL-00006" summary="JLR1.0">
<created>1542767957968</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1542767957968</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="869346000" /> <option name="totallyTimeSpent" value="884069000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -679,16 +688,16 @@
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65924656" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.65924656" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32418525" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="92" y="92" width="1182" height="544" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.05488851" sideWeight="0.49394855" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32933104" sideWeight="0.49394855" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6689537" sideWeight="0.49394855" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6689537" sideWeight="0.49394855" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20953101" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21255673" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29198185" sideWeight="0.5068493" order="5" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29198185" sideWeight="0.5068493" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
@ -696,7 +705,7 @@
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32418525" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" x="92" y="92" width="1182" height="544" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32761577" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32761577" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
@ -739,6 +748,32 @@
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="1" />
<option value="2" />
<option value="3" />
</list>
</option>
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsContentAnnotationSettings"> <component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
@ -937,7 +972,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="594"> <state relative-caret-position="594">
<caret line="45" column="29" lean-forward="false" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" /> <caret line="45" column="29" lean-forward="false" selection-start-line="45" selection-start-column="29" selection-end-line="45" selection-end-column="29" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -953,7 +987,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="66" column="96" lean-forward="false" selection-start-line="66" selection-start-column="45" selection-end-line="66" selection-end-column="96" /> <caret line="66" column="96" lean-forward="false" selection-start-line="66" selection-start-column="45" selection-end-line="66" selection-end-column="96" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1021,10 +1054,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199"> <state relative-caret-position="199">
<caret line="48" column="27" lean-forward="true" selection-start-line="48" selection-start-column="27" selection-end-line="48" selection-end-column="27" /> <caret line="48" column="27" lean-forward="true" selection-start-line="48" selection-start-column="27" selection-end-line="48" selection-end-column="27" />
<folding>
<element signature="e#1761#1762#0" expanded="false" />
<element signature="e#1817#1818#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1032,7 +1061,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660"> <state relative-caret-position="660">
<caret line="36" column="7" lean-forward="false" selection-start-line="36" selection-start-column="7" selection-end-line="36" selection-end-column="7" /> <caret line="36" column="7" lean-forward="false" selection-start-line="36" selection-start-column="7" selection-end-line="36" selection-end-column="7" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1040,7 +1068,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6160"> <state relative-caret-position="6160">
<caret line="295" column="13" lean-forward="false" selection-start-line="295" selection-start-column="13" selection-end-line="295" selection-end-column="13" /> <caret line="295" column="13" lean-forward="false" selection-start-line="295" selection-start-column="13" selection-end-line="295" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1048,7 +1075,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5610"> <state relative-caret-position="-5610">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1072,13 +1098,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="69" column="25" lean-forward="false" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" /> <caret line="69" column="25" lean-forward="false" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" />
<folding>
<marker date="1542700294519" expanded="true" signature="2729:2738" ph="..." />
<marker date="1542700294519" expanded="true" signature="2911:2917" ph="..." />
<marker date="1542700294519" expanded="true" signature="2911:2923" ph="..." />
<marker date="1542700294519" expanded="true" signature="9468:9474" ph="&amp;nbsp;" />
<marker date="1542700294519" expanded="true" signature="9474:9480" ph="&amp;nbsp;" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1126,13 +1145,20 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22"> <state relative-caret-position="22">
<caret line="49" column="56" lean-forward="false" selection-start-line="49" selection-start-column="47" selection-end-line="49" selection-end-column="56" /> <caret line="49" column="56" lean-forward="false" selection-start-line="49" selection-start-column="47" selection-end-line="49" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="157">
<caret line="24" column="24" lean-forward="false" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3828"> <state relative-caret-position="-2508">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
@ -1140,24 +1166,16 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="682"> <state relative-caret-position="253">
<caret line="79" column="34" lean-forward="true" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" /> <caret line="165" column="37" lean-forward="true" selection-start-line="159" selection-start-column="36" selection-end-line="165" selection-end-column="37" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3951"> <state relative-caret-position="146">
<caret line="708" column="31" lean-forward="true" selection-start-line="708" selection-start-column="31" selection-end-line="708" selection-end-column="31" /> <caret line="258" column="46" lean-forward="false" selection-start-line="258" selection-start-column="37" selection-end-line="258" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View File

@ -157,7 +157,7 @@ public class CasesAction {
request.setAttribute("info",vo); request.setAttribute("info",vo);
request.setAttribute("state",state); request.setAttribute("state",state);
//跳转页面 //跳转页面
return "page/caseDetails"; return "page/caseDetail";
} }
/* /*
@ -176,7 +176,7 @@ public class CasesAction {
request.setAttribute("info",vo); request.setAttribute("info",vo);
request.setAttribute("state",state); request.setAttribute("state",state);
//跳转页面 //跳转页面
return "page/caseDetails"; return "page/caseDetail";
} }
/* /*

File diff suppressed because it is too large Load Diff

View File

@ -2,6 +2,220 @@
pageEncoding="utf-8" %> pageEncoding="utf-8" %>
<script type="text/javascript" src="<%=webpath%>/js/DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="<%=webpath%>/js/DatePicker/WdatePicker.js"></script>
<script type="text/javascript"> <script type="text/javascript">
/**
* 是否选择车辆 选择其他 ,显示描述的文本框
* */
$("#repairCar").change(function () {
if($("#repairCar").val() == 2){
$("#repairCarDetailWrapper").show();
}else {
$("#repairCarDetailWrapper").hide();
}
})
/**
* 是否有质量问题
* */
$("#qualityProblem").change(function () {
/***
* 2 是 ‘未知’, 1 是 ‘是’, 3 是 ‘否’, 0 是 ‘请选择’
*/
if( $("#qualityProblem").val() == 2 ){
$(".qualityProblemUnknow").show().find('select').val("");
$(".qualityProblemYes").hide().find('select').val("");
} else if($("#qualityProblem").val() == 1){
$(".qualityProblemYes").show().find('select').val("");
$(".qualityProblemUnknow").hide().find('select').val("");
$(".technologyNoticeYes").hide().find('select').val("");
$(".technologyNoticeNo").hide().find('select').val("");
} else {
$(".qualityProblemUnknow").hide().find('select').val("");
$(".qualityProblemYes").hide().find('select').val("");
}
})
/**
* 是否有技术公告 1 : 是 2 : 否
* */
$("#technologyNotice").change(function () {
if( $("#technologyNotice").val() == 1 ){
$(".technologyNoticeYes").show().find('select').val("");
$(".technologyNoticeNo").hide().find('select').val("");
$(".effectiveProblemYes").hide().find('select').val("");
$('.effectiveProblemNo').hide().find('select').val("");
} else if( $("#technologyNotice").val() == 2 ){
$(".technologyNoticeYes").hide().find('select').val("");
$(".technologyNoticeNo").show().find('select').val("");
$(".effectiveProblemYes").hide().find('select').val("");
$('.effectiveProblemNo').hide().find('select').val("");
} else {
$(".technologyNoticeYes").hide().find('select').val("");
$(".technologyNoticeNo").hide().find('select').val("");
}
})
/**
* 是否有效 1 : 是 2 : 否
* */
$("#effectiveProblem").change(function () {
if($("#effectiveProblem").val() == 1){
$('.effectiveProblemYes').show().find('select').val("");
$(".effectiveProblemNo").hide().find('select').val("");
}else if($("#effectiveProblem").val() == 2){
$('.effectiveProblemYes').hide().find('select').val("");
$(".effectiveProblemNo").show().find('select').val("");
}else {
$('.effectiveProblemYes').hide().find('select').val("");
$(".effectiveProblemNo").hide().find('select').val("");
}
})
/**
* 维修 选择 1 : 搭电 , 2 : 打气 3 换胎 4 解档 5 :安装 6 其他处理
* */
$('#repairOptions').change(function () {
if( $('#repairOptions').val() == 1 ){
$("#betteryCheck").show();
$("#writeParts").hide();
$("#repairDescirbe").hide();
} else if( $('#repairOptions').val() == 5 ){
$("#betteryCheck").hide();
$("#writeParts").show();
$("#repairDescirbe").hide();
} else if( $('#repairOptions').val() == 6 ){
$("#betteryCheck").hide();
$("#writeParts").hide();
$("#repairDescirbe").show();
} else {
$("#betteryCheck").hide();
$("#writeParts").hide();
$("#repairDescirbe").hide();
}
})
/**
* 进店维修
* */
/**
* 是否有工单号 1 : 是 2
* */
$('#repairEnterCompanyOrderNumber').change(function () {
if($('#repairEnterCompanyOrderNumber').val() == 1){
$('#HasRepairOrderNumber').show();
$("#describe").html("工单号:");
} else if($('#repairEnterCompanyOrderNumber').val() == 2){
$('#HasRepairOrderNumber').show();
$("#describe").html("原因(最多20个字):");
} else {
$('#HasRepairOrderNumber').hide();
}
})
/**
* 维修选择框 1 已修复 2 正在维修 3 等待维修授权 4 :问题未再现 5 其他
* */
$('#repairEnterCompany').change(function () {
if( $('#repairEnterCompany').val() == 5 ){
$("#repairEnterCompanyOtherDetail").show();
}else {
$("#repairEnterCompanyOtherDetail").hide();
}
})
/**
* 是否质量问题 1 2 3 : 未知
* */
$("#repairEnterCompanyQuality").change(function () {
// 选择 是
if($("#repairEnterCompanyQuality").val() == 1 ){
$(".repairEnterCompanyQualityNo").hide().find('select').val("");
$('.repairEnterCompanyQualityYes').show().find('select').val("");
$(".repairEnterCompanyQualityUnknow").hide().find('select').val("");
$(".repairEnterCompanyTechnologyYes").hide().find('select').val("");
$(".repairEnterCompanyTechnologyNo").hide().find('select').val("");
$("#others").val("");
} else if($("#repairEnterCompanyQuality").val() == 2){
$(".repairEnterCompanyQualityNo").show().find('select').val("");
$('.repairEnterCompanyQualityYes').hide().find('select').val("");
$(".repairEnterCompanyQualityUnknow").hide().find('select').val("");
$("#other").val("");
$("#technicalNumber").val("");
$("#technicalNoticeInvalid").val("");
$("#others").val("");
} else if($("#repairEnterCompanyQuality").val() == 3){
$(".repairEnterCompanyQualityNo").hide().find('select').val("");
$('.repairEnterCompanyQualityYes').hide().find('select').val("");
$(".repairEnterCompanyQualityUnknow").show().find('select').val("");
$("#other").val("");
$("#technicalNumber").val("");
$("#technicalNoticeInvalid").val("");
} else {
$(".repairEnterCompanyQualityNo").hide().find('select').val("");
$('.repairEnterCompanyQualityYes').hide().find('select').val("");
$(".repairEnterCompanyQualityUnknow").hide().find('select').val("");
$("#other").val("");
$("#technicalNumber").val("");
$("#technicalNoticeInvalid").val("");
$("#others").val("");
}
})
/**
* 是否有技术公告 1 : 是 2
* */
$('#repairEnterCompanyTechnologyNotice').change(function () {
if( $('#repairEnterCompanyTechnologyNotice').val() == 1 ){
$('.repairEnterCompanyTechnologyYes').show().find('select').val("");
$('.repairEnterCompanyTechnologyNo').hide().find('select').val("");
$('.repairEnterEffectiveYes').hide().find('select').val("");
$('.repairEnterEffectiveNo').hide().find('select').val("");
$("#other").val("");
$("#others").val("");
}else if($('#repairEnterCompanyTechnologyNotice').val() == 2) {
$('.repairEnterCompanyTechnologyYes').hide().find('select').val("");
$('.repairEnterCompanyTechnologyNo').show().find('select').val("");
$("#technicalNumber").val("");
$("#technicalNoticeInvalid").val("");
$("#others").val("");
}else {
$('.repairEnterCompanyTechnologyYes').hide().find('select').val("");
$('.repairEnterCompanyTechnologyNo').hide().find('select').val("");
$("#other").val("");
$("#technicalNumber").val("");
$("#technicalNoticeInvalid").val("");
$("#others").val("");
}
})
/**
* 是否有效 1 2
* */
$('#repairEnterCompanyEffectiveProblem').change(function () {
if($('#repairEnterCompanyEffectiveProblem').val() == 1){
$('.repairEnterEffectiveYes').show().find('select').val("");
$('.repairEnterEffectiveNo').hide().find('select').val("");
$("#other").val("");
$("#technicalNoticeInvalid").val("");
$("#others").val("");
} else if($('#repairEnterCompanyEffectiveProblem').val() == 2) {
$('.repairEnterEffectiveYes').hide().find('select').val("");
$('.repairEnterEffectiveNo').show().find('select').val("");
$("#other").val("");
$("#technicalNumber").val("");
$("#others").val("");
} else {
$('.repairEnterEffectiveYes').hide().find('select').val("");
$('.repairEnterEffectiveNo').hide().find('select').val("");
$("#other").val("");
$("#technicalNumber").val("");
$("#technicalNoticeInvalid").val("");
$("#others").val("");
}
})
function submitMyInfo() { function submitMyInfo() {
var path = $("#mypaths").val(); var path = $("#mypaths").val();
var newPassword = $("#newPassword").val(); var newPassword = $("#newPassword").val();
@ -43,7 +257,7 @@
$("#enterpriseform").form("clear"); $("#enterpriseform").form("clear");
var params = {}; var params = {};
var result = ajaxgetresultpost($("#mypaths").val() var result = ajaxgetresultpost($("#mypaths").val()
+ '/enterprise/get_my_info.do', params); + '/enterprise/get_my_info.do', params);
if (result.flag == 0) { if (result.flag == 0) {
alert(result.msg); alert(result.msg);
} else { } else {
@ -113,7 +327,7 @@
if (firstPage == '1' && isShow == '1') { if (firstPage == '1' && isShow == '1') {
var params = {}; var params = {};
var result = ajaxgetresultpost($("#mypaths").val() var result = ajaxgetresultpost($("#mypaths").val()
+ '/enterprise/get_my_info.do', params); + '/enterprise/get_my_info.do', params);
//alert(result.data); //alert(result.data);
if (result.flag == 0) { if (result.flag == 0) {
alert(result.msg); alert(result.msg);