From f766f98670ba6534248401d2386b2be85da5dd8b Mon Sep 17 00:00:00 2001
From: xbx <1827135378@qq.com>
Date: Sat, 18 Nov 2023 18:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=861.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 public/index.html                             |   4 +-
 src/components/layouts/TabLayout.vue          |   2 +-
 src/components/layouts/UserLayout.vue         |   2 +-
 src/components/page/GlobalHeader.vue          |   2 +-
 src/components/tools/Logo.vue                 |   5 +-
 src/views/dashboard/Analysis.vue              |  14 +-
 src/views/dashboard/IndexBdc.vue              | 171 +-----------
 src/views/dashboard/IndexChart.vue            | 133 +---------
 src/views/dashboard/IndexTask.vue             | 134 ----------
 .../rms/FurnitureList/RmsFurnitureList.vue    |  77 +++---
 .../modules/RmsFurnitureForm.vue              |  36 +--
 .../rms/InstrumentList/RmsInstrumentList.vue  |  80 +++---
 .../modules/RmsInstrumentForm.vue             |  34 +--
 .../rms/LocationList/RmsLocationList.vue      |   6 +
 .../LocationList/modules/RmsLocationForm.vue  |   5 +
 src/views/system/RmsInstrumentList.vue        | 236 -----------------
 .../system/modules/RmsInstrumentForm.vue      | 247 ------------------
 .../system/modules/RmsInstrumentModal.vue     |  64 -----
 src/views/user/oauth2/OAuth2Login.vue         |   2 +-
 20 files changed, 157 insertions(+), 1099 deletions(-)
 delete mode 100644 src/views/system/RmsInstrumentList.vue
 delete mode 100644 src/views/system/modules/RmsInstrumentForm.vue
 delete mode 100644 src/views/system/modules/RmsInstrumentModal.vue

diff --git a/.env.development b/.env.development
index 4f94849..6635393 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
+VUE_APP_API_BASE_URL=http://localhost:8088/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 
diff --git a/public/index.html b/public/index.html
index 0dc3db7..7802177 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <title>计科院ERP系统</title>
+  <title>计算机学院资源管理系统</title>
   <link rel="icon" href="<%= BASE_URL %>logo.png">
   <script src="<%= BASE_URL %>cdn/babel-polyfill/polyfill_7_2_5.js"></script>
   <style>
@@ -249,7 +249,7 @@
     <div id="loader"></div>
     <div class="loader-section section-left"></div>
     <div class="loader-section section-right"></div>
-    <div class="load_title">正在加载 计科院 ERP系统,请耐心等待
+    <div class="load_title">正在加载 计算机学院资源管理系统,请耐心等待
 
     </div>
   </div>
diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 5a5d627..151337b 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -183,7 +183,7 @@
        * @param title 要修改的新标题
        */
       changeTitle(title) {
-        let projectTitle = "计科院ERP系统"
+        let projectTitle = "计算机学院资源管理系统"
         // 首页特殊处理
         if (this.$route.path === indexKey) {
           document.title = projectTitle
diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue
index 27d616f..c7da616 100644
--- a/src/components/layouts/UserLayout.vue
+++ b/src/components/layouts/UserLayout.vue
@@ -6,7 +6,7 @@
         <div class="header">
           <a href="/">
             <img src="~@/assets/logo.svg" class="logo" alt="logo" />
-            <span class="title">计科院ERP系统</span>
+            <span class="title">计算机学院资源管理系统</span>
           </a>
         </div>
         <div class="desc">
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index 0442932..0e3ec3c 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -17,7 +17,7 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">欢迎进入 计科院ERP系统</span>
+      <span v-if="device === 'desktop'">欢迎进入 计算机学院资源管理系统</span>
       <span v-else>Jeecg-Boot</span>
 
       <user-menu :theme="theme"/>
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index 03c368b..365a8e9 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -21,7 +21,7 @@
     props: {
       title: {
         type: String,
-        default: '计科院ERP系统',
+        default: '资源管理系统',
         required: false
       },
       showTitle: {
@@ -38,6 +38,9 @@
   }
 </script>
 <style lang="less" scoped>
+h1 {
+  font-size: 4px; /* 这里的数字可以根据需要进行调整 */
+}
   /*缩小首页布 局顶部的高度*/
   @height: 59px;
 
diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 2e16b22..67a7213 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -1,20 +1,10 @@
 <template>
   <div>
-    <index-chart v-if="indexStyle==1"></index-chart>
-    <index-bdc v-if="indexStyle==2"></index-bdc>
-    <index-task v-if="indexStyle==3"></index-task>
-    <div style="width: 100%;text-align: right;margin-top: 20px">
-      请选择首页样式：
-      <a-radio-group v-model="indexStyle">
-        <a-radio :value="1">统计图表</a-radio>
-        <a-radio :value="2">统计图表2</a-radio>
-        <a-radio :value="3">任务表格</a-radio>
-      </a-radio-group>
-    </div>
+   
   </div>
 </template>
 
-<script>
+<script>  
   import IndexChart from './IndexChart'
   import IndexTask from "./IndexTask"
   import IndexBdc from './IndexBdc'
diff --git a/src/views/dashboard/IndexBdc.vue b/src/views/dashboard/IndexBdc.vue
index fa8edea..2ef5095 100644
--- a/src/views/dashboard/IndexBdc.vue
+++ b/src/views/dashboard/IndexBdc.vue
@@ -1,175 +1,6 @@
 <template>
   <div class="page-header-index-wide">
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="受理量" :total="cardCount.sll | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area :data-source="chartData.sll" />
-          </div>
-          <template slot="footer">今日受理量：<span>{{ todaySll }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="办结量" :total="cardCount.bjl | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area :data-source="chartData.bjl"/>
-          </div>
-          <template slot="footer">今日办结量：<span>{{ todayBjl }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="用户受理量" :total="cardCount.isll | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar :datasource="chartData.isll" :height="50"/>
-          </div>
-          <template slot="footer">用户今日受理量：<span>{{ todayISll }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="用户办结量" :total="cardCount.ibjl | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar :datasource="chartData.ibjl" :height="50"/>
-          </div>
-          <template slot="footer">用户今日办结量：<span>{{ todayIBjl }}</span></template>
-        </chart-card>
-      </a-col>
-    </a-row>
-
-    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
-      <div class="salesCard">
-        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <div class="extra-item">
-              <a>今日</a>
-              <a>本周</a>
-              <a>本月</a>
-              <a>本年</a>
-            </div>
-            <a-range-picker :style="{width: '256px'}" />
-          </div>
-
-          <a-tab-pane loading="true" tab="受理监管" key="1">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <index-bar title="受理量统计" />
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-
-                <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-                  <div class="item-group">
-                    <a-row>
-                      <a-col :class="'more-btn'" :span="12" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
-                        <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
-                      </a-col>
-                    </a-row>
-                  </div>
-                </a-card>
-
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-
-          <a-tab-pane tab="交互监管" key="2">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar-multid :sourceData="jhjgData" :fields="jhjgFields" title="平台与部门交互量统计"></bar-multid>
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-
-                <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-                  <div class="item-group">
-                    <a-row>
-                      <a-col :class="'more-btn'" :span="12" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
-                        <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
-                      </a-col>
-                    </a-row>
-                  </div>
-                </a-card>
-
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-
-          <a-tab-pane tab="存储监管" key="4">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <a-row>
-                  <template v-if="diskInfo && diskInfo.length>0">
-                    <a-col :span="12" v-for="(item,index) in diskInfo" :key=" 'diskInfo'+index ">
-                      <dash-chart-demo :title="item.name" :datasource="item.restPPT"></dash-chart-demo>
-                    </a-col>
-                  </template>
-                </a-row>
-              </a-col>
-
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-
-                <a-card title="快速开始 / 便捷导航" style="margin-bottom: 24px" :bordered="false" :body-style="{padding: 0}">
-                  <div class="item-group">
-                    <a-row>
-                      <a-col :class="'more-btn'" :span="10" v-for="(item,index) in registerTypeList" :key=" 'registerType'+index ">
-                        <a-button @click="goPage(index)" style="margin-bottom:10px" size="small" type="primary" ghost>{{ item.text }}</a-button>
-                      </a-col>
-                    </a-row>
-                  </div>
-                </a-card>
-
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-
-        </a-tabs>
-
-      </div>
-    </a-card>
-
-    <a-row :gutter="12">
-      <a-card :loading="loading" :class="{ 'anty-list-cust':true }" :bordered="false" :style="{ marginTop: '24px' }">
-
-        <a-tabs v-model="indexBottomTab" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <a-radio-group v-model="indexRegisterType" @change="changeRegisterType">
-              <a-radio-button value="转移登记">转移登记</a-radio-button>
-              <a-radio-button value="抵押登记">抵押登记</a-radio-button>
-              <a-radio-button value="">所有</a-radio-button>
-            </a-radio-group>
-          </div>
-
-          <a-tab-pane loading="true" tab="业务流程限时监管" key="1">
-
-            <a-table :dataSource="dataSource1" size="default" rowKey="id" :columns="columns" :pagination="ipagination1" @change="tableChange1">
-              <template slot="flowRate" slot-scope="text, record, index">
-                <a-progress :strokeColor="getPercentColor(record.flowRate)" :format="getPercentFormat" :percent="getFlowRateNumber(record.flowRate)" style="width:80px" />
-              </template>
-            </a-table>
-          </a-tab-pane>
-
-          <a-tab-pane loading="true" tab="业务节点限时监管" key="2">
-            <a-table :dataSource="dataSource2" size="default" rowKey="id" :columns="columns2" :pagination="ipagination2" @change="tableChange2">
-              <template slot="flowRate" slot-scope="text, record, index">
-                <span style="color: red;">{{ record.flowRate }}小时</span>
-              </template>
-            </a-table>
-          </a-tab-pane>
-
-        </a-tabs>
-
-
-      </a-card>
-    </a-row>
-
+    
   </div>
 </template>
 
diff --git a/src/views/dashboard/IndexChart.vue b/src/views/dashboard/IndexChart.vue
index 60ac1f5..b954b60 100644
--- a/src/views/dashboard/IndexChart.vue
+++ b/src/views/dashboard/IndexChart.vue
@@ -1,137 +1,6 @@
 <template>
   <div class="page-header-index-wide">
-    <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="总销售额" total="￥126,560">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <trend flag="up" style="margin-right: 16px;">
-              <span slot="term">周同比</span>
-              12%
-            </trend>
-            <trend flag="down">
-              <span slot="term">日同比</span>
-              11%
-            </trend>
-          </div>
-          <template slot="footer">日均销售额<span>￥ 234.56</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="订单量" :total="8846 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-area />
-          </div>
-          <template slot="footer">日订单量<span> {{ '1234' | NumberFormat }}</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="支付笔数" :total="6560 | NumberFormat">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-bar :height="40" />
-          </div>
-          <template slot="footer">转化率 <span>60%</span></template>
-        </chart-card>
-      </a-col>
-      <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="运营活动效果" total="78%">
-          <a-tooltip title="指标说明" slot="action">
-            <a-icon type="info-circle-o" />
-          </a-tooltip>
-          <div>
-            <mini-progress color="rgb(19, 194, 194)" :target="80" :percentage="78" :height="8" />
-          </div>
-          <template slot="footer">
-            <trend flag="down" style="margin-right: 16px;">
-              <span slot="term">同周比</span>
-              12%
-            </trend>
-            <trend flag="up">
-              <span slot="term">日环比</span>
-              80%
-            </trend>
-          </template>
-        </chart-card>
-      </a-col>
-    </a-row>
-
-    <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
-      <div class="salesCard">
-        <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
-          <div class="extra-wrapper" slot="tabBarExtraContent">
-            <div class="extra-item">
-              <a>今日</a>
-              <a>本周</a>
-              <a>本月</a>
-              <a>本年</a>
-            </div>
-            <a-range-picker :style="{width: '256px'}" />
-          </div>
-          <a-tab-pane loading="true" tab="销售额" key="1">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar title="销售额排行" :dataSource="barData"/>
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-          <a-tab-pane tab="销售趋势" key="2">
-            <a-row>
-              <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">
-                <bar title="销售额趋势" :dataSource="barData"/>
-              </a-col>
-              <a-col :xl="8" :lg="12" :md="12" :sm="24" :xs="24">
-                <rank-list title="门店销售排行榜" :list="rankList"/>
-              </a-col>
-            </a-row>
-          </a-tab-pane>
-        </a-tabs>
-      </div>
-    </a-card>
-
-    <a-row>
-      <a-col :span="24">
-        <a-card :loading="loading" :bordered="false" title="最近一周访问量统计" :style="{ marginTop: '24px' }">
-          <a-row>
-            <a-col :span="6">
-              <head-info title="今日IP" :content="loginfo.todayIp"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="environment" style="font-size: 24px"  />
-              </a-spin>
-            </a-col>
-            <a-col :span="6">
-              <head-info title="今日访问" :content="loginfo.todayVisitCount"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="team" style="font-size: 24px"  />
-              </a-spin>
-            </a-col>
-            <a-col :span="6">
-              <head-info title="总访问量" :content="loginfo.totalVisitCount"></head-info>
-            </a-col>
-            <a-col :span="2">
-              <a-spin class='circle-cust'>
-                <a-icon slot="indicator" type="rise" style="font-size: 24px"  />
-              </a-spin>
-            </a-col>
-          </a-row>
-          <line-chart-multid :fields="visitFields" :dataSource="visitInfo"></line-chart-multid>
-        </a-card>
-      </a-col>
-    </a-row>
+   
   </div>
 </template>
 
diff --git a/src/views/dashboard/IndexTask.vue b/src/views/dashboard/IndexTask.vue
index 8e9d84b..5677038 100644
--- a/src/views/dashboard/IndexTask.vue
+++ b/src/views/dashboard/IndexTask.vue
@@ -1,139 +1,5 @@
 <template>
   <div class="index-container-ty">
-    <a-spin :spinning="loading">
-      <a-row type="flex" justify="start" :gutter="3">
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/daiban.png"/>
-              我的待办【{{ dataSource1.length }}】
-            </div>
-            <div slot="extra">
-              <a v-if="dataSource1 && dataSource1.length>0" slot="footer" @click="goPage">更多 <a-icon type="double-right" /></a>
-            </div>
-            <a-table
-              :class="'my-index-table tytable1'"
-              ref="table1"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource1"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/zaiban.png"/>
-              我的在办【{{ dataSource2.length }}】
-            </div>
-            <div slot="extra">
-              <a v-if="dataSource2 && dataSource2.length>0" slot="footer" @click="goPage">更多 <a-icon type="double-right" /></a>
-            </div>
-            <a-table
-              :class="'my-index-table tytable2'"
-              ref="table2"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource2"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-        <a-col :span="24">
-          <div style="height: 5px;"></div>
-        </a-col>
-
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/guaz.png"/>
-              我的挂账【{{ dataSource4.length }}】
-            </div>
-            <a-table
-              :class="'my-index-table tytable4'"
-              ref="table4"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource4"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-        <a-col :sm="24" :lg="12">
-          <a-card>
-            <div slot="title" class="index-md-title">
-              <img src="../../assets/duban.png"/>
-              我的督办【{{ dataSource3.length }}】
-            </div>
-            <a-table
-              :class="'my-index-table tytable3'"
-              ref="table3"
-              size="small"
-              rowKey="id"
-              :columns="columns"
-              :dataSource="dataSource3"
-              :pagination="false">
-              <template slot="ellipsisText" slot-scope="text">
-                <j-ellipsis :value="text" :length="textMaxLength"></j-ellipsis>
-              </template>
-
-              <template slot="dayWarnning" slot-scope="text,record">
-                <a-icon type="bulb" theme="twoTone" style="font-size:22px" :twoToneColor="getTipColor(record)"/>
-              </template>
-
-              <span slot="action" slot-scope="text, record">
-                <a @click="handleData">办理</a>
-              </span>
-
-            </a-table>
-          </a-card>
-        </a-col>
-
-      </a-row>
-    </a-spin>
 
   </div>
 </template>
diff --git a/src/views/rms/FurnitureList/RmsFurnitureList.vue b/src/views/rms/FurnitureList/RmsFurnitureList.vue
index 5f20d6b..c318b1c 100644
--- a/src/views/rms/FurnitureList/RmsFurnitureList.vue
+++ b/src/views/rms/FurnitureList/RmsFurnitureList.vue
@@ -123,65 +123,76 @@
         description: '家具信息表管理页面',
         // 表头
         columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'领用单位号',
-            align:"center",
-            dataIndex: 'collectingUnitNumber_dictText'
-          },
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
           {
             title:'家具编号',
             align:"center",
-            dataIndex: 'furnitureNumber'
+            dataIndex: 'furnitureNumber',
+            width:120,
           },
           {
             title:'家具名称',
             align:"center",
-            dataIndex: 'furnitureName'
+            dataIndex: 'furnitureName',
+            width:120,
           },
+          {
+            title:'领用单位号',
+            align:"center",
+            dataIndex: 'collectingUnitNumber_dictText',
+            width:200
+          },
+          
           {
             title:'分类号',
             align:"center",
-            dataIndex: 'categoryId'
+            dataIndex: 'categoryId',
+            width:120,
           },
           {
             title:'型号',
             align:"center",
-            dataIndex: 'model'
+            dataIndex: 'model',
+            width:80
           },
           {
             title:'规格',
             align:"center",
-            dataIndex: 'specifications'
+            dataIndex: 'specifications',
+            width:80
           },
           {
             title:'数量',
             align:"center",
-            dataIndex: 'number'
+            dataIndex: 'number',
+            width:80
           },
           {
             title:'单价',
             align:"center",
-            dataIndex: 'unitPrice'
+            dataIndex: 'unitPrice',
+            width:80
           },
           {
             title:'金额',
             align:"center",
-            dataIndex: 'amount'
+            dataIndex: 'amount',
+            width:80
           },
           {
             title:'厂家',
             align:"center",
-            dataIndex: 'manufactuer'
+            dataIndex: 'manufactuer',
+            width:120
           },
           {
             title:'购置日期',
@@ -194,32 +205,38 @@
           {
             title:'领用人',
             align:"center",
-            dataIndex: 'recipient_dictText'
+            dataIndex: 'recipient_dictText',
+            width:80
           },
           {
             title:'单据号',
             align:"center",
-            dataIndex: 'documentNumber'
+            dataIndex: 'documentNumber',
+            width:80
           },
           {
             title:'存放地id',
             align:"center",
-            dataIndex: 'locationId'
+            dataIndex: 'locationId',
+            width:120
           },
           {
             title:'备注',
             align:"center",
-            dataIndex: 'note'
+            dataIndex: 'note',
+            width:120
           },
           {
             title:'审核状态',
             align:"center",
-            dataIndex: 'approvalStatus_dictText'
+            dataIndex: 'approvalStatus_dictText',
+            width:120
           },
           {
             title:'初审状态',
             align:"center",
-            dataIndex: 'initialAudit_dictText'
+            dataIndex: 'initialAudit_dictText',
+            width:120
           },
           {
             title:'使用年限',
diff --git a/src/views/rms/FurnitureList/modules/RmsFurnitureForm.vue b/src/views/rms/FurnitureList/modules/RmsFurnitureForm.vue
index 2f38862..d7724cf 100644
--- a/src/views/rms/FurnitureList/modules/RmsFurnitureForm.vue
+++ b/src/views/rms/FurnitureList/modules/RmsFurnitureForm.vue
@@ -3,92 +3,92 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="领用单位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectingUnitNumber">
               <j-select-depart v-model="model.collectingUnitNumber" :multi="true"  />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="家具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="furnitureNumber">
               <a-input v-model="model.furnitureNumber" placeholder="请输入家具编号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="家具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="furnitureName">
               <a-input v-model="model.furnitureName" placeholder="请输入家具名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="分类号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
               <a-input v-model="model.categoryId" placeholder="请输入分类号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
               <a-input v-model="model.model" placeholder="请输入型号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifications">
               <a-input v-model="model.specifications" placeholder="请输入规格"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
               <a-input v-model="model.number" placeholder="请输入数量"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitPrice">
               <a-input v-model="model.unitPrice" placeholder="请输入单价"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amount">
               <a-input v-model="model.amount" placeholder="请输入金额"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufactuer">
               <a-input v-model="model.manufactuer" placeholder="请输入厂家"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="购置日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="purchaseDate">
               <j-date placeholder="请选择购置日期" v-model="model.purchaseDate"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
               <j-select-user-by-dep v-model="model.recipient" :multi="true" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="documentNumber">
               <a-input v-model="model.documentNumber" placeholder="请输入单据号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="存放地id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationId">
               <a-input v-model="model.locationId" placeholder="请输入存放地id"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="note">
               <a-input v-model="model.note" placeholder="请输入备注"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalStatus">
               <j-dict-select-tag type="radio" v-model="model.approvalStatus" dictCode="approval_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="初审状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAudit">
               <j-dict-select-tag type="radio" v-model="model.initialAudit" dictCode="initial_audit" placeholder="请选择初审状态" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="使用年限" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="usageYears">
               <a-input v-model="model.usageYears" placeholder="请输入使用年限"  ></a-input>
             </a-form-model-item>
diff --git a/src/views/rms/InstrumentList/RmsInstrumentList.vue b/src/views/rms/InstrumentList/RmsInstrumentList.vue
index accfacc..0285d30 100644
--- a/src/views/rms/InstrumentList/RmsInstrumentList.vue
+++ b/src/views/rms/InstrumentList/RmsInstrumentList.vue
@@ -123,55 +123,71 @@
         description: '仪器信息表管理页面',
         // 表头
         columns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
           {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
+            title:'ID',
             align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'领用单位号',
-            align:"center",
-            dataIndex: 'collectingUnitNumber_dictText'
+            dataIndex: 'instrumentId',
+            width:80
           },
           {
             title:'仪器编号',
             align:"center",
-            dataIndex: 'instrumentNumber'
+            dataIndex: 'instrumentNumber',
+            width:120
           },
           {
             title:'仪器名称',
             align:"center",
-            dataIndex: 'instrumentName'
+            dataIndex: 'instrumentName',
+            width:120
           },
+          {
+            title:'领用单位号',
+            align:"center",
+            dataIndex: 'collectingUnitNumber_dictText',
+            width:200
+          },
+          
           {
             title:'分类号',
             align:"center",
-            dataIndex: 'categoryId'
+            dataIndex: 'categoryId',
+            width:120
           },
           {
             title:'型号',
             align:"center",
-            dataIndex: 'model'
+            dataIndex: 'model',
+            width:120
+
           },
           {
             title:'规格',
             align:"center",
-            dataIndex: 'specifications'
+            dataIndex: 'specifications',
+            width:120
           },
           {
             title:'单价',
             align:"center",
-            dataIndex: 'unitPrice'
+            dataIndex: 'unitPrice',
+            width:120
           },
           {
             title:'厂家',
             align:"center",
-            dataIndex: 'manufactuer'
+            dataIndex: 'manufactuer',
+            width:200
           },
           {
             title:'购置日期',
@@ -179,12 +195,14 @@
             dataIndex: 'purchasedate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            },
+            width:120
           },
           {
             title:'领用人',
             align:"center",
-            dataIndex: 'recipient_dictText'
+            dataIndex: 'recipient_dictText',
+            width:80
           },
           {
             title:'入库时间',
@@ -192,7 +210,8 @@
             dataIndex: 'entryDate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
-            }
+            },
+            width:80
           },
           {
             title:'单据号',
@@ -202,27 +221,26 @@
           {
             title:'存放地id',
             align:"center",
-            dataIndex: 'locationId'
+            dataIndex: 'locationId',
+            width:120
           },
           {
             title:'备注',
             align:"center",
-            dataIndex: 'note'
+            dataIndex: 'note',
+            width:120
           },
           {
             title:'审核状态',
             align:"center",
-            dataIndex: 'approvalStatus_dictText'
+            dataIndex: 'approvalStatus_dictText',
+            width:120
           },
           {
             title:'初审状态',
             align:"center",
-            dataIndex: 'initialAudit_dictText'
-          },
-          {
-            title:'ID',
-            align:"center",
-            dataIndex: 'instrumentId'
+            dataIndex: 'initialAudit_dictText',
+            width:120
           },
           {
             title: '操作',
diff --git a/src/views/rms/InstrumentList/modules/RmsInstrumentForm.vue b/src/views/rms/InstrumentList/modules/RmsInstrumentForm.vue
index 831855c..4180d9f 100644
--- a/src/views/rms/InstrumentList/modules/RmsInstrumentForm.vue
+++ b/src/views/rms/InstrumentList/modules/RmsInstrumentForm.vue
@@ -3,87 +3,87 @@
     <j-form-container :disabled="formDisabled">
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="领用单位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectingUnitNumber">
               <j-select-depart v-model="model.collectingUnitNumber" :multi="true"  />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="仪器编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentNumber">
               <a-input v-model="model.instrumentNumber" placeholder="请输入仪器编号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="仪器名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentName">
               <a-input v-model="model.instrumentName" placeholder="请输入仪器名称"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="分类号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="categoryId">
               <a-input v-model="model.categoryId" placeholder="请输入分类号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model">
               <a-input v-model="model.model" placeholder="请输入型号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specifications">
               <a-input v-model="model.specifications" placeholder="请输入规格"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitPrice">
               <a-input v-model="model.unitPrice" placeholder="请输入单价"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufactuer">
               <a-input v-model="model.manufactuer" placeholder="请输入厂家"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="购置日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="purchasedate">
               <j-date placeholder="请选择购置日期" v-model="model.purchasedate"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
               <j-select-user-by-dep v-model="model.recipient" :multi="true" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entryDate">
               <j-date placeholder="请选择入库时间" v-model="model.entryDate"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="documentNumber">
               <a-input v-model="model.documentNumber" placeholder="请输入单据号"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="存放地id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationId">
               <a-input v-model="model.locationId" placeholder="请输入存放地id"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="note">
               <a-input v-model="model.note" placeholder="请输入备注"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalStatus">
               <j-dict-select-tag type="radio" v-model="model.approvalStatus" dictCode="approval_status" placeholder="请选择审核状态" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="初审状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAudit">
               <j-dict-select-tag type="radio" v-model="model.initialAudit" dictCode="initial_audit" placeholder="请选择初审状态" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-model-item label="ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentId">
               <a-input v-model="model.instrumentId" placeholder="请输入ID"  ></a-input>
             </a-form-model-item>
diff --git a/src/views/rms/LocationList/RmsLocationList.vue b/src/views/rms/LocationList/RmsLocationList.vue
index 7bb7ce3..20c64e4 100644
--- a/src/views/rms/LocationList/RmsLocationList.vue
+++ b/src/views/rms/LocationList/RmsLocationList.vue
@@ -131,6 +131,11 @@
             align:"center",
             dataIndex: 'locationName'
           },
+          {
+            title:'父节点id',
+            align:"center",
+            dataIndex: 'parentLocationId'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -167,6 +172,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'locationId',text:'存放地id',dictCode:''})
         fieldList.push({type:'string',value:'locationName',text:'存放地名称',dictCode:''})
+        fieldList.push({type:'string',value:'parentLocationId',text:'父节点id',dictCode:''})
         this.superFieldList = fieldList
       }
     }
diff --git a/src/views/rms/LocationList/modules/RmsLocationForm.vue b/src/views/rms/LocationList/modules/RmsLocationForm.vue
index 1be9d14..9f7d2e9 100644
--- a/src/views/rms/LocationList/modules/RmsLocationForm.vue
+++ b/src/views/rms/LocationList/modules/RmsLocationForm.vue
@@ -13,6 +13,11 @@
               <a-input v-model="model.locationName" placeholder="请输入存放地名称"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="父节点id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parentLocationId">
+              <a-input v-model="model.parentLocationId" placeholder="请输入父节点id"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>
diff --git a/src/views/system/RmsInstrumentList.vue b/src/views/system/RmsInstrumentList.vue
deleted file mode 100644
index 9fe20a6..0000000
--- a/src/views/system/RmsInstrumentList.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-    
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('仪器信息表')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        class="j-table-force-nowrap"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <rms-instrument-modal ref="modalForm" @ok="modalFormOk"/>
-  </a-card>
-</template>
-
-<script>
-
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import RmsInstrumentModal from './modules/RmsInstrumentModal.vue'
-  import '@/assets/less/TableExpand.less'
-
-  export default {
-    name: "RmsInstrumentList",
-    mixins:[JeecgListMixin],
-    components: {
-      RmsInstrumentModal
-    },
-    data () {
-      return {
-        description: '仪器信息表管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'仪器id',
-            align:"center",
-            dataIndex: 'instrumentId'
-          },
-          {
-            title:'资产编号',
-            align:"center",
-            dataIndex: 'assetNumber'
-          },
-          {
-            title:'单价',
-            align:"center",
-            dataIndex: 'unitPrice'
-          },
-          {
-            title:'厂家',
-            align:"center",
-            dataIndex: 'manufactuer'
-          },
-          {
-            title:'购置日期',
-            align:"center",
-            dataIndex: 'purchaseDate'
-          },
-          {
-            title:'入库时间',
-            align:"center",
-            dataIndex: 'entryDate'
-          },
-          {
-            title:'单据号',
-            align:"center",
-            dataIndex: 'documentNumber'
-          },
-          {
-            title:'存放地id',
-            align:"center",
-            dataIndex: 'locationId'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'note'
-          },
-          {
-            title:'领用单位id',
-            align:"center",
-            dataIndex: 'unitId'
-          },
-          {
-            title:'领用人',
-            align:"center",
-            dataIndex: 'recipient'
-          },
-          {
-            title:'审核状态id',
-            align:"center",
-            dataIndex: 'approvalStatusId'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        url: {
-          list: "/rms/rmsInstrument/list",
-          delete: "/rms/rmsInstrument/delete",
-          deleteBatch: "/rms/rmsInstrument/deleteBatch",
-          exportXlsUrl: "/rms/rmsInstrument/exportXls",
-          importExcelUrl: "rms/rmsInstrument/importExcel",
-          
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-      this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      }
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'instrumentId',text:'仪器id',dictCode:''})
-        fieldList.push({type:'string',value:'assetNumber',text:'资产编号',dictCode:''})
-        fieldList.push({type:'string',value:'unitPrice',text:'单价',dictCode:''})
-        fieldList.push({type:'string',value:'manufactuer',text:'厂家',dictCode:''})
-        fieldList.push({type:'string',value:'purchaseDate',text:'购置日期',dictCode:''})
-        fieldList.push({type:'string',value:'entryDate',text:'入库时间',dictCode:''})
-        fieldList.push({type:'string',value:'documentNumber',text:'单据号',dictCode:''})
-        fieldList.push({type:'string',value:'locationId',text:'存放地id',dictCode:''})
-        fieldList.push({type:'string',value:'note',text:'备注',dictCode:''})
-        fieldList.push({type:'string',value:'unitId',text:'领用单位id',dictCode:''})
-        fieldList.push({type:'string',value:'recipient',text:'领用人',dictCode:''})
-        fieldList.push({type:'string',value:'approvalStatusId',text:'审核状态id',dictCode:''})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/src/views/system/modules/RmsInstrumentForm.vue b/src/views/system/modules/RmsInstrumentForm.vue
deleted file mode 100644
index 1b15b78..0000000
--- a/src/views/system/modules/RmsInstrumentForm.vue
+++ /dev/null
@@ -1,247 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <!-- 主表单区域 -->
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24" >
-            <a-form-model-item label="仪器id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="instrumentId">
-              <a-input v-model="model.instrumentId" placeholder="请输入仪器id" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="资产编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="assetNumber">
-              <a-input v-model="model.assetNumber" placeholder="请输入资产编号" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitPrice">
-              <a-input v-model="model.unitPrice" placeholder="请输入单价" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="厂家" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufactuer">
-              <a-input v-model="model.manufactuer" placeholder="请输入厂家" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="购置日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="purchaseDate">
-              <a-input v-model="model.purchaseDate" placeholder="请输入购置日期" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="entryDate">
-              <a-input v-model="model.entryDate" placeholder="请输入入库时间" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="单据号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="documentNumber">
-              <a-input v-model="model.documentNumber" placeholder="请输入单据号" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="存放地id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationId">
-              <a-input v-model="model.locationId" placeholder="请输入存放地id" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="note">
-              <a-input v-model="model.note" placeholder="请输入备注" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="领用单位id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unitId">
-              <a-input v-model="model.unitId" placeholder="请输入领用单位id" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recipient">
-              <a-input v-model="model.recipient" placeholder="请输入领用人" ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24" >
-            <a-form-model-item label="审核状态id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalStatusId">
-              <a-input v-model="model.approvalStatusId" placeholder="请输入审核状态id" ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-      <!-- 子表单区域 -->
-    <a-tabs v-model="activeKey" @change="handleChangeTabs">
-      <a-tab-pane tab="资产属性表" :key="refKeys[0]" :forceRender="true">
-        <j-vxe-table
-          keep-source
-          :ref="refKeys[0]"
-          :loading="rmsAssetAttributesTable.loading"
-          :columns="rmsAssetAttributesTable.columns"
-          :dataSource="rmsAssetAttributesTable.dataSource"
-          :maxHeight="300"
-          :disabled="formDisabled"
-          :rowNumber="true"
-          :rowSelection="true"
-          :toolbar="true"
-          />
-      </a-tab-pane>
-    </a-tabs>
-  </a-spin>
-</template>
-
-<script>
-
-  import { getAction } from '@/api/manage'
-  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
-  import { JVXETypes } from '@/components/jeecg/JVxeTable'
-  import { getRefPromise,VALIDATE_FAILED} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
-  import { validateDuplicateValue } from '@/utils/util'
-  import JFormContainer from '@/components/jeecg/JFormContainer'
-
-  export default {
-    name: 'RmsInstrumentForm',
-    mixins: [JVxeTableModelMixin],
-    components: {
-      JFormContainer,
-    },
-    data() {
-      return {
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        model:{
-         },
-        // 新增时子表默认添加几行空数据
-        addDefaultRowNum: 1,
-        validatorRules: {
-        },
-        refKeys: ['rmsAssetAttributes', ],
-        tableKeys:['rmsAssetAttributes', ],
-        activeKey: 'rmsAssetAttributes',
-        // 资产属性表
-        rmsAssetAttributesTable: {
-          loading: false,
-          dataSource: [],
-          columns: [
-            {
-              title: '资产编号',
-              key: 'assetNumber',
-               type: JVXETypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '资产名称',
-              key: 'assetName',
-               type: JVXETypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '分类号',
-              key: 'cateGoryId',
-               type: JVXETypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '型号',
-              key: 'model',
-               type: JVXETypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-            {
-              title: '规格',
-              key: 'specifications',
-               type: JVXETypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
-          ]
-        },
-        url: {
-          add: "/rms/rmsInstrument/add",
-          edit: "/rms/rmsInstrument/edit",
-          queryById: "/rms/rmsInstrument/queryById",
-          rmsAssetAttributes: {
-            list: '/rms/rmsInstrument/queryRmsAssetAttributesByMainId'
-          },
-        }
-      }
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-    },
-    methods: {
-      addBefore(){
-        this.rmsAssetAttributesTable.dataSource=[]
-      },
-      getAllTable() {
-        let values = this.tableKeys.map(key => getRefPromise(this, key))
-        return Promise.all(values)
-      },
-      /** 调用完edit()方法之后会自动调用此方法 */
-      editAfter() {
-        this.$nextTick(() => {
-        })
-        // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
-          this.requestSubTableData(this.url.rmsAssetAttributes.list, params, this.rmsAssetAttributesTable)
-        }
-      },
-      //校验所有一对一子表表单
-        validateSubForm(allValues){
-            return new Promise((resolve,reject)=>{
-              Promise.all([
-              ]).then(() => {
-                resolve(allValues)
-              }).catch(e => {
-                if (e.error === VALIDATE_FAILED) {
-                  // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-                  this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
-                } else {
-                  console.error(e)
-                }
-              })
-            })
-        },
-      /** 整理成formData */
-      classifyIntoFormData(allValues) {
-        let main = Object.assign(this.model, allValues.formValue)
-        return {
-          ...main, // 展开
-          rmsAssetAttributesList: allValues.tablesValue[0].tableData,
-        }
-      },
-      validateError(msg){
-        this.$message.error(msg)
-      },
-
-    }
-  }
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/system/modules/RmsInstrumentModal.vue b/src/views/system/modules/RmsInstrumentModal.vue
deleted file mode 100644
index e7c7732..0000000
--- a/src/views/system/modules/RmsInstrumentModal.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="1200"
-    :visible="visible"
-    :maskClosable="false"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel">
-    <rms-instrument-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
-  </j-modal>
-</template>
-
-<script>
-
-  import RmsInstrumentForm from './RmsInstrumentForm.vue'
-
-  export default {
-    name: 'RmsInstrumentModal',
-    components: {
-      RmsInstrumentForm
-    },
-    data() {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods:{
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.handleOk();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/user/oauth2/OAuth2Login.vue b/src/views/user/oauth2/OAuth2Login.vue
index 08b01bd..d8243e9 100644
--- a/src/views/user/oauth2/OAuth2Login.vue
+++ b/src/views/user/oauth2/OAuth2Login.vue
@@ -4,7 +4,7 @@
       <div id="loader"></div>
       <div class="loader-section section-left"></div>
       <div class="loader-section section-right"></div>
-      <div class="load_title">正在登录 计科院ERP系统，请耐心等待</div>
+      <div class="load_title">正在登录 计算机学院资源管理系统，请耐心等待</div>
     </div>
   </div>
 </template>