hyf 3 jaren geleden
bovenliggende
commit
4585e45eea

+ 4 - 3
src/layout/components/Navbar.vue

@@ -84,15 +84,16 @@ export default {
       sideMenuTabList: [
         { name: '工作总览', icon: 'el-icon-s-platform', path: '/hos/satisfy/overview', permit: 'hos_satisfy_overview', id: 0 },
         { name: '实时监测', icon: 'icon-common_monitoring', path: '/hos/satisfy/panorama', permit: 'hos_satisfy_panorama', id: 1 },
-        { name: '建设划', icon: 'icon-common_saving', path: '/hos/satisfy/instruction', permit: 'hos_satisfy_instruction', id: 2 },
-        { name: '任务动态', icon: 'icon-common_task', path: '/hos/satisfy/task', permit: 'hos_satisfy_task', id: 3 },
+        { name: '建设划', icon: 'icon-common_saving', path: '/hos/satisfy/instruction', permit: 'hos_satisfy_instruction', id: 2 },
+        { name: '工作动态', icon: 'icon-common_task', path: '/hos/satisfy/task', permit: 'hos_satisfy_task', id: 3 },
         { name: '成果评价', icon: 'icon-common_evaluate', path: '/hos/satisfy/assess', permit: 'hos_satisfy_assess', id: 4 },
         { name: '文件中心', icon: 'icon-common_file', path: '/hos/satisfy/doc', permit: 'hos_satisfy_doc', id: 5 },
-        { name: '业务配置', icon: 'el-icon-setting', path: '/hos/checklist', permit: 'hos_checklist', id: 6 },
+        { name: '业务管理', icon: 'el-icon-setting', path: '/hos/checklist', permit: 'hos_checklist', id: 6 },
         { name: '系统配置', icon: 'icon-common_workbench', path: '/hos/profile', permit: 'hos_setting', id: 7 }
       ]
     }
   },
+
   computed: {
     ...mapGetters([
       'device',

+ 1 - 0
src/views/hos/assess/index.vue

@@ -4,6 +4,7 @@
       <el-col :span="3" class="left-counter-wrap">
         <year-month-score ref="YearMonthScore" :title="title" :story-id="storyId" @selectItem="selectItem" />
       </el-col>
+
       <el-col :span="21">
         <assess-list ref="AssessList" action-update="actionUpdate" />
       </el-col>

+ 3 - 3
src/views/hos/doctor/index.vue

@@ -8,10 +8,10 @@
       </el-col>
 
       <el-col :span="12" class="right">
-        <el-input v-model="conditions.keywords" class="search-input m-right-15" placeholder="请输入内容">
-          <el-button slot="append" icon="el-icon-search" @click="getData()" />
+        <el-input v-model="conditions.keywords" class="search-input m-right-15" size="mini" placeholder="请输入内容">
+          <el-button slot="append" icon="el-icon-search" size="mini" @click="getData()" />
         </el-input>
-        <el-button type="primary" size="mini" @click="handleAdd">添加</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">添加</el-button>
         <el-button type="primary" size="mini" :disabled="!(exportItems&&exportItems.length>0)" @click="downloadQrcode">下载二维码</el-button>
       </el-col>
     </el-row>

+ 3 - 5
src/views/hos/profile/hos.vue → src/views/hos/profile/components/Hos.vue

@@ -168,11 +168,9 @@ export default {
       this.resetFormData()
 
       getHosProfile().then((resp) => {
-        const { code, data } = resp
-        if (code === 200) {
-          this.formData = data
-          if (this.formData.entXzqhdm) { this.viewData.cityCode = this.formData.entXzqhdm.split(',') }
-        }
+        const { data } = resp
+        this.formData = data
+        if (this.formData.entXzqhdm) { this.viewData.cityCode = this.formData.entXzqhdm.split(',') }
       }).catch((error) => {
         console.log(error)
       })

+ 1 - 1
src/views/hos/profile/index.vue

@@ -49,7 +49,7 @@
 <script>
 import Vuescroll from 'vuescroll'
 import { getHosProfile } from '@/api/hos/hosProfileApi'
-import Hos from './hos'
+import Hos from './components/Hos.vue'
 import { AMapManager } from 'vue-amap'
 const amapManager = new AMapManager()
 import comMixins from '@/mixin/commonMethodMixin'

+ 3 - 1
src/views/system/checklist/components/ChecklistItem.vue

@@ -94,7 +94,7 @@ export default {
     },
 
     handleAddItem(type, item, sortNo, itemList) {
-      var _item = {}
+      let _item = {}
       if (type === 1) {
         _item = {
           itemTitle: '新增item',
@@ -185,6 +185,7 @@ export default {
       })
       this.$forceUpdate()
     },
+
     savePoint(point) {
       createChecklistItemPoint(point).then((resp) => {
         point.editAble = false
@@ -194,6 +195,7 @@ export default {
         console.log(error)
       })
     },
+
     saveEdit(point) {
       updateChecklistItemPoint(point).then((resp) => {
         point.editAble = false

+ 1 - 0
src/views/system/checklist/components/Content.vue

@@ -74,6 +74,7 @@ export default {
   margin: 0 0 15px 15px;
   height: calc(100vh - 160px);
   background: #164153;
+  border-radius: 5px;
   .checklist-item-container{
     padding: 0 10px;
   }

+ 3 - 4
src/views/system/checklist/components/Details.vue

@@ -1,19 +1,18 @@
 <template>
   <el-drawer
     :title="title"
-    :modal-append-to-body="false"
+    :append-to-body="false"
     :modal="false"
     :wrapper-closable="false"
     size="99%"
     :visible.sync="dialogVisible"
   >
     <el-row class="content-container">
-
-      <el-col :span="18" class="right-counter-wrap">
+      <el-col :span="19" class="right-counter-wrap">
         <ChecklistContent ref="ChecklistContent" @actionUpdate="actionUpdate" />
       </el-col>
 
-      <el-col :span="6" class="left-counter-wrap">
+      <el-col :span="5" class="left-counter-wrap">
         <ChecklistInfo ref="ChecklistInfo" @actionUpdate="actionUpdate" />
       </el-col>
     </el-row>

+ 5 - 4
src/views/system/checklist/index.vue

@@ -8,10 +8,11 @@
       </el-col>
 
       <el-col :span="12" class="right">
-        <el-input v-model="conditions.keywords" class="search-input m-right-15" placeholder="请输入内容">
-          <el-button slot="append" icon="el-icon-search" @click="getData()" />
+        <el-input v-model="conditions.keywords" class="search-input m-right-15" size="mini" placeholder="请输入内容">
+          <el-button slot="append" icon="el-icon-search" size="mini" @click="getData()" />
         </el-input>
-        <el-button type="primary" @click="handleAdd">添加</el-button>
+
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加</el-button>
       </el-col>
     </el-row>
 
@@ -53,7 +54,7 @@
 
         <el-table-column label="操作" header-align="center" align="center" width="180">
           <template v-slot="{row}">
-            <el-button size="mini" icon="el-icon-view" type="info" @click="handleDetails(row)">查看</el-button>
+            <el-button size="mini" icon="el-icon-view" type="primary" @click="handleDetails(row)">详情</el-button>
             <el-button v-if="row.isFixed !== 1" size="mini" icon="el-icon-delete" type="danger" @click="handleDelete(row)">删除</el-button>
           </template>
         </el-table-column>

+ 6 - 4
src/views/system/grid/index.vue

@@ -7,11 +7,13 @@
         </div>
       </el-col>
       <el-col :span="12" class="right">
-        <el-input v-model="conditions.keywords" class="search-input m-right-15" placeholder="请输入内容">
-          <el-button slot="append" icon="el-icon-search" @click="getData()" />
+        <el-input v-model="conditions.keywords" class="search-input m-right-15" size="mini" placeholder="请输入内容">
+          <el-button slot="append" icon="el-icon-search" size="mini" @click="getData()" />
         </el-input>
-        <el-button type="primary" @click="handleAdd">添加</el-button>
-        <el-button type="primary" :disabled="!(exportItems&&exportItems.length>0)" @click="downloadQrcode">下载二维码</el-button>
+
+        <el-button type="primary" size="mini" icon="el-icon-plus" @click="handleAdd">添加</el-button>
+
+        <el-button type="primary" size="mini" :disabled="!(exportItems&&exportItems.length>0)" @click="downloadQrcode">下载二维码</el-button>
       </el-col>
     </el-row>