Merge branch 'dev' of http://code.pacsonline.cn/zskk_bg/yuanchengpasc into pro

.idea/workspace.xml

@@ -42,11 +42,31 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Dcquery.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.42608696">
-              <caret line="96" column="57" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
+            <state vertical-scroll-proportion="-7.193548">
+              <caret line="95" column="24" selection-start-line="95" selection-start-column="24" selection-end-line="95" selection-end-column="24" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Writereport.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="-10.645162">
+              <caret line="247" column="40" selection-start-line="247" selection-start-column="40" selection-end-line="247" selection-end-column="40" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Template.php" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.22956522">
+              <caret line="132" column="19" selection-start-line="132" selection-start-column="19" selection-end-line="132" selection-end-column="19" />
               <folding />
             </state>
           </provider>
@@ -75,16 +95,16 @@
         <option value="$PROJECT_DIR$/.git/config" />
         <option value="$PROJECT_DIR$/../yuanchengpasc/public/index.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Report.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Base.php" />
         <option value="$PROJECT_DIR$/application/common/library/ValidateCode.php" />
         <option value="$PROJECT_DIR$/application/manage/view/insdoctors/edit.html" />
         <option value="$PROJECT_DIR$/application/manage/controller/Insdoctors.php" />
         <option value="$PROJECT_DIR$/application/index/controller/Index.php" />
-        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Application.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Inspectregister.php" />
         <option value="$PROJECT_DIR$/application/manage/controller/Doctors.php" />
         <option value="$PROJECT_DIR$/application/inter/controller/Dcquery.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Base.php" />
+        <option value="$PROJECT_DIR$/application/inter/controller/Writereport.php" />
       </list>
     </option>
   </component>
@@ -552,13 +572,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="18" column="0" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Messages.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -658,13 +671,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-2.2258065">
-          <caret line="29" column="61" selection-start-line="29" selection-start-column="61" selection-end-line="29" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/common/library/ValidateCode.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.29391304">
@@ -728,13 +734,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-5.598261">
-          <caret line="212" column="88" selection-start-line="212" selection-start-column="88" selection-end-line="212" selection-end-column="88" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/index/controller/Index.php">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.22956522">
@@ -818,8 +817,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/inter/controller/Dcquery.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.42608696">
-          <caret line="96" column="57" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
+        <state vertical-scroll-proportion="-7.193548">
+          <caret line="95" column="24" selection-start-line="95" selection-start-column="24" selection-end-line="95" selection-end-column="24" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Base.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.3269565">
+          <caret line="36" column="90" selection-start-line="36" selection-start-column="90" selection-end-line="36" selection-end-column="90" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Writereport.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="-10.645162">
+          <caret line="247" column="40" selection-start-line="247" selection-start-column="40" selection-end-line="247" selection-end-column="40" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/inter/controller/Template.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.22956522">
+          <caret line="132" column="19" selection-start-line="132" selection-start-column="19" selection-end-line="132" selection-end-column="19" />
           <folding />
         </state>
       </provider>

public/index.html

@@ -1,3 +1,3 @@
-<!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="shortcut icon" type=image/x-icon href=favicon.ico><title>中世康恺远程诊断平台</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.aedf68d95d35f6254d0d184bbb6af24c.css rel=stylesheet></head><style>body::-webkit-scrollbar{
+<!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"><title>中世康恺远程诊断平台</title><link rel="shortcut icon" type=image/x-icon href=favicon.ico><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.1494b8bec6e04f97b55b14a904e82e36.css rel=stylesheet></head><style>body::-webkit-scrollbar{
     width: 0;
-  }</style><body><script src=http://libs.baidu.com/jquery/2.0.0/jquery.js></script><script src=/static/tinymce4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.680247c02e86aa6efc31.js></script><script type=text/javascript src=/static/js/vendor.7edea4a4dee5476472dd.js></script><script type=text/javascript src=/static/js/app.3d13caba333917b3c7da.js></script><script type=text/javascript src=/static/js/babel-polyfill.c3ea913f8cb1fddc2567.js></script></body></html>
+  }</style><body><script src=http://libs.baidu.com/jquery/2.0.0/jquery.js></script><script src=/static/tinymce4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.faced6b970b92a5f0a82.js></script><script type=text/javascript src=/static/js/vendor.7edea4a4dee5476472dd.js></script><script type=text/javascript src=/static/js/app.adee38757e578f43d221.js></script><script type=text/javascript src=/static/js/babel-polyfill.c3ea913f8cb1fddc2567.js></script></body></html>

public/static/js/manifest.faced6b970b92a5f0a82.js

@@ -0,0 +1 @@
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,f){for(var o,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(o in a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(n&&n(r,a,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=c(c.s=f[u]);return i};var r={},t={24:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var a=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,c.nc&&f.setAttribute("nonce",c.nc),f.src=c.p+"static/js/"+e+"."+{0:"607fe6d6b0f461a79ca8",1:"713cbe623f3751bafe91",2:"0b8e972266ddeff46e5e",3:"4869f537917380617280",4:"0a86a3fd802128721b33",5:"c8fca0d3e7a0e8d1de26",6:"e0256c8b0a8cef8080c3",7:"a543c02f14ef5b7bc33f",8:"f593dd9000f6c9c33ea8",9:"c59290371641acb0a06c",10:"687effd506bb71499b02",11:"e72940c4d089a3f58371",12:"fb1ba25de16a66954ce8",13:"905ad3463009166d6780",14:"2fd13c522e1990ef7d11",15:"9fa9fe7342041e502c58",16:"01c8af0567cf93efa9f9",17:"b94c3ea75f6c030f553f",18:"7edea4a4dee5476472dd",19:"adee38757e578f43d221",20:"c3ea913f8cb1fddc2567",21:"c0d7fb4fa878304a94d5",22:"9e1342cb1cba31a75e58",23:"926b0d046dbdb2223af9"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=d,a.appendChild(f),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="/",c.oe=function(e){throw console.error(e),e}}([]);