Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/accessPlan/index.vue

@@ -115,7 +115,7 @@
 
     <!-- 添加或修改监控调阅计划对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="任务名称" prop="planName">
           <el-input v-model="form.planName" placeholder="请输入任务名称" maxlength="50" :disabled="form.isEdit"/>
         </el-form-item>

src/views/core/materials/index.vue

@@ -69,11 +69,11 @@
           height="646"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
-          <el-table-column label="序号" type="index" align="center" width="68"/>
-          <el-table-column label="创建机构" align="left" header-align="center" width="250" prop="orgName"/>
-          <el-table-column label="资料名称" align="left" header-align="center" width="250" prop="title"/>
+          <el-table-column label="序号" type="index" align="center" width="70"/>
+          <el-table-column label="创建机构" align="left" header-align="center"  prop="orgName"/>
+          <el-table-column label="资料名称" align="left" header-align="center"  prop="title"/>
 
-          <el-table-column label="资料类型" align="center" width="180" prop="knowledgeId">
+          <el-table-column label="资料类型" align="center"  prop="knowledgeId">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.edu_materials_type" :value="parseInt(scope.row.knowledgeId)"/>
             </template>
@@ -82,17 +82,17 @@
           <!--          <el-table-column label="资料状态" align="center" prop="isOpen">
                       <template slot-scope="r">{{ r.row.isOpen == 0 ? '待发布' : '已发布' }}</template>
                     </el-table-column>-->
-          <el-table-column label="资料状态" width="100" align="center" header-align="center" prop="isOpen">
+          <el-table-column label="资料状态"  align="center" header-align="center" prop="isOpen">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.materials_status" :value="scope.row.isOpen"/>
             </template>
           </el-table-column>
 
-          <el-table-column label="创建人" align="center" width="150" prop="createBy"/>
-          <el-table-column label="创建时间" align="center" width="180" prop="createTime"/>
+          <el-table-column label="创建人" align="center"  prop="createBy"/>
+          <el-table-column label="创建时间" align="center"  prop="createTime"/>
 <!--          <el-table-column width="250" scoped-slot="remark" align="center" prop="remark" label="备注"></el-table-column>-->
 
-          <el-table-column label="操作"  fixed="right" header-align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="200"   header-align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <!-- 公开 按钮显示逻辑: 仅当前用户上传的学习资料且处于未公开状态-->
               <el-button

src/views/core/task/index.vue

@@ -43,8 +43,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="计划时间" prop="planStartTime">
-        <el-date-picker
+      <el-form-item label="任务时间" prop="planStartTime">
+        <!-- <el-date-picker
           v-model="queryParams.dateRange"
           style="width: 240px"
           value-format="yyyy-MM-dd HH:mm:ss"
@@ -53,7 +53,17 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           :default-time="['00:00:00', '23:59:59']"
-        ></el-date-picker>
+        ></el-date-picker> -->
+        <DataRangePicker
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              v-model="queryParams.dateRange"
+              :picker-options="pickerOptions"
+            >
+            </DataRangePicker>
       </el-form-item>
 
 
@@ -78,9 +88,7 @@
 
      <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="el-icon-download"
+        type="primary" icon="el-icon-download"
           size="mini"
           @click="handleExport"
           v-hasPermi="['core:task:export']"
@@ -176,8 +184,9 @@ import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import {listPlanRole} from "@/api/core/edu/plan";
 import {formatTime} from "@/utils/ruoyi";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 export default {
-  components: {OrgTree,DialogInfo},
+  components: {OrgTree,DialogInfo, DataRangePicker,},
   name: "Task",
   dicts: ['sys_access_cycle', 'retrieval_task_status'],
   data() {

src/views/system/dept/extend.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="org-extend">
-      <h3 class="title"><i class="el-icon-collection-tag"></i> 同步信息</h3>
+      <h3 class="title"><i class="el-icon-collection-tag"></i> 基础信息</h3>
       <div class="info-box">
         <el-descriptions>
           <el-descriptions-item
@@ -60,7 +60,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            label="达标时间"
+            label="达标日期"
             align="center"
             prop="dateOfCompliance"
             width="180"
@@ -211,11 +211,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="产权模式" v-if="type == 4">
+                <el-form-item label="产权类型" v-if="type == 4">
                   <el-select
                     clearable
                     v-model="ownership"
-                    placeholder="请选择产权模式"
+                    placeholder="请选择产权类型"
                   >
                     <el-option
                       v-for="dict in dict.type.property_situation"
@@ -590,7 +590,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="达标时间" prop="dateOfCompliance">
+        <el-form-item label="达标日期" prop="dateOfCompliance">
           <el-date-picker
             clearable
             v-model="orgform.dateOfCompliance"