界面样式，获取待办事项列表

src/dashoo.cn/backend/api/business/samplesapply/samplesapplyService.go

@@ -85,5 +85,6 @@ func (s *SamplesApplyService) GetApplyViewtList(pageIndex, itemsPerPage int64, a
 			break
 		}
 	}
+	fmt.Println("-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0-0", List)
 	return total, List
 }

src/dashoo.cn/backend/api/controllers/casbin/user.go

@@ -523,9 +523,10 @@ func (this *UserController) GetAccountInfo() {
 	//待办事项
 	svcw := samplesapply.GetSamplesApplyService(utils.DBE)
 	where_rk := " ApplyType = 1 and ApplyStatus = 0 "
-	rktotal, rklist := svcw.GetApplyViewtList(1, 1, this.User.AccCode+SamplesApplyName, "Id", where_rk)
+	rktotal, rklist := svcw.GetApplyViewtList(1, 100, this.User.AccCode+SamplesApplyName, "Id", where_rk)
+	fmt.Println("--------------", rklist)
 	where_ck := " ApplyType = 2 and ApplyStatus = 0 "
-	cktotal, cklist := svcw.GetApplyViewtList(1, 1, this.User.AccCode+SamplesApplyName, "Id", where_ck)
+	cktotal, cklist := svcw.GetApplyViewtList(1, 100, this.User.AccCode+SamplesApplyName, "Id", where_ck)
 
 	//待随访
 	svcsf := flupplan.GetFlupPlanService(utils.DBE)
@@ -533,6 +534,7 @@ func (this *UserController) GetAccountInfo() {
 	sftotal, _ := svcsf.GetPagingEntitiesWithOrderSearch(1, 1, "a.Id desc", where_sf, this.User.AccCode+DonorstbName)
 
 	this.Data["json"] = AccountTjModel{devicetotal, yilurutotal, yulurutotal, daifuchuntotal, yiguidangtotal, sftotal, rktotal, rklist, cktotal, cklist}
+	fmt.Println("-234444444--", this.Data["json"])
 	this.ServeJSON()
 }
 

src/dashoo.cn/backend/api/controllers/equipment/equipment.go

@@ -82,7 +82,12 @@ func (this *EquipmentController) List() {
 	eids := svcPermission.GetEquipmentIdById(utils.ToStr(this.User.Id))
 
 	where := " a.AccCode = '" + this.User.AccCode + "'"
-	where = where + " and (a.CreateUserId=" + utils.ToStr(this.User.Id) + " or a.Id in (" + eids + "))"
+	if eids != "" {
+		where = where + " and (a.CreateUserId= " + utils.ToStr(this.User.Id) + " or a.Id in (" + eids + "))"
+	} else {
+		where = where + "and a.CreateUserId= " + utils.ToStr(this.User.Id)
+	}
+
 	searchkey := this.GetString("searchkey")
 	if searchkey != "" {
 		where = where + " and (a.Code like '%" + searchkey + "%' or a.Name like  '%" + searchkey + "%') "
@@ -156,10 +161,16 @@ func (this *EquipmentController) EquipAllList() {
 // @router /elist [get]
 func (this *EquipmentController) NameIdList() {
 	svc := equipment.GetEquipmentService(utils.DBE)
-	svcrole := role.GetRoleService(utils.DBE)
-	roleids := svcrole.GetRoleidsByuid(utils.ToStr(this.User.Id))
+	svcPermission := permission.GetPermissionService(utils.DBE)
+	eids := svcPermission.GetEquipmentIdById(utils.ToStr(this.User.Id))
+
 	where := " a.AccCode = '" + this.User.AccCode + "'"
-	where = where + " and (a.CreateUserId=" + utils.ToStr(this.User.Id) + " or a.Id in (select EquipmentId Id FROM Base_RoleEquipment where RoleId in (" + strings.Join(roleids, ",") + ")))"
+	if eids != "" {
+		where = where + " and (a.CreateUserId= " + utils.ToStr(this.User.Id) + " or a.Id in (" + eids + "))"
+	} else {
+		where = where + "and a.CreateUserId= " + utils.ToStr(this.User.Id)
+	}
+
 	var list []string
 	_, entities := svc.GetEquipmenViewtList(0, 0, "a.Id desc", where)
 	for i := 0; i < len(entities); i++ {

src/dashoo.cn/backend/api/controllers/samplesinfo/sampleoperation.go

@@ -511,8 +511,8 @@ func (this *SampleOperationController) GetSample() {
 	this.ServeJSON()
 }
 
-// @Title 报警项目列表
-// @Description 报警项目列表
+// @Title 存储样本
+// @Description 存储样本
 // @Success 200 {object} business.device.DeviceChannels
 // @router / [post]
 func (this *SampleOperationController) SampleAdd() {
@@ -582,10 +582,10 @@ func (this *SampleOperationController) SampleAdd() {
 	databuss.BoxId = datadetail.BoxId
 	databuss.Position = datadetail.Position
 	databuss.PositionDesc = svcSample.GetPostiondescByPosId(datadetail.EquipmentId, datadetail.ShelfId, datadetail.BoxId, datadetail.Position)
-	//	databuss.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	//	databuss.CreateBy = this.User.Realname
-	databuss.CreateUserId = datadetail.CreateUserId
-	databuss.CreateBy = datadetail.CreateBy
+	databuss.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	databuss.CreateBy = this.User.Realname
+	//	databuss.CreateUserId = datadetail.CreateUserId
+	//	databuss.CreateBy = datadetail.CreateBy
 
 	var datamainold samplesinfo.SamplesMain
 	wheremain := " SampleCode='" + datamain.SampleCode + "'"
@@ -631,10 +631,10 @@ func (this *SampleOperationController) SampleAdd() {
 			}
 			databuss.BarCode = datadetail.BarCode
 			datamain.AccCode = this.User.AccCode
-			//			datamain.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
-			//			datamain.MCreateBy = this.User.Realname
-			datamain.MCreateUserId = datadetail.CreateUserId
-			datamain.MCreateBy = datadetail.CreateBy
+			datamain.MCreateUserId, _ = utils.StrTo(this.User.Id).Int()
+			datamain.MCreateBy = this.User.Realname
+			//datamain.MCreateUserId = datadetail.CreateUserId
+			//datamain.MCreateBy = datadetail.CreateBy
 
 			_, err = svcSample.InsertSampleAndBuss(this.User.AccCode+SamplesMaintbName, this.User.AccCode+SamplesDetailtbName, this.User.AccCode+SamplesBusstbName, &datamain, &datadetail, &databuss)
 		}

src/dashoo.cn/backend/api/controllers/samplesinfo/sampletype.go

@@ -280,7 +280,6 @@ func (this *SampleTypeController) GetSensors() {
 func (this *SampleTypeController) GetImgs() {
 	svc := sampletypeimgpublic.GetSampleTypeImgPublicService(utils.DBE)
 	list := svc.ListSampleTypeImgPublic("'1==1'")
-	//	fmt.Println("bbbbbbbbbbbbbbbbbbbbbbb", list)
 	this.Data["json"] = list
 	this.ServeJSON()
 }

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -160,7 +160,7 @@ module.exports = {
 
   axios: {
     baseURL: '//localhost:9081/api/' // 本机开发使用
-    // baseURL: '//47.92.238.200:9081/api/' // BioBank on AWS发布使用
+    // baseURL: '//47.92.238.200:9081/api/' // BioBank on ALi发布使用
     // baseURL: '//188.188.30.89:9081/api/' //临沂使用
     // baseURL: '//api09.labsop.cn/api/'
     // baseURL: '//192.168.0.211:10091/api/' // 花生所系统
@@ -175,7 +175,7 @@ module.exports = {
   env: {
     appclient: 'biobank', //因顿LIMS:lims,样本库：biobank,细胞制备：cellbank，样本搜索判断，登录跳转判断
 
-    imgserverhost: 'http://52.80.133.197:9081', // BioBank服务地址,图片上传文件
+    imgserverhost: 'http://47.92.238.200:9081', // BioBank服务地址,图片上传文件
     upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
 
     //imgserverhost: 'http://188.188.30.89:9081', // 临沂服务地址,图片上传文件

src/dashoo.cn/frontend_web/src/components/samples/abstractdialog.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <el-dialog title="样本提取" :visible.sync="visible" top="5vh">
-      <el-form ref="TiQuFormref" :model="TiQuForm" :rules="rulesTiQuForm" label-width="100px">
+    <el-dialog title="样本提取" :visible.sync="visible" top="5vh" width="700px">
+      <el-form ref="TiQuFormref" :model="TiQuForm" :rules="rulesTiQuForm" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="样本条码"> 
+            <el-form-item label="样本条码">
               <el-input v-model="sampleinfo.BarCode" disabled></el-input>
             </el-form-item>
           </el-col>
@@ -16,7 +16,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="样本类型"> 
+            <el-form-item label="样本类型">
               <el-input v-model="sampleinfo.SampleTypeName" disabled></el-input>
             </el-form-item>
           </el-col>
@@ -67,9 +67,7 @@
               <el-input v-model="TiQuForm.NewCapacity" placeholder="容量" style="width:50%">
               </el-input>
               <el-select v-model="TiQuForm.NewsUnit" style="width:48%" placeholder="单位" :disabled="disabledunit">
-                <el-option v-for="item in sampeunitlist"
-                  :label="item.Value"
-                  :value="item.Value" :key="item">
+                <el-option v-for="item in sampeunitlist" :label="item.Value" :value="item.Value" :key="item">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -83,14 +81,14 @@
             <el-radio :label="3">不再存入（保留样本信息）</el-radio>
             <el-radio :label="1">直接复存</el-radio>
             <el-radio :label="5">再次存入（保留位置）</el-radio>
-            <el-radio :label="2">再次存入（不保留位置）</el-radio> 
-            <el-radio :label="4">存入预录入</el-radio>          
+            <el-radio :label="2">再次存入（不保留位置）</el-radio>
+            <el-radio :label="4">存入预录入</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
-        <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="savedata()">确 定</el-button>
+        <el-button @click="visible = false" size="mini">取 消</el-button>
+        <el-button type="primary" @click="savedata()" size="mini">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -109,7 +107,7 @@
       },
       sampleinfo: {}
     },
-    created () {
+    created() {
       this.getextends()
       this.getsampetypeunit()
       // 获取自动生成编码数据
@@ -219,21 +217,28 @@
           coderule_sampletype_flag: 0
         },
         rulesTiQuForm: {
-          CapacityUsed: [
-            { validator: checkCapacityUsed, trigger: 'blur' }
-          ],
-          NewsSampleCode: [
-            { required: true, message: '请输入样本编码', trigger: 'blur' }
-          ],
-          NewsSampleType: [
-            { required: true, message: '请选择样本类型', trigger: 'blur' }
-          ],
-          NewCapacity: [
-            { validator: checkNewCapacity, trigger: 'blur' }
-          ],
-          NewsBarCode: [
-            { validator: checkBarCode, trigger: 'blur' }
-          ]
+          CapacityUsed: [{
+            validator: checkCapacityUsed,
+            trigger: 'blur'
+          }],
+          NewsSampleCode: [{
+            required: true,
+            message: '请输入样本编码',
+            trigger: 'blur'
+          }],
+          NewsSampleType: [{
+            required: true,
+            message: '请选择样本类型',
+            trigger: 'blur'
+          }],
+          NewCapacity: [{
+            validator: checkNewCapacity,
+            trigger: 'blur'
+          }],
+          NewsBarCode: [{
+            validator: checkBarCode,
+            trigger: 'blur'
+          }]
         },
         selfVisible: this.visible // 避免vue双向绑定警告
       }
@@ -242,10 +247,12 @@
       // 样本类型
       getextends() {
         let _this = this
-        this.$axios.get('sampleinput/getsampletype', { _currentPage: -1 })
-        .then(res => {
-          _this.sampletypes = res.data.items
-        }).catch(() => {})
+        this.$axios.get('sampleinput/getsampletype', {
+            _currentPage: -1
+          })
+          .then(res => {
+            _this.sampletypes = res.data.items
+          }).catch(() => {})
       },
       getsampetypeunit() {
         // 获取样本单位
@@ -255,7 +262,7 @@
             _this.sampeunitlist = res.data
           })
       },
-      getautocodedata () {
+      getautocodedata() {
         let _this = this
         // request
         // 获取冻存架信息
@@ -280,7 +287,8 @@
           .then(res => {
             _this.TiQuForm.NewsUnit = res.data.SampleType.Unit
             if (_this.TiQuForm.code_default === 'true' && _this.TiQuForm.coderule_sampletype_flag === 1) {
-              if (_this.TiQuForm.coderule_samplingorgan_flag !== 1 || (_this.TiQuForm.coderule_samplingorgan_flag === 1 && _this.TiQuForm.SamplingOrgan !== '')) {
+              if (_this.TiQuForm.coderule_samplingorgan_flag !== 1 || (_this.TiQuForm.coderule_samplingorgan_flag ===
+                  1 && _this.TiQuForm.SamplingOrgan !== '')) {
                 _this.getautobarcode(v, _this.TiQuForm.SamplingOrgan)
               }
             }
@@ -289,7 +297,8 @@
       getautobarcode(samptype, samporg) {
         // 获取自动编码
         let _this = this
-        _this.$axios.get('sampleoperation/getautobarcode?SampleType=' + samptype + '&fid=' + samporg + '&isupdate=true', {})
+        _this.$axios.get('sampleoperation/getautobarcode?SampleType=' + samptype + '&fid=' + samporg +
+          '&isupdate=true', {})
           .then(res => {
             // response
             _this.TiQuForm.NewsSampleCode = res.data.barcode
@@ -332,11 +341,13 @@
       }
     }
   }
+
 </script>
 
 <style>
-.samplerecoveope .el-radio{
-  padding: 8px 15px 0 0;
-  margin-left: -2px;
-}
+  .samplerecoveope .el-radio {
+    padding: 8px 15px 0 0;
+    margin-left: -2px;
+  }
+
 </style>

src/dashoo.cn/frontend_web/src/components/samples/chooseanimal.vue

@@ -15,7 +15,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="AnimalList" :stripe="true">
+      <el-table :data="AnimalList" :stripe="true" size="mini">
         <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button size="small" @click="handleselect(scope.row)" type="text" title="选择">

src/dashoo.cn/frontend_web/src/components/samples/choosemicro.vue

@@ -14,7 +14,7 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="microbialList" :stripe="true">
+      <el-table :data="microbialList" :stripe="true" size="mini">
         <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button size="small" @click="handleselect(scope.row)" type="text" title="选择">

src/dashoo.cn/frontend_web/src/components/samples/choosesource.vue

@@ -1,20 +1,21 @@
 <template>
   <div>
-    <el-dialog title="选择样本来源" :visible.sync="visible" top="5vh" width="90%">
+    <el-dialog title="选择样本来源" :visible.sync="visible" top="5vh" width="1000px">
       <el-form label-width="90px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="查询条件">
-              <el-input v-model="keyword" placeholder="请输入身份证号或姓名或内部编号" style="width:60%"></el-input>
+              <el-input v-model="InnerNo" placeholder="请输入身份证号或姓名或内部编号" size="mini" style="width: 165px;" clearable></el-input>
               <router-link :to="'/biobank/source/addsource/operation'">
-                <el-button style="float: right;margin-left:10px;" type="primary">添加新来源</el-button>
+                <el-button style="float: right; margin-left:8px; margin-top: 8px;" type="primary" size="mini">添加新来源</el-button>
               </router-link>
-              <el-button style="float: right;" type="primary" class="el-button" @click="seachdata">查 询</el-button>
+              <el-button style="float: right; margin-top: 8px;" type="primary" size="mini" @click="seachdata">查
+                询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <el-table :data="sampsourcelist" :stripe="true">
+      <el-table :data="sampsourcelist" :stripe="true" size="mini">
         <el-table-column label="操作" width="80">
           <template slot-scope="scope">
             <el-button size="small" @click="handleselect(scope.row)" type="text" title="选择">

src/dashoo.cn/frontend_web/src/components/samples/packingdialog.vue

@@ -1,10 +1,11 @@
 <template>
   <div>
-    <el-dialog title="样本分装" :visible.sync="visible" top="5vh">
-      <el-form ref="FenZhuangFormref" :model="FenZhuangForm" :rules="rulesFenZhuangForm" label-width="100px">
+    <el-dialog title="样本分装" :visible.sync="visible" top="5vh" width="700px">
+      <el-form ref="FenZhuangFormref" :model="FenZhuangForm" :rules="rulesFenZhuangForm" label-width="100px"
+        size="mini">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="样本条码"> 
+            <el-form-item label="样本条码">
               <el-input v-model="sampleinfo.BarCode" disabled></el-input>
             </el-form-item>
           </el-col>
@@ -16,7 +17,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="样本类型"> 
+            <el-form-item label="样本类型">
               <el-input v-model="sampleinfo.SampleTypeName" disabled></el-input>
             </el-form-item>
           </el-col>
@@ -47,20 +48,20 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item :label="'样本条码-'+(k+1)">
-                  <el-input  placeholder="为空默认自动生成" v-model="FenZhuangForm.NewsBarCode[k]"></el-input>
+                  <el-input placeholder="为空默认自动生成" v-model="FenZhuangForm.NewsBarCode[k]"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="分装容量" required>
-                  <el-input v-model="FenZhuangForm.NewCapacity[k].value" placeholder="分装容量"></el-input>  
+                  <el-input v-model="FenZhuangForm.NewCapacity[k].value" placeholder="分装容量"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
           </template>
         </div>
         <el-form-item label="记录冻融次数">
-              <el-switch v-model="FenZhuangForm.FreezingNum" on-color="#13ce66" on-text="开" off-text="关"> </el-switch>
-            </el-form-item>
+          <el-switch v-model="FenZhuangForm.FreezingNum" on-color="#13ce66" on-text="开" off-text="关"> </el-switch>
+        </el-form-item>
         <el-form-item label="操作说明">
           <el-input type="textarea" v-model="FenZhuangForm.OpDesc" placeholder="操作说明"></el-input>
         </el-form-item>
@@ -69,14 +70,14 @@
             <el-radio :label="3">不再存入（保留样本信息）</el-radio>
             <el-radio :label="1">直接复存</el-radio>
             <el-radio :label="5">再次存入（保留位置）</el-radio>
-            <el-radio :label="2">再次存入（不保留位置）</el-radio> 
-            <el-radio :label="4">存入预录入</el-radio>          
+            <el-radio :label="2">再次存入（不保留位置）</el-radio>
+            <el-radio :label="4">存入预录入</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
-        <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="savedata()">确 定</el-button>
+        <el-button @click="visible = false" size="mini">取 消</el-button>
+        <el-button type="primary" @click="savedata()" size="mini">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -95,8 +96,7 @@
       },
       sampleinfo: {}
     },
-    created () {
-    },
+    created() {},
     computed: {
       ...mapGetters({
         session: 'session'
@@ -148,8 +148,12 @@
         FenZhuangFormLoadnum: 1,
         FenZhuangForm: {
           SampleType: 0,
-          NewsBarCode: [{value: ''}], // 新条码
-          NewCapacity: [{value: 0}], // 新存量
+          NewsBarCode: [{
+            value: ''
+          }], // 新条码
+          NewCapacity: [{
+            value: 0
+          }], // 新存量
           CapacityUsed: 0, // 取用容量
           OpDesc: '', // 操作说明
           FreezingNum: true, // 记录冻融次数
@@ -157,15 +161,16 @@
           Loadnum: 1 // 取的份数
         },
         rulesFenZhuangForm: {
-          CapacityUsed: [
-            { validator: checkCapacityUsed, trigger: 'blur' }
-          ]
+          CapacityUsed: [{
+            validator: checkCapacityUsed,
+            trigger: 'blur'
+          }]
         },
         selfVisible: this.visible // 避免vue双向绑定警告
       }
     },
     methods: {
-      handlefenzhuangnum () { // 分装数量变化处理界面
+      handlefenzhuangnum() { // 分装数量变化处理界面
         // 获取取用容量
         let keyong = parseFloat(this.FenZhuangForm.CapacityUsed)
         // 获得没份平均容量
@@ -175,14 +180,18 @@
         this.FenZhuangForm.NewsBarCode = []
         this.FenZhuangForm.Loadnum = this.FenZhuangFormLoadnum
         for (var i = 0; i < parseInt(this.FenZhuangFormLoadnum); i++) {
-          this.FenZhuangForm.NewCapacity.push({value: avgrl})
-          this.FenZhuangForm.NewsBarCode.push({value: ''})
+          this.FenZhuangForm.NewCapacity.push({
+            value: avgrl
+          })
+          this.FenZhuangForm.NewsBarCode.push({
+            value: ''
+          })
         }
       },
       // 分装取用量失去焦点事件
-      lostFocusFenZhuangCapacityUse () {
-         // 更新分装信息界面
-         this.handlefenzhuangnum()
+      lostFocusFenZhuangCapacityUse() {
+        // 更新分装信息界面
+        this.handlefenzhuangnum()
       },
       savedata() {
         this.$refs['FenZhuangFormref'].validate((valid) => {
@@ -193,7 +202,8 @@
             for (var i = 0; i < this.FenZhuangForm.NewCapacity.length; i++) {
               jscapacitytotal += Math.floor(this.FenZhuangForm.NewCapacity[i].value * 100) / 100
             }
-            if (!(this.FenZhuangForm.CapacityUsed - jscapacitytotal < 0.1 && this.FenZhuangForm.CapacityUsed - jscapacitytotal >= 0)) {
+            if (!(this.FenZhuangForm.CapacityUsed - jscapacitytotal < 0.1 && this.FenZhuangForm.CapacityUsed -
+                jscapacitytotal >= 0)) {
               _this.$message({
                 type: 'warning',
                 message: '取用容量与分装容量总和不一致，请调整分装容量'
@@ -201,34 +211,36 @@
               return
             }
             _this.$axios.put('sampleinput/fenzhuang/' + _this.sampleinfo.Id, _this.FenZhuangForm)
-            .then(res => {
-              // response
-              if (res.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-                _this.$emit('close', _this.FenZhuangForm.FenZhuangRadio)
-                _this.selfVisible = false
-                // 更新界面
-              } else {
-                _this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(() => {})
+              .then(res => {
+                // response
+                if (res.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                  _this.$emit('close', _this.FenZhuangForm.FenZhuangRadio)
+                  _this.selfVisible = false
+                  // 更新界面
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              })
+              .catch(() => {})
           }
         })
       }
     }
   }
+
 </script>
 
 <style>
-.samplerecoveope .el-radio{
-  padding: 8px 15px 0 0;
-  margin-left: -2px;
-}
+  .samplerecoveope .el-radio {
+    padding: 8px 15px 0 0;
+    margin-left: -2px;
+  }
+
 </style>

src/dashoo.cn/frontend_web/src/components/samples/preoperation.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-dialog title="选择预录入" :visible.sync="visible" top="5vh" width="90%">
-      <el-form :model="form" label-width="90px">
+    <el-dialog title="选择预录入" :visible.sync="visible" top="5vh" width="1000px">
+      <el-form :model="form" label-width="90px" size="mini">
         <el-row>
           <el-col :span="8">
             <el-form-item label="样本条码">
@@ -53,7 +53,7 @@
         <el-pagination style="float: right;margin-top:0px;margin-bottom:2px" @current-change="handleCurrentChange"
           :current-page="currentPage" layout="prev, pager, next" :page-size="pagesize" :total="currentItemCount">
         </el-pagination>
-        <el-button style="float: right;margin:3px 15px 0 0;" type="primary" class="el-button--small" @click="seachdata">
+        <el-button style="float: right;margin:3px 15px 0 0;" type="primary" class="el-button--mini" @click="seachdata">
           查询</el-button>
       </div>
       <el-table :data="sampleyulurulist" :stripe="true">

src/dashoo.cn/frontend_web/src/components/samples/recoverydialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-dialog title="样本复苏" :visible.sync="visible" top="5vh">
-      <el-form ref="FuSuFormref" :model="FuSuForm" :rules="rulesfusu" label-width="100px">
+    <el-dialog title="样本复苏" :visible.sync="visible" top="5vh" width="700px">
+      <el-form ref="FuSuFormref" :model="FuSuForm" :rules="rulesfusu" label-width="100px" size="mini">
         <el-row>
           <el-col :span="12">
             <el-form-item label="样本条码"> 
@@ -57,8 +57,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
-        <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="savedata()">确 定</el-button>
+        <el-button @click="visible = false" size="mini">取 消</el-button>
+        <el-button type="primary" @click="savedata()" size="mini">确 定</el-button>
       </div>
     </el-dialog>
   </div>

src/dashoo.cn/frontend_web/src/pages/index.vue

@@ -47,13 +47,15 @@
               </el-button>
             </router-link>
             <router-link :to="'/biobank/sampleRK'">
-              <el-button type="primary" plain style="margin-right:5px;" size="mini" v-if="acc =='s5OVE' && permissions[permissionscode.rkapprove]">
+              <el-button type="primary" plain style="margin-right:5px;" size="mini"
+                v-if="acc =='sgVEw' && permissions[permissionscode.rkapprove]">
                 待审核入库
                 <span style="color:#0000FF">【{{usertotal.RKTotal}}】</span>
               </el-button>
             </router-link>
             <router-link :to="'/biobank/sampleCK'">
-              <el-button type="primary" plain style="margin-right:5px;" size="mini" v-if="acc =='s5OVE' && permissions[permissionscode.ckapprove]">
+              <el-button type="primary" plain style="margin-right:5px;" size="mini"
+                v-if="acc =='sgVEw' && permissions[permissionscode.ckapprove]">
                 待审核出库
                 <span style="color:#0000FF">【{{usertotal.CKTotal}}】</span>
               </el-button>
@@ -61,7 +63,8 @@
           </div>
         </el-row>
       </div>
-      <el-row :gutter="10" type="flex" justify="space-around" v-loading="downloading" element-loading-text="数据拼命读取中，请稍候。。。">
+      <el-row :gutter="10" type="flex" justify="space-around" v-loading="downloading"
+        element-loading-text="数据拼命读取中，请稍候。。。">
         <!--样本统计-->
         <el-col :span="12">
           <el-card>
@@ -75,9 +78,9 @@
                 </el-select>
               </span>
             </div>
-            <div v-if="tjzztitles.length === 0">无显示数据,可在
+            <div v-if="sampleTitle.length === 0">无显示数据,可在
               <router-link :to="'/samples/prerecorded'">样本管理</router-link> 中录入样本</div>
-            <div id="deviceChartPie" style="width:100%; height:366.5px;"></div>
+            <div id="SamplePie" style="width:100%; height:366.5px;"></div>
           </el-card>
         </el-col>
         <!--容器数据统计-->
@@ -85,22 +88,25 @@
           <el-card>
             <div slot="header">容器数据统计</div>
             <div style="overflow-x:scroll; overflow-y:hidden;">
-              <div v-if="tjdevicex.length === 0">无显示数据,可在
+              <div v-if="EquipmentX.length === 0">无显示数据,可在
                 <router-link :to="'/equipment'">容器管理</router-link> 模块增加容器</div>
-              <div id="deviceChartBar" style="height:380px;margin-left:-25px;margin-top:-30px;min-width:400px;" :style="{ width: usertotal.DeviceTotal * 30 + 'px' }"></div>
+              <div id="EquipmentBar" style="height:380px;margin-left:5px;margin-top:-30px;min-width:400px;"
+                :style="{ width: usertotal.DeviceTotal * 30 + 'px' }"></div>
             </div>
           </el-card>
         </el-col>
       </el-row>
       <br>
-      <el-row :gutter="10" type="flex" justify="space-around" v-loading="downloading" element-loading-text="数据拼命读取中，请稍候。。。">
+      <el-row :gutter="10" type="flex" justify="space-around" v-loading="downloading"
+        element-loading-text="数据拼命读取中，请稍候。。。">
         <!--待审核入库统计-->
         <el-col :span="12">
-          <el-card class="box-card" v-if="acc =='s5OVE' && permissions[permissionscode.rkapprove]">
+          <el-card class="box-card waitlist" style="height: calc(100vh - 410px);"
+            v-if="acc =='sgVEw' && permissions[permissionscode.rkapprove]">
             <div slot="header">
               <i class="icon icon-paragraph-justify"> 待审核入库</i>
             </div>
-            <el-table :data="RKList">
+            <el-table :data="RKList" size="mini" height="calc(100vh - 470px)">
               <el-table-column label="操作" width="70" align="center">
                 <template slot-scope="scope">
                   <router-link :to="'/biobank/sampleRK/'+scope.row.Id+'/operation'">
@@ -124,9 +130,10 @@
         </el-col>
         <!--待审核出库统计-->
         <el-col :span="12">
-          <el-card v-if="acc =='s5OVE' && permissions[permissionscode.ckapprove]">
+          <el-card class="box-card waitlist" style="height: calc(100vh - 410px);"
+            v-if="acc =='sgVEw' && permissions[permissionscode.ckapprove]">
             <div slot="header">待审核出库</div>
-            <el-table :data="CKList">
+            <el-table :data="CKList" size="mini" height="calc(100vh - 470px)">
               <el-table-column label="操作" width="70" align="center">
                 <template slot-scope="scope">
                   <router-link :to="'/biobank/sampleCK/'+scope.row.Id+'/operation'">
@@ -171,8 +178,8 @@
         cardHeight: 350,
         topmenuoption: [24, 356, 14, 6, 123, 24, 222],
         // 饼状图&柱状图
-        deviceChartPie: null,
-        deviceChartBar: null,
+        SamplePie: null,
+        EquipmentBar: null,
         num: 0,
         usertotal: {},
         user: {
@@ -181,10 +188,10 @@
           Realname: '',
           host: ''
         },
-        tjzztitles: [],
-        tjzzdata: [],
-        tjdevicex: [],
-        tjdevicey: [],
+        sampleTitle: [],
+        sampleData: [],
+        EquipmentX: [],
+        EquipmentY: [],
         tjdevicecolor: [
           '#6A5ACD', '#B5C334', '#FCCE10', '#E87C25', '#27727B', '#FE8463', '#9BCA63', '#FAD860', '#F3A43B',
           '#60C0DD', '#E87C25', '#27727B', '#FE8463'
@@ -194,12 +201,12 @@
         RKList: [],
         CKList: [],
         permissionscode: {
-          rkapprove: 'cellbank.biobank.sampleRK.approve',
-          ckapprove: 'cellbank.biobank.sampleCK.approve',
+          rkapprove: 'biobank.sampleRK.approve',
+          ckapprove: 'biobank.sampleCK.approve',
         },
         permissions: {
-          'cellbank.biobank.sampleRK.approve': false,
-          'cellbank.biobank.sampleCK.approve': false,
+          'biobank.sampleRK.approve': false,
+          'biobank.sampleCK.approve': false,
         },
       }
     },
@@ -239,6 +246,7 @@
         this.$axios.get('users/getaccountinfo', {})
           .then(res => {
             _this.usertotal = res.data
+            console.log("----------------", res.data)
             _this.RKList = res.data.RKlist
             _this.CKList = res.data.CKlist
             _this.getBySampleType()
@@ -282,7 +290,7 @@
           })
       },
       changePie() {
-        this.tjzzdata = []
+        this.sampleData = []
         this.getBySampleType()
       },
       // 统计样本总数的饼状图
@@ -307,15 +315,15 @@
                   res.data[i].Name = '未知'
                 }
                 if (i < 5) {
-                  _this.tjzztitles.push({
+                  _this.sampleTitle.push({
                     name: res.data[i].Name
                   })
-                  _this.tjzzdata.push({
+                  _this.sampleData.push({
                     name: res.data[i].Name,
                     value: res.data[i].Num
                   })
                 } else {
-                  _this.tjzzdata.push({
+                  _this.sampleData.push({
                     name: res.data[i].Name,
                     value: res.data[i].Num
                   })
@@ -331,7 +339,7 @@
           })
       },
       drawPieChart() {
-        var chartPie = echarts.init(document.getElementById('deviceChartPie'))
+        var chartPie = echarts.init(document.getElementById('SamplePie'))
         chartPie.setOption({
           title: {
             text: ''
@@ -345,19 +353,21 @@
             left: 'right',
             itemHeight: 20,
             itemWidth: 20,
-            data: this.tjzztitles
+            data: this.sampleTitle
           },
-          color: ['#D1EEEE', '#FFE1FF', '#FFA500', '#6A5ACD', '#D1EEEE', '#CAE1FF', '#C0FF3E', '#1E90FF', '#000080'],
+          color: ['#D1EEEE', '#FFE1FF', '#FFA500', '#6A5ACD', '#D1EEEE', '#CAE1FF', '#C0FF3E', '#1E90FF',
+            '#000080'
+          ],
           series: [{
             name: '样本类型',
             type: 'pie',
-            radius: '92%',
+            radius: ['30%', '80%'],
             label: {
               normal: {
                 show: false
               }
             },
-            data: this.tjzzdata
+            data: this.sampleData
           }]
         })
       },
@@ -374,19 +384,18 @@
               if (i > 12) {
                 _this.tjdevicecolor.push(_this.tjdevicecolor[i % 12])
               }
-              _this.tjdevicex.push(res.data[i].Name)
-              _this.tjdevicey.push(res.data[i].Num)
+              _this.EquipmentX.push(res.data[i].Name)
+              _this.EquipmentY.push(res.data[i].Num)
             }
             _this.drawBarChart()
           })
           .catch(err => {
-            // handle error
             console.error(err)
           })
       },
       drawBarChart() {
         let _this = this
-        var chartBar = echarts.init(document.getElementById('deviceChartBar'))
+        var chartBar = echarts.init(document.getElementById('EquipmentBar'))
         chartBar.setOption({
           title: {
             text: ''
@@ -395,14 +404,23 @@
             trigger: 'item',
             formatter: '({b}) {c}'
           },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
           xAxis: {
-            data: this.tjdevicex,
-            axisLabel: {
-              interval: 0,
-              rotate: 40
-            }
+            type: 'category',
+            data: _this.EquipmentX,
+            // axisLabel: {
+            //   interval: 0,
+            //   rotate: 40
+            // }
+          },
+          yAxis: {
+            type: 'value'
           },
-          yAxis: {},
           series: [{
             name: '容器类型',
             type: 'bar',
@@ -411,7 +429,8 @@
                 show: false
               }
             },
-            data: this.tjdevicey,
+            data: _this.EquipmentY,
+            // data:[10, 52, 200, 334, 390, 330, 220],
             itemStyle: {
               normal: {
                 color: function (params) {
@@ -440,7 +459,7 @@
 
 </script>
 
-<style lang="css">
+<style lang="scss">
   .avatar-index {
     width: 45px;
     height: 45px;
@@ -448,4 +467,9 @@
     margin-bottom: -15px;
   }
 
+  .waitlist .el-card__header {
+    padding: 5px 10px;
+    font-size: 10px;
+  }
+
 </style>

src/dashoo.cn/frontend_web/src/pages/setting/sampletype/sampletypeadd.vue

@@ -179,6 +179,7 @@ export default {
       this.$axios
         .get("sampletype/imglist", { _currentPage: -1 })
         .then(res => {
+          console.log("1111111111111",res.data)
           _this.systemqiguanimglist = res.data;
         })
         .catch(() => {});