liuxiaona %!s(int64=2) %!d(string=hace) años
padre
commit
439c7f84ef

+ 99 - 0
.idea/workspace.xml

@@ -0,0 +1,99 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5
+      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/channel.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/channel.vue" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/datePicker.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/datePicker.vue" afterDir="false" />
7
+    </list>
8
+    <option name="SHOW_DIALOG" value="false" />
9
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
10
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11
+    <option name="LAST_RESOLUTION" value="IGNORE" />
12
+  </component>
13
+  <component name="FileTemplateManagerImpl">
14
+    <option name="RECENT_TEMPLATES">
15
+      <list>
16
+        <option value="Vue Single File Component" />
17
+      </list>
18
+    </option>
19
+  </component>
20
+  <component name="Git.Settings">
21
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
22
+  </component>
23
+  <component name="GitSEFilterConfiguration">
24
+    <file-type-list>
25
+      <filtered-out-file-type name="LOCAL_BRANCH" />
26
+      <filtered-out-file-type name="REMOTE_BRANCH" />
27
+      <filtered-out-file-type name="TAG" />
28
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
29
+    </file-type-list>
30
+  </component>
31
+  <component name="ProjectId" id="28Q2iXOGC8uIIgXdokLl2xoSuGY" />
32
+  <component name="ProjectViewState">
33
+    <option name="hideEmptyMiddlePackages" value="true" />
34
+    <option name="showExcludedFiles" value="false" />
35
+    <option name="showLibraryContents" value="true" />
36
+  </component>
37
+  <component name="PropertiesComponent">
38
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
39
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
40
+    <property name="WebServerToolWindowFactoryState" value="false" />
41
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../data_center" />
42
+    <property name="nodejs_package_manager_path" value="npm" />
43
+    <property name="ts.external.directory.path" value="C:\Program Files (x86)\webstorm\WebStorm 2021.2.1\plugins\JavaScriptLanguage\jsLanguageServicesImpl\external" />
44
+    <property name="vue.rearranger.settings.migration" value="true" />
45
+  </component>
46
+  <component name="RecentsManager">
47
+    <key name="CopyFile.RECENT_KEYS">
48
+      <recent name="C:\projectCode\playlet\project\src\components\detials" />
49
+    </key>
50
+  </component>
51
+  <component name="RunManager">
52
+    <configuration name="dev" type="js.build_tools.npm" nameIsGenerated="true">
53
+      <package-json value="$PROJECT_DIR$/project/package.json" />
54
+      <command value="run" />
55
+      <scripts>
56
+        <script value="dev" />
57
+      </scripts>
58
+      <node-interpreter value="project" />
59
+      <envs />
60
+      <method v="2" />
61
+    </configuration>
62
+  </component>
63
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
64
+  <component name="TaskManager">
65
+    <task active="true" id="Default" summary="Default task">
66
+      <changelist id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="" />
67
+      <created>1651134619686</created>
68
+      <option name="number" value="Default" />
69
+      <option name="presentableId" value="Default" />
70
+      <updated>1651134619686</updated>
71
+      <workItem from="1651134622442" duration="12757000" />
72
+      <workItem from="1651197530707" duration="20257000" />
73
+      <workItem from="1651715435371" duration="498000" />
74
+      <workItem from="1651720937846" duration="3607000" />
75
+      <workItem from="1651801746039" duration="13012000" />
76
+      <workItem from="1651888568336" duration="927000" />
77
+      <workItem from="1651894000029" duration="4978000" />
78
+      <workItem from="1652061471731" duration="10722000" />
79
+      <workItem from="1652166348383" duration="10980000" />
80
+      <workItem from="1652234936568" duration="13752000" />
81
+    </task>
82
+    <servers />
83
+  </component>
84
+  <component name="TypeScriptGeneratedFilesManager">
85
+    <option name="version" value="3" />
86
+  </component>
87
+  <component name="Vcs.Log.Tabs.Properties">
88
+    <option name="TAB_STATES">
89
+      <map>
90
+        <entry key="MAIN">
91
+          <value>
92
+            <State />
93
+          </value>
94
+        </entry>
95
+      </map>
96
+    </option>
97
+    <option name="oldMeFiltersMigrated" value="true" />
98
+  </component>
99
+</project>

+ 0 - 1
project/src/components/assembly/screen/channel.vue

@@ -52,7 +52,6 @@ export default {
52 52
   },
53 53
   watch: {
54 54
     reset () {
55
-      console.log('监听了',this.type);
56 55
       this.value = ''
57 56
       this.valueCon = {}
58 57
     },

+ 2 - 2
project/src/components/assembly/screen/datePicker.vue

@@ -93,8 +93,8 @@ export default {
93 93
   },
94 94
   watch: {
95 95
     reset () {
96
-      this.time = [this.$getDay(-30, false), this.$getDay(0, false)]
97
-      this.quickTimeCon =  { label: '近30天', value: '30', date: [this.$getDay(-30, false), this.$getDay(0, false)] }
96
+      this.time = this.afferent_time
97
+      this.setQuickTime()
98 98
     }
99 99
   },
100 100
   data () {