diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 932ab2197..8629a49f2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="" />
+ <list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ </list>
<ignored path="$PROJECT_DIR$/ruoyi-ui/node_modules/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -18,20 +20,81 @@
<option name="width" value="1260" />
<option name="height" value="710" />
</component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
- <pane id="ProjectPane" />
<pane id="Scope" />
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
+ <item name="benyi" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="java" type="462c0819:PsiDirectoryNode" />
+ <item name="com" type="462c0819:PsiDirectoryNode" />
+ <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$/../benyi-web" />
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1592562925554" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/ruoyi/pom.xml" />
+ <property name="project.structure.last.edited" value="Project" />
+ <property name="project.structure.proportion" value="0.15" />
+ <property name="project.structure.side.proportion" value="0.2" />
+ <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -56,27 +119,24 @@
<option name="presentableId" value="Default" />
<updated>1588661607928</updated>
<workItem from="1588661609569" duration="59000" />
+ <workItem from="1592562464381" duration="132000" />
+ <workItem from="1592562689854" duration="303000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="59000" />
+ <option name="totallyTimeSpent" value="494000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1294" height="694" extended-state="6" />
<layout>
- <window_info id="Image Layers" />
- <window_info id="Designer" />
- <window_info id="UI Designer" />
- <window_info id="Capture Tool" />
- <window_info id="Favorites" side_tool="true" />
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25809062" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
- <window_info anchor="bottom" id="Docker" show_stripe_button="false" />
- <window_info anchor="bottom" id="Database Changes" />
- <window_info anchor="bottom" id="Version Control" />
- <window_info anchor="bottom" id="Terminal" />
- <window_info anchor="bottom" id="Event Log" side_tool="true" />
+ <window_info id="Image Layers" order="2" />
+ <window_info id="Designer" order="3" />
+ <window_info id="UI Designer" order="4" />
+ <window_info id="Capture Tool" order="5" />
+ <window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
@@ -84,18 +144,97 @@
<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" />
- <window_info anchor="right" id="Palette" />
- <window_info anchor="right" id="Theme Preview" />
- <window_info anchor="right" id="Maven" />
- <window_info anchor="right" id="Capture Analysis" />
- <window_info anchor="right" id="Palette	" />
- <window_info anchor="right" id="Database" />
+ <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
+ <window_info anchor="bottom" id="Version Control" order="8" />
+ <window_info anchor="bottom" id="Database Changes" order="9" />
+ <window_info anchor="bottom" id="Terminal" order="10" />
+ <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+ <window_info anchor="right" id="Palette" order="3" />
+ <window_info anchor="right" id="Theme Preview" order="4" />
+ <window_info anchor="right" id="Maven" order="5" />
+ <window_info anchor="right" id="Capture Analysis" order="6" />
+ <window_info anchor="right" id="Palette	" order="7" />
+ <window_info anchor="right" id="Database" order="8" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
+ <component name="masterDetails">
+ <states>
+ <state key="ArtifactsStructureConfigurable.UI">
+ <settings>
+ <artifact-editor />
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="FacetStructureConfigurable.UI">
+ <settings>
+ <last-edited>No facets are configured</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="GlobalLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="JdkListConfigurable.UI">
+ <settings>
+ <last-edited>1.8</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ModuleStructureConfigurable.UI">
+ <settings>
+ <last-edited>benyi</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
</project>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue b/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue
index cea71c3d2..318e1a09a 100644
--- a/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowstudy/index.vue
@@ -24,17 +24,59 @@
/>
</div>
</el-col>
- <el-col :span="20" :xs="24">test</el-col>
+ <el-col :span="20" :xs="24">
+ <el-card>
+ <div slot="header" class="clearfix">
+ <span>内容介绍</span>
+ </div>
+ <div
+ v-for="(item, index) in dayflowtaskList"
+ :key="index"
+ class="text item">
+ {{' 任务名称 ' + item.taskLable + " "
+ + '所含标准个数' + item.standardCount }}
+ </div>
+ <!-- <div class="text item">
+ <el-form-item label="意见建议" prop="content">
+ <el-input
+ type="textarea"
+ v-model="form.content"
+ :disabled="dis"
+ maxlength="500"
+ placeholder="请您对视频内容和讲师作出评价，并告诉我们你喜欢或不喜欢的理由，以便使我们改进对您的服务品质。谢谢您的支持！"
+ />
+ </el-form-item>
+ </div> -->
+ <!-- <div class="text item">
+ <el-form-item label="标题">{{title}}</el-form-item>
+ </div>
+ <div class="text item">
+ <el-form-item label="讲师">{{lecturername}}</el-form-item>
+ </div>
+ <div class="text item">
+ <el-form-item label="简介">{{information}}</el-form-item>
+ </div>
+ <div class="text item">
+ <el-form-item label="评分" prop="score">
+ <el-rate v-model="form.score" :disabled="dis" :show-score="dis"></el-rate>
+ <el-input v-model="form.videoid" v-if="false" />
+ <el-input v-model="form.lecturerid" v-if="false" />
+ </el-form-item>
+ </div> -->
+ </el-card>
+ </el-col>
</el-row>
</div>
</template>
<script>
import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
+import { listDayflowtask } from "@/api/benyi/dayflow/dayflowtask";
import { treeselect } from "@/api/benyi/dayflow/dayflowmanger";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
export default {
name: "Detail",
data() {
@@ -43,12 +85,20 @@ export default {
loading: true,
// 一日流程名称
name: undefined,
+ // 一日流程id
+ id: undefined,
+ // 根据一日流程id查到的名下任务列表
+ dayflowtaskList: [],
// 树状显示类型
treeOptions: [],
- //树结构
+ // 树结构
defaultProps: {
children: "children",
label: "label"
+ },
+ // 查询参数
+ queryParams: {
+ detailId: undefined
}
};
},
@@ -75,7 +125,18 @@ export default {
},
// 节点单击事件
handleNodeClick(data) {
- }
+ this.queryParams.detailId = data.id;
+ this.getTaskList();
+ },
+ /** 查询一日流程任务列表 */
+ getTaskList() {
+ this.loading = true;
+ listDayflowtask(this.queryParams).then(response => {
+ this.dayflowtaskList = response.rows;
+ console.log(this.dayflowtaskList);
+ this.loading = false;
+ });
+ },
}
};
</script>
\ No newline at end of file