合并

CODE/smart-community-word/.idea/workspace.xml

@@ -1,16 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/model/TpTicketRecordComment.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordMapper.xml" afterDir="false" />
-    </list>
+    <list default="true" id="051ae1e0-ece1-4622-91c0-3f05ac339943" name="Default Changelist" comment="" />
     <ignored path="$PROJECT_DIR$/../smart-community/eureka-sever/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/app-api/target/" />
     <ignored path="$PROJECT_DIR$/../smart-community/operate-api/target/" />
@@ -32,8 +23,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="396">
-              <caret line="466" column="40" selection-start-line="466" selection-start-column="40" selection-end-line="466" selection-end-column="40" />
+            <state relative-caret-position="5350">
+              <caret line="448" selection-start-line="448" selection-end-line="448" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="315">
+              <caret line="72" column="35" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="35" />
             </state>
           </provider>
         </entry>
@@ -47,7 +47,7 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/resources/mapper/TpTicketRecordCommentMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="246">
@@ -473,7 +473,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550821013010" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550823776406" />
     <property name="last_opened_file_path" value="D:/java/workspace/heishi/wx_project" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -615,18 +615,18 @@
       <workItem from="1550625046867" duration="10953000" />
       <workItem from="1550663154868" duration="404000" />
       <workItem from="1550711362440" duration="16076000" />
-      <workItem from="1550798426456" duration="14919000" />
+      <workItem from="1550798426456" duration="16826000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="61473000" />
+    <option name="totallyTimeSpent" value="63380000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3523454" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25692964" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -637,7 +637,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" sideWeight="0.6998934" weight="0.20824054" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.116926506" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.91518134" visible="true" weight="0.04899777" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -962,13 +962,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="329">
-          <caret line="72" column="25" lean-forward="true" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="35" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/property-api/src/main/java/com/community/huiju/dao/TpTicketRecordMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="378">
@@ -1052,13 +1045,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="466" column="40" selection-start-line="466" selection-start-column="40" selection-end-line="466" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/dao/TpTicketRecordCommentMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="216">
@@ -1073,6 +1059,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/impl/TicketServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5350">
+          <caret line="448" selection-start-line="448" selection-end-line="448" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../smart-community/app-api/src/main/java/com/community/huiju/service/ITicketService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="72" column="35" selection-start-line="72" selection-start-column="17" selection-end-line="72" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

VUECODE/smart-property-manage/src/views/ticket/details.vue

@@ -38,8 +38,8 @@
       </el-form-item>
       </div>
       <div>
-        <el-form-item style='padding-left:30px'>
-        <div>内容<span style="text-align:left;margin-left:50px;padding:100px">{{listQuery.ticketContent}}</span></div>
+        <el-form-item style='padding-left:20px'>
+        <div>内容：<span style="text-align:left;margin-left:-100px;padding:100px">{{listQuery.ticketContent}}</span></div>
       </el-form-item>
        <!-- <table >
           <tr><td><span>内容</span></td>
@@ -67,7 +67,7 @@
     <!-- 一下状态是数据库的所有状态，如需要加状态，页面得加相同状态的div -->
     <div class="approvalProcess" >
         <el-steps :active="7" finish-status="success" direction="vertical">
-          <el-step :title="item.statusName+'__________'+formatDate(item.createDate)" v-for="item in approvalProcessProject">
+          <el-step :title="item.statusName+'_________'+formatDate(item.createDate)" v-for="item in approvalProcessProject">
             <template slot="description">
              <div class="step-row">
                <tr v-if="item.status - 0 === 5"><td>评价：</td><td><el-rate